X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fmonitor.c;h=e61faf32d71a28d79780cba108a014f4d8488f61;hb=93c941d86b264637de20aa1b713757b704d4c1a6;hp=b494aaff22cc7db14b6cc4030301076a141337a3;hpb=c81c32ef8a737b0cc61d3c0c6a137cab39baac73;p=sbcl.git diff --git a/src/runtime/monitor.c b/src/runtime/monitor.c index b494aaf..e61faf3 100644 --- a/src/runtime/monitor.c +++ b/src/runtime/monitor.c @@ -33,6 +33,10 @@ #include "globals.h" #include "lispregs.h" #include "interrupt.h" +#include "genesis/static-symbols.h" +#include "genesis/primitive-objects.h" + + /* When we need to do command input, we use this stream, which is not * in general stdin, so that things will "work" (as well as being @@ -279,7 +283,7 @@ quit_cmd(char **ptr) fflush(stdout); fgets(buf, sizeof(buf), ldb_in); if (buf[0] == 'y' || buf[0] == 'Y' || buf[0] == '\n') - exit(0); + exit(1); } static void @@ -309,50 +313,50 @@ purify_cmd(char **ptr) static void print_context(os_context_t *context) { - int i; + int i; - for (i = 0; i < NREGS; i++) { - printf("%s:\t", lisp_register_names[i]); + for (i = 0; i < NREGS; i++) { + printf("%s:\t", lisp_register_names[i]); #ifdef __i386__ - brief_print((lispobj)(*os_context_register_addr(context, - i*2))); + brief_print((lispobj)(*os_context_register_addr(context, + i*2))); #else - brief_print((lispobj)(*os_context_register_addr(context,i))); + brief_print((lispobj)(*os_context_register_addr(context,i))); #endif - } - printf("PC:\t\t 0x%08lx\n", - (unsigned long)(*os_context_pc_addr(context))); + } + printf("PC:\t\t 0x%08lx\n", + (unsigned long)(*os_context_pc_addr(context))); } static void print_context_cmd(char **ptr) { - int free; + int free; - free = SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX)>>2; + free = SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX)>>2; - if (more_p(ptr)) { - int index; - - index = parse_number(ptr); - - if ((index >= 0) && (index < free)) { - printf("There are %d interrupt contexts.\n", free); - printf("printing context %d\n", index); - print_context(lisp_interrupt_contexts[index]); - } else { - printf("There aren't that many/few contexts.\n"); - printf("There are %d interrupt contexts.\n", free); - } + if (more_p(ptr)) { + int index; + + index = parse_number(ptr); + + if ((index >= 0) && (index < free)) { + printf("There are %d interrupt contexts.\n", free); + printf("printing context %d\n", index); + print_context(lisp_interrupt_contexts[index]); } else { - if (free == 0) - printf("There are no interrupt contexts!\n"); - else { - printf("There are %d interrupt contexts.\n", free); - printf("printing context %d\n", free - 1); - print_context(lisp_interrupt_contexts[free - 1]); - } + printf("There aren't that many/few contexts.\n"); + printf("There are %d interrupt contexts.\n", free); } + } else { + if (free == 0) + printf("There are no interrupt contexts!\n"); + else { + printf("There are %d interrupt contexts.\n", free); + printf("printing context %d\n", free - 1); + print_context(lisp_interrupt_contexts[free - 1]); + } + } } static void