Rename protected to prot

Also print size of grant table known in system
This commit is contained in:
Ben Gras 2006-06-20 10:03:48 +00:00
parent 3061d7b17a
commit 7a76a7a495
3 changed files with 8 additions and 8 deletions

View File

@ -15,7 +15,7 @@ f = $u/src/servers/fs
CC = exec cc CC = exec cc
CFLAGS = -I$i CFLAGS = -I$i
LDFLAGS = -i LDFLAGS = -i
LIBS = -lsys -lsysutil LIBS = -lsysutil -lsys
OBJ = main.o dmp.o dmp_kernel.o dmp_pm.o dmp_fs.o dmp_rs.o dmp_ds.o OBJ = main.o dmp.o dmp_kernel.o dmp_pm.o dmp_fs.o dmp_rs.o dmp_ds.o

View File

@ -12,7 +12,7 @@
/* Define hooks for the debugging dumps. This table maps function keys /* Define hooks for the debugging dumps. This table maps function keys
* onto a specific dump and provides a description for it. * onto a specific dump and provides a description for it.
*/ */
#define NHOOKS 18 #define NHOOKS 19
struct hook_entry { struct hook_entry {
int key; int key;

View File

@ -292,7 +292,7 @@ PUBLIC void kenv_dmp()
printf("- pc_at: %3d\n", machine.pc_at); printf("- pc_at: %3d\n", machine.pc_at);
printf("- ps_mca: %3d\n", machine.ps_mca); printf("- ps_mca: %3d\n", machine.ps_mca);
printf("- processor: %3d\n", machine.processor); printf("- processor: %3d\n", machine.processor);
printf("- protected: %3d\n", machine.protected); printf("- protected: %3d\n", machine.prot);
printf("- vdu_ega: %3d\n", machine.vdu_ega); printf("- vdu_ega: %3d\n", machine.vdu_ega);
printf("- vdu_vga: %3d\n\n", machine.vdu_vga); printf("- vdu_vga: %3d\n\n", machine.vdu_vga);
printf("Kernel info structure:\n"); printf("Kernel info structure:\n");
@ -366,7 +366,7 @@ PUBLIC void privileges_dmp()
return; return;
} }
printf("\n--nr-id-name---- -flags- -traps- -ipc_to mask------------------------ \n"); printf("\n--nr-id-name---- -flags- -traps- grants -ipc_to mask- ----------------- \n");
for (rp = oldrp; rp < END_PROC_ADDR; rp++) { for (rp = oldrp; rp < END_PROC_ADDR; rp++) {
if (isemptyp(rp)) continue; if (isemptyp(rp)) continue;
@ -380,17 +380,17 @@ PUBLIC void privileges_dmp()
if (r == -1 && ! (rp->p_rts_flags & SLOT_FREE)) { if (r == -1 && ! (rp->p_rts_flags & SLOT_FREE)) {
sp = &priv[USER_PRIV_ID]; sp = &priv[USER_PRIV_ID];
} }
printf("(%02u) %-7.7s %s %s ", printf("(%02u) %-7.7s %s %s %7d ",
sp->s_id, rp->p_name, sp->s_id, rp->p_name,
s_flags_str(sp->s_flags), s_traps_str(sp->s_trap_mask) s_flags_str(sp->s_flags), s_traps_str(sp->s_trap_mask),
); sp->s_grant_entries);
for (i=j=0; i < NR_SYS_PROCS; i++, j++) { for (i=j=0; i < NR_SYS_PROCS; i++, j++) {
ipc_to[j] = get_sys_bit(sp->s_ipc_to, i) ? '1' : '0'; ipc_to[j] = get_sys_bit(sp->s_ipc_to, i) ? '1' : '0';
if (i % 8 == 7) ipc_to[++j] = ' '; if (i % 8 == 7) ipc_to[++j] = ' ';
} }
ipc_to[j] = '\0'; ipc_to[j] = '\0';
printf(" %s \n", ipc_to); printf(" %s\n", ipc_to);
} }
if (rp == END_PROC_ADDR) rp = BEG_PROC_ADDR; else printf("--more--\r"); if (rp == END_PROC_ADDR) rp = BEG_PROC_ADDR; else printf("--more--\r");
oldrp = rp; oldrp = rp;