From 79d0a575af35d894966ea052415fb0c67dd888a6 Mon Sep 17 00:00:00 2001 From: Thiemo Seufer Date: Sat, 15 Oct 2005 20:00:27 +0000 Subject: [PATCH] 0.9.5.72: Improve ldb register output. --- src/runtime/monitor.c | 45 ++++++++++++++++++++++++++++++--------------- version.lisp-expr | 2 +- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/src/runtime/monitor.c b/src/runtime/monitor.c index 87590b1..0f82724 100644 --- a/src/runtime/monitor.c +++ b/src/runtime/monitor.c @@ -148,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"); @@ -176,31 +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(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)) - printf("BSP\t=\t0x%08lX\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 -#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("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)) +#ifdef reg_ALLOC + printf("ALLOC\t=\t0x%08lx\n", (unsigned long)dynamic_space_free_pointer); +#else printf("ALLOC\t=\t0x%08lx\n", (unsigned long)SymbolValue(ALLOCATION_POINTER)); -#else - printf("ALLOC\t=\t0x%08X\n", - (unsigned long)dynamic_space_free_pointer); +#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)); printf("RDONLY\t=\t0x%08lx\n", (unsigned long)SymbolValue(READ_ONLY_SPACE_FREE_POINTER)); -#endif /* 0 */ +#endif } static void diff --git a/version.lisp-expr b/version.lisp-expr index 1d2cce3..dc7fdb9 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.9.5.71" +"0.9.5.72" -- 1.7.10.4