#include "globals.h"
#include "alloc.h"
#include "breakpoint.h"
+#include "thread.h"
+#include "genesis/code.h"
+#include "genesis/fdefn.h"
#define REAL_LRA_SLOT 0
-#ifndef __i386__
+#ifndef LISP_FEATURE_X86
#define KNOWN_RETURN_P_SLOT 1
#define BOGUS_LRA_CONSTANTS 2
#else
{
struct code *code;
- code = (struct code *)PTR(code_obj);
+ code = (struct code *)native_pointer(code_obj);
return (void *)((char *)code + HeaderValue(code->header)*sizeof(lispobj)
+ pc_offset);
}
void breakpoint_do_displaced_inst(os_context_t* context,
unsigned long orig_inst)
{
-#if !defined(hpux) && !defined(irix) && !defined(__i386__)
+ /* on platforms with sigreturn(), we go directly back from
+ * arch_do_displaced_inst() to lisp code, so we need to clean up
+ * our bindings now. (side note: I'd love to know in exactly what
+ * scenario the speed of breakpoint handling is critical enough to
+ * justify this maintenance mess)
+ *
+ * -dan 2001.08.09 */
+
+#if (defined(sparc) && defined (solaris))
undo_fake_foreign_function_call(context);
#endif
arch_do_displaced_inst(context, orig_inst);
}
-#ifndef __i386__
+#ifndef LISP_FEATURE_X86
static lispobj find_code(os_context_t *context)
{
#ifdef reg_CODE
lispobj code = *os_context_register_addr(context, reg_CODE);
lispobj header;
- if (LowtagOf(code) != type_OtherPointer)
+ if (lowtag_of(code) != OTHER_POINTER_LOWTAG)
return NIL;
- header = *(lispobj *)(code-type_OtherPointer);
+ header = *(lispobj *)(code-OTHER_POINTER_LOWTAG);
- if (TypeOf(header) == type_CodeHeader)
+ if (widetag_of(header) == CODE_HEADER_WIDETAG)
return code;
else
return code - HeaderValue(header)*sizeof(lispobj);
}
#endif
-#ifdef __i386__
+#ifdef LISP_FEATURE_X86
static lispobj find_code(os_context_t *context)
{
- lispobj codeptr =
- (lispobj)component_ptr_from_pc((lispobj *)(*os_context_pc_addr(context)));
-
- if (codeptr == 0) {
- return NIL;
- } else {
- return codeptr + type_OtherPointer;
- }
+ lispobj codeptr =
+ (lispobj)component_ptr_from_pc((lispobj *)(*os_context_pc_addr(context)));
+
+ if (codeptr == 0) {
+ return NIL;
+ } else {
+ return codeptr + OTHER_POINTER_LOWTAG;
+ }
}
#endif
return 0;
else {
unsigned long code_start;
- struct code *codeptr = (struct code *)PTR(code);
+ struct code *codeptr = (struct code *)native_pointer(code);
#ifdef parisc
unsigned long pc = *os_context_pc_addr(context) & ~3;
#else
}
}
}
-
-#ifndef __i386__
+/* 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
+ */
+#ifndef LISP_FEATURE_X86
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,
}
#endif
-#ifndef __i386__
-void *handle_function_end_breakpoint(int signal, siginfo_t *info,
- os_context_t *context)
+#ifndef LISP_FEATURE_X86
+void *handle_fun_end_breakpoint(int signal, siginfo_t *info,
+ os_context_t *context)
{
lispobj code, lra;
struct code *codeptr;
fake_foreign_function_call(context);
code = find_code(context);
- codeptr = (struct code *)PTR(code);
+ codeptr = (struct code *)native_pointer(code);
+ /* FIXME again, calling into Lisp with signals masked. Is this
+ * sensible? */
funcall3(SymbolFunction(HANDLE_BREAKPOINT),
compute_offset(context, code),
code,
}
#endif
undo_fake_foreign_function_call(context);
- return (void *)(lra-type_OtherPointer+sizeof(lispobj));
+ return (void *)(lra-OTHER_POINTER_LOWTAG+sizeof(lispobj));
}
#else
-void *handle_function_end_breakpoint(int signal, siginfo_t *info,
- os_context_t *context)
+void *handle_fun_end_breakpoint(int signal, siginfo_t *info,
+ os_context_t *context)
{
lispobj code, context_sap = alloc_sap(context);
struct code *codeptr;
fake_foreign_function_call(context);
code = find_code(context);
- codeptr = (struct code *)PTR(code);
+ codeptr = (struct code *)native_pointer(code);
/* Don't disallow recursive breakpoint traps. Otherwise, we can't
* use debugger breakpoints anywhere in here. */