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);
if (pc < code_start)
return 0;
else {
- long offset = pc - code_start;
- if (offset >= codeptr->code_size)
+ unsigned long offset = pc - code_start;
+ if (offset >= (N_WORD_BYTES * fixnum_value(codeptr->code_size)))
return 0;
else
return make_fixnum(offset);
fake_foreign_function_call(context);
+#ifndef LISP_FEATURE_SB_SAFEPOINT
+ unblock_gc_signals(0, 0);
+#endif
context_sap = alloc_sap(context);
code = find_code(context);
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);
fake_foreign_function_call(context);
+#ifndef LISP_FEATURE_SB_SAFEPOINT
+ unblock_gc_signals(0, 0);
+#endif
context_sap = alloc_sap(context);
code = find_code(context);
codeptr = (struct code *)native_pointer(code);
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);
lra = codeptr->constants[REAL_LRA_SLOT];
+#ifdef LISP_FEATURE_PPC
+ /* PPC now passes LRA objects in reg_LRA during return. Other
+ * platforms should as well, but haven't been fixed yet. */
+ if (codeptr->constants[KNOWN_RETURN_P_SLOT] == NIL)
+ *os_context_register_addr(context, reg_LRA) = lra;
+#else
#ifdef reg_CODE
if (codeptr->constants[KNOWN_RETURN_P_SLOT] == NIL)
*os_context_register_addr(context, reg_CODE) = lra;
#endif
+#endif
undo_fake_foreign_function_call(context);
void
handle_single_step_trap (os_context_t *context, int kind, int register_offset)
{
- lispobj context_sap;
-
- /* Allocate the SAP object while the interrupts are still
- * disabled. */
- context_sap = alloc_sap(context);
-
fake_foreign_function_call(context);
#ifndef LISP_FEATURE_WIN32
thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
#endif
- funcall3(SymbolFunction(HANDLE_SINGLE_STEP_TRAP),
- context_sap,
+ funcall2(StaticSymbolFunction(HANDLE_SINGLE_STEP_TRAP),
make_fixnum(kind),
make_fixnum(register_offset));