X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fbreakpoint.c;h=9e95a8a4d00070eb610d01ae6b955b82c1ffe590;hb=5d18b03968d5fc696790609ae0ac2669473fbfb7;hp=d4f351649d55b7e64cd1c6ccbf9714227ea515a2;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git

diff --git a/src/runtime/breakpoint.c b/src/runtime/breakpoint.c
index d4f3516..9e95a8a 100644
--- a/src/runtime/breakpoint.c
+++ b/src/runtime/breakpoint.c
@@ -9,10 +9,6 @@
  * files for more information.
  */
 
-/*
- * $Header$
- */
-
 #include <stdio.h>
 #include <signal.h>
 
@@ -39,7 +35,7 @@ static void *compute_pc(lispobj code_obj, int pc_offset)
 {
     struct code *code;
 
-    code = (struct code *)PTR(code_obj);
+    code = (struct code *)native_pointer(code_obj);
     return (void *)((char *)code + HeaderValue(code->header)*sizeof(lispobj)
 		    + pc_offset);
 }
@@ -89,7 +85,8 @@ static lispobj find_code(os_context_t *context)
 #ifdef __i386__
 static lispobj find_code(os_context_t *context)
 {
-  lispobj codeptr = component_ptr_from_pc(*os_context_pc_addr(context));
+  lispobj codeptr =
+      (lispobj)component_ptr_from_pc((lispobj *)(*os_context_pc_addr(context)));
 
   if (codeptr == 0) {
       return NIL;
@@ -105,7 +102,7 @@ static int compute_offset(os_context_t *context, lispobj code)
 	return 0;
     else {
 	unsigned long code_start;
-	struct code *codeptr = (struct code *)PTR(code);
+	struct code *codeptr = (struct code *)native_pointer(code);
 #ifdef parisc
 	unsigned long pc = *os_context_pc_addr(context) & ~3;
 #else
@@ -174,7 +171,7 @@ void *handle_function_end_breakpoint(int signal, siginfo_t *info,
     fake_foreign_function_call(context);
 
     code = find_code(context);
-    codeptr = (struct code *)PTR(code);
+    codeptr = (struct code *)native_pointer(code);
 
     funcall3(SymbolFunction(HANDLE_BREAKPOINT),
 	     compute_offset(context, code),
@@ -200,7 +197,7 @@ void *handle_function_end_breakpoint(int signal, siginfo_t *info,
     fake_foreign_function_call(context);
 
     code = find_code(context);
-    codeptr = (struct code *)PTR(code);
+    codeptr = (struct code *)native_pointer(code);
 
     /* Don't disallow recursive breakpoint traps. Otherwise, we can't
      * use debugger breakpoints anywhere in here. */