X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Fmonitor.c;h=9d175086ca9829725094e122f340895e173468b7;hb=4bf2de6a2adff75459cf218c8bff67f6cdb91211;hp=87590b112f1268f656435ecd1d8ceaf5a3c040cc;hpb=be7adb92bf0012ab07adac2943e73772dfad7911;p=sbcl.git diff --git a/src/runtime/monitor.c b/src/runtime/monitor.c index 87590b1..9d17508 100644 --- a/src/runtime/monitor.c +++ b/src/runtime/monitor.c @@ -9,16 +9,19 @@ * files for more information. */ +#include "sbcl.h" + #include #include #include #include #include +#ifndef LISP_FEATURE_WIN32 #include +#endif #include #include -#include "sbcl.h" #include "runtime.h" #include "parse.h" #include "vars.h" @@ -148,7 +151,14 @@ dump_cmd(char **ptr) unsigned short *sptr = (unsigned short *)addr; unsigned char *cptr = (unsigned char *)addr; - printf("0x%08lx 0x%04x 0x%04x 0x%02x 0x%02x 0x%02x 0x%02x %c%c%c%c\n", lptr[0], sptr[0], sptr[1], cptr[0], cptr[1], cptr[2], cptr[3], visible(cptr[0]), visible(cptr[1]), visible(cptr[2]), visible(cptr[3])); + printf("0x%08lx 0x%04x 0x%04x " + "0x%02x 0x%02x 0x%02x 0x%02x " + "%c%c" + "%c%c\n", + lptr[0], sptr[0], sptr[1], + cptr[0], cptr[1], cptr[2], cptr[3], + visible(cptr[0]), visible(cptr[1]), + visible(cptr[2]), visible(cptr[3])); } else printf("invalid Lisp-level address\n"); @@ -170,37 +180,47 @@ print_cmd(char **ptr) static void kill_cmd(char **ptr) { +#ifndef LISP_FEATURE_WIN32 kill(getpid(), parse_number(ptr)); +#endif } static void regs_cmd(char **ptr) { - printf("CSP\t=\t0x%08lX\n", (unsigned long)current_control_stack_pointer); - printf("FP\t=\t0x%08lX\n", (unsigned long)current_control_frame_pointer); -#if !(defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)) - printf("BSP\t=\t0x%08lX\n", (unsigned long)current_binding_stack_pointer); + struct thread *thread=arch_os_get_current_thread(); + + printf("CSP\t=\t0x%08lx ", (unsigned long)current_control_stack_pointer); + printf("CFP\t=\t0x%08lx ", (unsigned long)current_control_frame_pointer); + +#ifdef reg_BSP + printf("BSP\t=\t0x%08lx\n", (unsigned long)current_binding_stack_pointer); +#else + /* printf("BSP\t=\t0x%08lx\n", + (unsigned long)SymbolValue(BINDING_STACK_POINTER)); */ + printf("\n"); #endif -#if 0 -#if (defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)) - printf("BSP\t=\t0x%08lx\n", - (unsigned long)SymbolValue(BINDING_STACK_POINTER)); + +#ifdef LISP_FEATURE_GENCGC + /* printf("DYNAMIC\t=\t0x%08lx\n", DYNAMIC_SPACE_START); */ +#else + printf("STATIC\t=\t0x%08lx ", + (unsigned long)SymbolValue(STATIC_SPACE_FREE_POINTER, thread)); + printf("RDONLY\t=\t0x%08lx ", + (unsigned long)SymbolValue(READ_ONLY_SPACE_FREE_POINTER, thread)); + printf("DYNAMIC\t=\t0x%08lx\n", (unsigned long)current_dynamic_space); #endif - printf("DYNAMIC\t=\t0x%08lx\n", (unsigned long)DYNAMIC_SPACE_START); -#if (defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)) - printf("ALLOC\t=\t0x%08lx\n", - (unsigned long)SymbolValue(ALLOCATION_POINTER)); +#ifdef reg_ALLOC + printf("ALLOC\t=\t0x%08lx\n", (unsigned long)dynamic_space_free_pointer); #else - printf("ALLOC\t=\t0x%08X\n", - (unsigned long)dynamic_space_free_pointer); + printf("ALLOC\t=\t0x%08lx\n", + (unsigned long)SymbolValue(ALLOCATION_POINTER, thread)); +#endif + +#ifndef LISP_FEATURE_GENCGC printf("TRIGGER\t=\t0x%08lx\n", (unsigned long)current_auto_gc_trigger); #endif - printf("STATIC\t=\t0x%08lx\n", - (unsigned long)SymbolValue(STATIC_SPACE_FREE_POINTER)); - printf("RDONLY\t=\t0x%08lx\n", - (unsigned long)SymbolValue(READ_ONLY_SPACE_FREE_POINTER)); -#endif /* 0 */ } static void @@ -282,9 +302,13 @@ quit_cmd(char **ptr) printf("Really quit? [y] "); fflush(stdout); - fgets(buf, sizeof(buf), ldb_in); - if (buf[0] == 'y' || buf[0] == 'Y' || buf[0] == '\n') + if (fgets(buf, sizeof(buf), ldb_in)) { + if (buf[0] == 'y' || buf[0] == 'Y' || buf[0] == '\n') + exit(1); + } else { + printf("\nUnable to read response, assuming y.\n"); exit(1); + } } static void @@ -336,31 +360,31 @@ print_context(os_context_t *context) static void print_context_cmd(char **ptr) { - int free; + int free_ici; struct thread *thread=arch_os_get_current_thread(); - free = SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,thread)>>2; + free_ici = fixnum_value(SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,thread)); if (more_p(ptr)) { int index; index = parse_number(ptr); - if ((index >= 0) && (index < free)) { - printf("There are %d interrupt contexts.\n", free); + if ((index >= 0) && (index < free_ici)) { + printf("There are %d interrupt contexts.\n", free_ici); printf("printing context %d\n", index); print_context(thread->interrupt_contexts[index]); } else { printf("There aren't that many/few contexts.\n"); - printf("There are %d interrupt contexts.\n", free); + printf("There are %d interrupt contexts.\n", free_ici); } } else { - if (free == 0) + if (free_ici == 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(thread->interrupt_contexts[free - 1]); + printf("There are %d interrupt contexts.\n", free_ici); + printf("printing context %d\n", free_ici - 1); + print_context(thread->interrupt_contexts[free_ici - 1]); } } } @@ -428,7 +452,11 @@ sub_monitor(void) int ambig; if (!ldb_in) { +#ifndef LISP_FEATURE_WIN32 ldb_in = fopen("/dev/tty","r+"); +#else + ldb_in = stdin; +#endif ldb_in_fd = fileno(ldb_in); } @@ -437,14 +465,7 @@ sub_monitor(void) fflush(stdout); line = fgets(buf, sizeof(buf), ldb_in); if (line == NULL) { - if (isatty(ldb_in_fd)) { - putchar('\n'); - continue; - } - else { - fprintf(stderr, "\nEOF on something other than a tty.\n"); - exit(0); - } + exit(1); } ptr = line; if ((token = parse_token(&ptr)) == NULL) @@ -482,7 +503,7 @@ ldb_monitor() bcopy(curbuf, oldbuf, sizeof(oldbuf)); - printf("LDB monitor\n"); + printf("Welcome to LDB, a low-level debugger for the Lisp runtime environment.\n"); setjmp(curbuf);