projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better initialization of ir2-component-constants on x86-64.
[sbcl.git]
/
src
/
runtime
/
breakpoint.c
diff --git
a/src/runtime/breakpoint.c
b/src/runtime/breakpoint.c
index
a325693
..
3c99cc4
100644
(file)
--- a/
src/runtime/breakpoint.c
+++ b/
src/runtime/breakpoint.c
@@
-102,21
+102,21
@@
static long compute_offset(os_context_t *context, lispobj code)
if (code == NIL)
return 0;
else {
if (code == NIL)
return 0;
else {
- unsigned long code_start;
+ uword_t code_start;
struct code *codeptr = (struct code *)native_pointer(code);
#ifdef LISP_FEATURE_HPPA
struct code *codeptr = (struct code *)native_pointer(code);
#ifdef LISP_FEATURE_HPPA
- unsigned long pc = *os_context_pc_addr(context) & ~3;
+ uword_t pc = *os_context_pc_addr(context) & ~3;
#else
#else
- unsigned long pc = *os_context_pc_addr(context);
+ uword_t pc = *os_context_pc_addr(context);
#endif
#endif
- code_start = (unsigned long)codeptr
+ code_start = (uword_t)codeptr
+ HeaderValue(codeptr->header)*sizeof(lispobj);
if (pc < code_start)
return 0;
else {
+ HeaderValue(codeptr->header)*sizeof(lispobj);
if (pc < code_start)
return 0;
else {
- unsigned long offset = pc - code_start;
- if (offset >= codeptr->code_size)
+ uword_t offset = pc - code_start;
+ if (offset >= (N_WORD_BYTES * fixnum_value(codeptr->code_size)))
return 0;
else
return make_fixnum(offset);
return 0;
else
return make_fixnum(offset);
@@
-130,7
+130,9
@@
void handle_breakpoint(os_context_t *context)
fake_foreign_function_call(context);
fake_foreign_function_call(context);
+#ifndef LISP_FEATURE_SB_SAFEPOINT
unblock_gc_signals(0, 0);
unblock_gc_signals(0, 0);
+#endif
context_sap = alloc_sap(context);
code = find_code(context);
context_sap = alloc_sap(context);
code = find_code(context);
@@
-155,7
+157,9
@@
void *handle_fun_end_breakpoint(os_context_t *context)
fake_foreign_function_call(context);
fake_foreign_function_call(context);
+#ifndef LISP_FEATURE_SB_SAFEPOINT
unblock_gc_signals(0, 0);
unblock_gc_signals(0, 0);
+#endif
context_sap = alloc_sap(context);
code = find_code(context);
codeptr = (struct code *)native_pointer(code);
context_sap = alloc_sap(context);
code = find_code(context);
codeptr = (struct code *)native_pointer(code);