X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fbreakpoint.c;h=cf829ad16d597a562b24bf7d785f0db652a40df7;hb=b03ad9b03a3cfec37db9bf6bb0912725959335e3;hp=70e5117bdd4cd8afcfe2e4888c2c47b14ccd2380;hpb=70c579379283da66f97906a0d62c8a5fc34e4dab;p=sbcl.git diff --git a/src/runtime/breakpoint.c b/src/runtime/breakpoint.c index 70e5117..cf829ad 100644 --- a/src/runtime/breakpoint.c +++ b/src/runtime/breakpoint.c @@ -40,7 +40,7 @@ static void *compute_pc(lispobj code_obj, int pc_offset) code = (struct code *)native_pointer(code_obj); return (void *)((char *)code + HeaderValue(code->header)*sizeof(lispobj) - + pc_offset); + + pc_offset); } unsigned long breakpoint_install(lispobj code_obj, int pc_offset) @@ -49,13 +49,13 @@ unsigned long breakpoint_install(lispobj code_obj, int pc_offset) } void breakpoint_remove(lispobj code_obj, int pc_offset, - unsigned long orig_inst) + unsigned long 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 long orig_inst) { /* on platforms with sigreturn(), we go directly back from * arch_do_displaced_inst() to lisp code, so we need to clean up @@ -65,7 +65,7 @@ void breakpoint_do_displaced_inst(os_context_t* context, * * -dan 2001.08.09 */ -#if (defined(sparc) && defined (solaris)) +#if (defined(LISP_FEATURE_SPARC) && defined (solaris)) undo_fake_foreign_function_call(context); #endif arch_do_displaced_inst(context, orig_inst); @@ -79,14 +79,14 @@ static lispobj find_code(os_context_t *context) lispobj header; if (lowtag_of(code) != OTHER_POINTER_LOWTAG) - return NIL; + return NIL; header = *(lispobj *)(code-OTHER_POINTER_LOWTAG); if (widetag_of(header) == CODE_HEADER_WIDETAG) - return code; + return code; else - return code - HeaderValue(header)*sizeof(lispobj); + return code - HeaderValue(header)*sizeof(lispobj); #else return NIL; #endif @@ -95,12 +95,12 @@ static lispobj find_code(os_context_t *context) static lispobj find_code(os_context_t *context) { lispobj codeptr = - (lispobj)component_ptr_from_pc((lispobj *)(*os_context_pc_addr(context))); + (lispobj)component_ptr_from_pc((lispobj *)(*os_context_pc_addr(context))); if (codeptr == 0) { - return NIL; + return NIL; } else { - return codeptr + OTHER_POINTER_LOWTAG; + return codeptr + OTHER_POINTER_LOWTAG; } } #endif @@ -108,51 +108,30 @@ static lispobj find_code(os_context_t *context) static long compute_offset(os_context_t *context, lispobj code) { if (code == NIL) - return 0; + return 0; else { - unsigned long code_start; - struct code *codeptr = (struct code *)native_pointer(code); + unsigned long code_start; + struct code *codeptr = (struct code *)native_pointer(code); #ifdef parisc - unsigned long pc = *os_context_pc_addr(context) & ~3; + 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); #endif - code_start = (unsigned long)codeptr - + HeaderValue(codeptr->header)*sizeof(lispobj); - if (pc < code_start) - return 0; - else { - long offset = pc - code_start; - if (offset >= codeptr->code_size) - return 0; - else - return make_fixnum(offset); - } + code_start = (unsigned long)codeptr + + HeaderValue(codeptr->header)*sizeof(lispobj); + if (pc < code_start) + return 0; + else { + long offset = pc - code_start; + if (offset >= codeptr->code_size) + return 0; + else + return make_fixnum(offset); + } } } -/* FIXME: I can see no really good reason these couldn't be merged, but haven't - * tried. The sigprocmask() call would work just as well on alpha as it - * presumably does on x86 -dan 2001.08.10 - */ -#if !(defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)) -void handle_breakpoint(int signal, siginfo_t *info, os_context_t *context) -{ - lispobj code; - - fake_foreign_function_call(context); - - code = find_code(context); - /* FIXME we're calling into Lisp with signals masked here. Is this - * the right thing to do? */ - funcall3(SymbolFunction(HANDLE_BREAKPOINT), - compute_offset(context, code), - code, - alloc_sap(context)); - undo_fake_foreign_function_call(context); -} -#else void handle_breakpoint(int signal, siginfo_t* info, os_context_t *context) { lispobj code, context_sap = alloc_sap(context); @@ -163,20 +142,19 @@ void handle_breakpoint(int signal, siginfo_t* info, os_context_t *context) /* Don't disallow recursive breakpoint traps. Otherwise, we can't * use debugger breakpoints anywhere in here. */ - sigprocmask(SIG_SETMASK, os_context_sigmask_addr(context), 0); + thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0); funcall3(SymbolFunction(HANDLE_BREAKPOINT), - compute_offset(context, code), - code, - context_sap); + compute_offset(context, code), + code, + context_sap); undo_fake_foreign_function_call(context); } -#endif #if !(defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)) void *handle_fun_end_breakpoint(int signal, siginfo_t *info, - os_context_t *context) + os_context_t *context) { lispobj code, lra; struct code *codeptr; @@ -186,17 +164,19 @@ void *handle_fun_end_breakpoint(int signal, siginfo_t *info, code = find_code(context); codeptr = (struct code *)native_pointer(code); - /* FIXME again, calling into Lisp with signals masked. Is this - * sensible? */ + /* 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); + funcall3(SymbolFunction(HANDLE_BREAKPOINT), - compute_offset(context, code), - code, - alloc_sap(context)); + compute_offset(context, code), + code, + alloc_sap(context)); lra = codeptr->constants[REAL_LRA_SLOT]; #ifdef reg_CODE if (codeptr->constants[KNOWN_RETURN_P_SLOT] == NIL) { - *os_context_register_addr(context, reg_CODE) = lra; + *os_context_register_addr(context, reg_CODE) = lra; } #endif undo_fake_foreign_function_call(context); @@ -204,7 +184,7 @@ void *handle_fun_end_breakpoint(int signal, siginfo_t *info, } #else void *handle_fun_end_breakpoint(int signal, siginfo_t *info, - os_context_t *context) + os_context_t *context) { lispobj code, context_sap = alloc_sap(context); struct code *codeptr; @@ -216,16 +196,16 @@ void *handle_fun_end_breakpoint(int signal, siginfo_t *info, /* Don't disallow recursive breakpoint traps. Otherwise, we can't * use debugger breakpoints anywhere in here. */ - sigprocmask(SIG_SETMASK, os_context_sigmask_addr(context), 0); + thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0); funcall3(SymbolFunction(HANDLE_BREAKPOINT), - compute_offset(context, code), - code, - context_sap); + compute_offset(context, code), + code, + context_sap); undo_fake_foreign_function_call(context); return compute_pc(codeptr->constants[REAL_LRA_SLOT], - fixnum_value(codeptr->constants[REAL_LRA_SLOT+1])); + fixnum_value(codeptr->constants[REAL_LRA_SLOT+1])); } #endif