projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.29.13: relax CAST-EXTERNALLY-CHECKABLE-P a bit
[sbcl.git]
/
src
/
runtime
/
breakpoint.c
diff --git
a/src/runtime/breakpoint.c
b/src/runtime/breakpoint.c
index
9b7b318
..
45639c4
100644
(file)
--- a/
src/runtime/breakpoint.c
+++ b/
src/runtime/breakpoint.c
@@
-104,7
+104,7
@@
static long compute_offset(os_context_t *context, lispobj code)
else {
unsigned long code_start;
struct code *codeptr = (struct code *)native_pointer(code);
else {
unsigned long code_start;
struct code *codeptr = (struct code *)native_pointer(code);
-#ifdef parisc
+#ifdef LISP_FEATURE_HPPA
unsigned long pc = *os_context_pc_addr(context) & ~3;
#else
unsigned long pc = *os_context_pc_addr(context);
unsigned long pc = *os_context_pc_addr(context) & ~3;
#else
unsigned long pc = *os_context_pc_addr(context);
@@
-115,7
+115,7
@@
static long compute_offset(os_context_t *context, lispobj code)
if (pc < code_start)
return 0;
else {
if (pc < code_start)
return 0;
else {
- long offset = pc - code_start;
+ unsigned long offset = pc - code_start;
if (offset >= codeptr->code_size)
return 0;
else
if (offset >= codeptr->code_size)
return 0;
else
@@
-124,12
+124,13
@@
static long compute_offset(os_context_t *context, lispobj code)
}
}
}
}
-void handle_breakpoint(int signal, siginfo_t* info, os_context_t *context)
+void handle_breakpoint(os_context_t *context)
{
lispobj code, context_sap;
fake_foreign_function_call(context);
{
lispobj code, context_sap;
fake_foreign_function_call(context);
+ unblock_gc_signals(0, 0);
context_sap = alloc_sap(context);
code = find_code(context);
context_sap = alloc_sap(context);
code = find_code(context);
@@
-139,7
+140,7
@@
void handle_breakpoint(int signal, siginfo_t* info, os_context_t *context)
thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
#endif
thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
#endif
- funcall3(SymbolFunction(HANDLE_BREAKPOINT),
+ funcall3(StaticSymbolFunction(HANDLE_BREAKPOINT),
compute_offset(context, code),
code,
context_sap);
compute_offset(context, code),
code,
context_sap);
@@
-147,14
+148,14
@@
void handle_breakpoint(int signal, siginfo_t* info, os_context_t *context)
undo_fake_foreign_function_call(context);
}
undo_fake_foreign_function_call(context);
}
-void *handle_fun_end_breakpoint(int signal, siginfo_t *info,
- os_context_t *context)
+void *handle_fun_end_breakpoint(os_context_t *context)
{
lispobj code, context_sap, lra;
struct code *codeptr;
fake_foreign_function_call(context);
{
lispobj code, context_sap, lra;
struct code *codeptr;
fake_foreign_function_call(context);
+ unblock_gc_signals(0, 0);
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);
@@
-165,7
+166,7
@@
void *handle_fun_end_breakpoint(int signal, siginfo_t *info,
thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
#endif
thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
#endif
- funcall3(SymbolFunction(HANDLE_BREAKPOINT),
+ funcall3(StaticSymbolFunction(HANDLE_BREAKPOINT),
compute_offset(context, code),
code,
context_sap);
compute_offset(context, code),
code,
context_sap);
@@
-191,10
+192,13
@@
handle_single_step_trap (os_context_t *context, int kind, int register_offset)
{
fake_foreign_function_call(context);
{
fake_foreign_function_call(context);
- funcall3(SymbolFunction(HANDLE_SINGLE_STEP_TRAP),
- alloc_sap(context),
+#ifndef LISP_FEATURE_WIN32
+ thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
+#endif
+
+ funcall2(StaticSymbolFunction(HANDLE_SINGLE_STEP_TRAP),
make_fixnum(kind),
make_fixnum(register_offset));
make_fixnum(kind),
make_fixnum(register_offset));
- undo_fake_foreign_function_call(context);
+ undo_fake_foreign_function_call(context); /* blocks signals again */
}
}