projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.pre7.6:
[sbcl.git]
/
src
/
runtime
/
breakpoint.c
diff --git
a/src/runtime/breakpoint.c
b/src/runtime/breakpoint.c
index
d4f3516
..
9e95a8a
100644
(file)
--- a/
src/runtime/breakpoint.c
+++ b/
src/runtime/breakpoint.c
@@
-9,10
+9,6
@@
* files for more information.
*/
* files for more information.
*/
-/*
- * $Header$
- */
-
#include <stdio.h>
#include <signal.h>
#include <stdio.h>
#include <signal.h>
@@
-39,7
+35,7
@@
static void *compute_pc(lispobj code_obj, int pc_offset)
{
struct code *code;
{
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);
}
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)
{
#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;
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;
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
#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);
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),
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);
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. */
/* Don't disallow recursive breakpoint traps. Otherwise, we can't
* use debugger breakpoints anywhere in here. */