+ pc_offset);
}
-unsigned long breakpoint_install(lispobj code_obj, int pc_offset)
+unsigned int breakpoint_install(lispobj code_obj, int pc_offset)
{
return arch_install_breakpoint(compute_pc(code_obj, pc_offset));
}
void breakpoint_remove(lispobj code_obj, int pc_offset,
- unsigned long orig_inst)
+ unsigned int orig_inst)
{
arch_remove_breakpoint(compute_pc(code_obj, pc_offset), orig_inst);
}
void breakpoint_do_displaced_inst(os_context_t* context,
- unsigned long orig_inst)
+ unsigned int orig_inst)
{
/* on platforms with sigreturn(), we go directly back from
* arch_do_displaced_inst() to lisp code, so we need to clean up
arch_do_displaced_inst(context, orig_inst);
}
-#if !(defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64))
static lispobj find_code(os_context_t *context)
{
#ifdef reg_CODE
else
return code - HeaderValue(header)*sizeof(lispobj);
#else
- return NIL;
-#endif
-}
-#else
-static lispobj find_code(os_context_t *context)
-{
lispobj codeptr =
(lispobj)component_ptr_from_pc((lispobj *)(*os_context_pc_addr(context)));
- if (codeptr == 0) {
+ if (codeptr == 0)
return NIL;
- } else {
+ else
return codeptr + OTHER_POINTER_LOWTAG;
- }
-}
#endif
+}
static long compute_offset(os_context_t *context, lispobj code)
{
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 = alloc_sap(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);
+#ifndef LISP_FEATURE_WIN32
/* Don't disallow recursive breakpoint traps. Otherwise, we can't
* use debugger breakpoints anywhere in here. */
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);
}
-#if !(defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64))
-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, lra;
+ 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);
+#ifndef LISP_FEATURE_WIN32
/* Don't disallow recursive breakpoint traps. Otherwise, we can't
* use debugger breakpoints anywhere in here. */
thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
+#endif
- funcall3(SymbolFunction(HANDLE_BREAKPOINT),
+ funcall3(StaticSymbolFunction(HANDLE_BREAKPOINT),
compute_offset(context, code),
code,
- alloc_sap(context));
+ 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) {
+ if (codeptr->constants[KNOWN_RETURN_P_SLOT] == NIL)
*os_context_register_addr(context, reg_CODE) = lra;
- }
#endif
+#endif
+
undo_fake_foreign_function_call(context);
+
+#ifdef reg_LRA
return (void *)(lra-OTHER_POINTER_LOWTAG+sizeof(lispobj));
-}
#else
-void *handle_fun_end_breakpoint(int signal, siginfo_t *info,
- os_context_t *context)
-{
- lispobj code, context_sap = alloc_sap(context);
- struct code *codeptr;
+ 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);
- code = find_code(context);
- codeptr = (struct code *)native_pointer(code);
-
- /* Don't disallow recursive breakpoint traps. Otherwise, we can't
- * use debugger breakpoints anywhere in here. */
+#ifndef LISP_FEATURE_WIN32
thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
+#endif
- funcall3(SymbolFunction(HANDLE_BREAKPOINT),
- compute_offset(context, code),
- code,
- context_sap);
-
- undo_fake_foreign_function_call(context);
+ funcall2(StaticSymbolFunction(HANDLE_SINGLE_STEP_TRAP),
+ make_fixnum(kind),
+ make_fixnum(register_offset));
- return compute_pc(codeptr->constants[REAL_LRA_SLOT],
- fixnum_value(codeptr->constants[REAL_LRA_SLOT+1]));
+ undo_fake_foreign_function_call(context); /* blocks signals again */
}
-#endif
projects / sbcl.git / blobdiff