X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fmonitor.c;h=69d03805c3e1cf4ad4678d4537cc77876fac2a63;hb=e4542bc034db18cf98f005b2dac53a6d7d5c7260;hp=c37c2d58367bf8a1b3f8ca282288d1a86fb68ec9;hpb=3bb2fb5b9ecdeebecaded4ac6e5af0f653be8867;p=sbcl.git diff --git a/src/runtime/monitor.c b/src/runtime/monitor.c index c37c2d5..69d0380 100644 --- a/src/runtime/monitor.c +++ b/src/runtime/monitor.c @@ -18,8 +18,10 @@ #include #include -#include "runtime.h" #include "sbcl.h" +#include "runtime.h" +#include "parse.h" +#include "vars.h" /* Almost all of this file can be skipped if we're not supporting LDB. */ #if defined(LISP_FEATURE_SB_LDB) @@ -33,8 +35,9 @@ #include "globals.h" #include "lispregs.h" #include "interrupt.h" +#include "thread.h" #include "genesis/static-symbols.h" -#include "primitive-objects.h" +#include "genesis/primitive-objects.h" @@ -45,7 +48,7 @@ * * (We could set up output to go to a special ldb_out stream for the * same reason, but there's been no pressure for that so far.) - * + * * The enter-the-ldb-monitor function is responsible for setting up * this stream. */ static FILE *ldb_in = 0; @@ -131,13 +134,13 @@ dump_cmd(char **ptr) } while (count-- > 0) { -#ifndef alpha +#ifndef LISP_FEATURE_ALPHA printf("0x%08lX: ", (unsigned long) addr); #else printf("0x%08X: ", (u32) addr); #endif if (is_valid_lisp_addr((os_vm_address_t)addr)) { -#ifndef alpha +#ifndef LISP_FEATURE_ALPHA unsigned long *lptr = (unsigned long *)addr; #else u32 *lptr = (u32 *)addr; @@ -145,7 +148,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"); @@ -173,32 +183,39 @@ kill_cmd(char **ptr) 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(__i386__) - printf("BSP\t=\t0x%08X\n", (unsigned long)current_binding_stack_pointer); + printf("CSP\t=\t0x%08lx\n", (unsigned long)current_control_stack_pointer); + printf("CFP\t=\t0x%08lx\n", (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)); */ #endif -#ifdef __i386__ - 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("DYNAMIC\t=\t0x%08lx\n", (unsigned long)current_dynamic_space); #endif - printf("DYNAMIC\t=\t0x%08lx\n", (unsigned long)DYNAMIC_SPACE_START); -#if defined(__i386__) - 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, + arch_os_get_current_thread())); +#endif + +#ifndef LISP_FEATURE_GENCGC printf("TRIGGER\t=\t0x%08lx\n", (unsigned long)current_auto_gc_trigger); #endif + +#if 0 printf("STATIC\t=\t0x%08lx\n", - (unsigned long)SymbolValue(STATIC_SPACE_FREE_POINTER)); + (unsigned long)SymbolValue(STATIC_SPACE_FREE_POINTER)); printf("RDONLY\t=\t0x%08lx\n", - (unsigned long)SymbolValue(READ_ONLY_SPACE_FREE_POINTER)); - -#ifdef MIPS - printf("FLAGS\t=\t0x%08x\n", current_flags_register); + (unsigned long)SymbolValue(READ_ONLY_SPACE_FREE_POINTER)); #endif } @@ -253,13 +270,13 @@ search_cmd(char **ptr) if (widetag_of(obj) == SIMPLE_FUN_HEADER_WIDETAG) { print((long)addr | FUN_POINTER_LOWTAG); } else if (lowtag_of(obj) == OTHER_IMMEDIATE_0_LOWTAG || - lowtag_of(obj) == OTHER_IMMEDIATE_1_LOWTAG) { + lowtag_of(obj) == OTHER_IMMEDIATE_1_LOWTAG) { print((lispobj)addr | OTHER_POINTER_LOWTAG); } else { print((lispobj)addr); } if (count == -1) { return; - } + } } } @@ -283,7 +300,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 @@ -316,46 +333,51 @@ print_context(os_context_t *context) int 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))); + printf("%s:\t", lisp_register_names[i]); +#ifdef LISP_FEATURE_X86 + 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 } +#ifdef LISP_FEATURE_DARWIN + printf("DAR:\t\t 0x%08lx\n", (unsigned long)(*os_context_register_addr(context, 41))); + printf("DSISR:\t\t 0x%08lx\n", (unsigned long)(*os_context_register_addr(context, 42))); +#endif printf("PC:\t\t 0x%08lx\n", - (unsigned long)(*os_context_pc_addr(context))); + (unsigned long)(*os_context_pc_addr(context))); } static void print_context_cmd(char **ptr) { - int free; + int free_ici; + struct thread *thread=arch_os_get_current_thread(); + + free_ici = fixnum_value(SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,thread)); - 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); - } + int index; + + index = parse_number(ptr); + + 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_ici); + } } 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]); - } + if (free_ici == 0) + printf("There are no interrupt contexts!\n"); + else { + 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]); + } } } @@ -366,9 +388,9 @@ backtrace_cmd(char **ptr) int n; if (more_p(ptr)) - n = parse_number(ptr); + n = parse_number(ptr); else - n = 100; + n = 100; printf("Backtrace:\n"); backtrace(n); @@ -378,27 +400,26 @@ static void catchers_cmd(char **ptr) { struct catch_block *catch; + struct thread *thread=arch_os_get_current_thread(); - catch = (struct catch_block *)SymbolValue(CURRENT_CATCH_BLOCK); + catch = (struct catch_block *)SymbolValue(CURRENT_CATCH_BLOCK,thread); if (catch == NULL) printf("There are no active catchers!\n"); else { while (catch != NULL) { -#ifndef __i386__ - printf("0x%08lX:\n\tuwp: 0x%08lX\n\tfp: 0x%08lX\n\tcode: 0x%08lx\n\tentry: 0x%08lx\n\ttag: ", - (unsigned long)catch, (unsigned long)(catch->current_uwp), - (unsigned long)(catch->current_cont), - catch->current_code, - catch->entry_pc); + printf("0x%08lX:\n\tuwp: 0x%08lX\n\tfp: 0x%08lX\n\t" + "code: 0x%08lX\n\tentry: 0x%08lX\n\ttag: ", + (unsigned long)catch, + (unsigned long)(catch->current_uwp), + (unsigned long)(catch->current_cont), +#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64) + (unsigned long)component_ptr_from_pc((void*)catch->entry_pc) + + OTHER_POINTER_LOWTAG, #else - printf("0x%08lX:\n\tuwp: 0x%08lX\n\tfp: 0x%08lX\n\tcode: 0x%08lx\n\tentry: 0x%08lx\n\ttag: ", - (unsigned long)catch, (unsigned long)(catch->current_uwp), - (unsigned long)(catch->current_cont), - (unsigned long)component_ptr_from_pc((void*)catch->entry_pc) + - OTHER_POINTER_LOWTAG, - (unsigned long)catch->entry_pc); + (unsigned long)(catch->current_code), #endif + (unsigned long)(catch->entry_pc)); brief_print((lispobj)catch->tag); catch = catch->previous_catch; } @@ -423,8 +444,8 @@ sub_monitor(void) int ambig; if (!ldb_in) { - ldb_in = fopen("/dev/tty","r+"); - ldb_in_fd = fileno(ldb_in); + ldb_in = fopen("/dev/tty","r+"); + ldb_in_fd = fileno(ldb_in); } while (!done) { @@ -432,15 +453,15 @@ 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); - } - } + if (isatty(ldb_in_fd)) { + putchar('\n'); + continue; + } + else { + fprintf(stderr, "\nEOF on something other than a tty.\n"); + exit(0); + } + } ptr = line; if ((token = parse_token(&ptr)) == NULL) continue; @@ -503,7 +524,11 @@ monitor_or_something() #if defined(LISP_FEATURE_SB_LDB) ldb_monitor(); #else - fprintf(stderr, "There's no LDB in this build; exiting.\n"); + fprintf(stderr, +"The system is too badly corrupted or confused to continue at the Lisp\n\ +level. If the system had been compiled with the SB-LDB feature, we'd drop\n\ +into the LDB low-level debugger now. But there's no LDB in this build, so\n\ +we can't really do anything but just exit, sorry.\n"); exit(1); #endif }