From 7c96d7c62d46f4ba2711c06d45150e2441bbf1a7 Mon Sep 17 00:00:00 2001 From: Thiemo Seufer Date: Thu, 11 Dec 2008 20:38:32 +0000 Subject: [PATCH] 1.0.23.34: A nicer register dump for ldb. --- src/runtime/monitor.c | 21 ++++++++++----------- version.lisp-expr | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/runtime/monitor.c b/src/runtime/monitor.c index 0856db7cf..ce0ef794d 100644 --- a/src/runtime/monitor.c +++ b/src/runtime/monitor.c @@ -188,19 +188,26 @@ kill_cmd(char **ptr) static void regs_cmd(char **ptr) { - printf("CSP\t=\t0x%08lx\n", (unsigned long)current_control_stack_pointer); - printf("CFP\t=\t0x%08lx\n", (unsigned long)current_control_frame_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 #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 @@ -208,20 +215,12 @@ regs_cmd(char **ptr) printf("ALLOC\t=\t0x%08lx\n", (unsigned long)dynamic_space_free_pointer); #else printf("ALLOC\t=\t0x%08lx\n", - (unsigned long)SymbolValue(ALLOCATION_POINTER, - arch_os_get_current_thread())); + (unsigned long)SymbolValue(ALLOCATION_POINTER, 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)); - printf("RDONLY\t=\t0x%08lx\n", - (unsigned long)SymbolValue(READ_ONLY_SPACE_FREE_POINTER)); -#endif } static void diff --git a/version.lisp-expr b/version.lisp-expr index 68858ff44..160131f59 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".) -"1.0.23.33" +"1.0.23.34" -- 2.11.4.GIT