X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fmonitor.c;h=45a9b00cb61e28b1060be8a50fbb2b85ca88975f;hb=1bab7f87e5800ae7d0eed4e301de15125e72bd6f;hp=193f4c13c56c05750e2761e2b31a45871792f65b;hpb=1d329efe312141d5385af1d2e98f72f938b5f7b6;p=sbcl.git

diff --git a/src/runtime/monitor.c b/src/runtime/monitor.c
index 193f4c1..45a9b00 100644
--- a/src/runtime/monitor.c
+++ b/src/runtime/monitor.c
@@ -190,8 +190,10 @@ regs_cmd(char **ptr)
 {
     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);
+    printf("CSP\t=\t0x%08lx   ", (unsigned long)access_control_stack_pointer(thread));
+#if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64)
+    printf("CFP\t=\t0x%08lx   ", (unsigned long)access_control_frame_pointer(thread));
+#endif
 
 #ifdef reg_BSP
     printf("BSP\t=\t0x%08lx\n", (unsigned long)get_binding_stack_pointer(thread));
@@ -391,7 +393,7 @@ print_context_cmd(char **ptr)
 static void
 backtrace_cmd(char **ptr)
 {
-    void backtrace(int frames);
+    void lisp_backtrace(int frames);
     int n;
 
     if (more_p(ptr))
@@ -400,7 +402,7 @@ backtrace_cmd(char **ptr)
         n = 100;
 
     printf("Backtrace:\n");
-    backtrace(n);
+    lisp_backtrace(n);
 }
 
 static void