if (code == NIL)
return 0;
else {
- unsigned long code_start;
+ uword_t code_start;
struct code *codeptr = (struct code *)native_pointer(code);
-#ifdef parisc
- unsigned long pc = *os_context_pc_addr(context) & ~3;
+#ifdef LISP_FEATURE_HPPA
+ uword_t pc = *os_context_pc_addr(context) & ~3;
#else
- unsigned long pc = *os_context_pc_addr(context);
+ uword_t pc = *os_context_pc_addr(context);
#endif
- code_start = (unsigned long)codeptr
+ code_start = (uword_t)codeptr
+ HeaderValue(codeptr->header)*sizeof(lispobj);
if (pc < code_start)
return 0;
else {
- 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);
}
}
-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);
+#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);
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);
+#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);
return compute_pc(lra, fixnum_value(codeptr->constants[REAL_LRA_SLOT+1]));
#endif
}
+
+void
+handle_single_step_trap (os_context_t *context, int kind, int register_offset)
+{
+ fake_foreign_function_call(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));
+
+ undo_fake_foreign_function_call(context); /* blocks signals again */
+}