#include <stdio.h>
+#include "sbcl.h"
#include "runtime.h"
#include "globals.h"
#include "validate.h"
#include "os.h"
-#include "sbcl.h"
#include "arch.h"
#include "lispregs.h"
#include "signal.h"
return &context->uc_mcontext.gregs[16];
#elif defined __FreeBSD__
return &context->uc_mcontext.mc_eflags;
-#elif defined __OpenBSD__ || defined __NetBSD__
+#elif defined __OpenBSD__
return &context->sc_eflags;
+#elif defined __NetBSD__
+ return &(context->uc_mcontext.__gregs[_REG_EFL]);
#else
#error unsupported OS
#endif
vlen = *(char*)(*os_context_pc_addr(context))++;
/* Skip Lisp error arg data bytes. */
while (vlen-- > 0) {
- ( (char*)(*os_context_pc_addr(context)) )++;
+ ++*os_context_pc_addr(context);
}
break;
int code = info->si_code;
os_context_t *context = (os_context_t*)void_context;
unsigned int trap;
- sigset_t ss;
if (single_stepping && (signal==SIGTRAP))
{
case trap_PendingInterrupt:
FSHOW((stderr, "/<trap pending interrupt>\n"));
arch_skip_instruction(context);
- sigemptyset(&ss);
- sigaddset(&ss,SIGTRAP);
- sigprocmask(SIG_UNBLOCK,&ss,0);
- interrupt_handle_pending(context);
+ interrupt_handle_pending(context);
break;
case trap_Halt:
break;
case trap_Breakpoint:
- (char*)(*os_context_pc_addr(context)) -= 1;
+ --*os_context_pc_addr(context);
handle_breakpoint(signal, info, context);
break;
case trap_FunEndBreakpoint:
- (char*)(*os_context_pc_addr(context)) -= 1;
+ --*os_context_pc_addr(context);
*os_context_pc_addr(context) =
(int)handle_fun_end_breakpoint(signal, info, context);
break;
args[2] = arg2;
return call_into_lisp(function, args, 3);
}
+
+#ifdef LISP_FEATURE_LINKAGE_TABLE
+/* FIXME: It might be cleaner to generate these from the lisp side of
+ * things.
+ */
+
+void
+arch_write_linkage_table_jmp(char * reloc, void * fun)
+{
+ /* Make JMP to function entry. JMP offset is calculated from next
+ * instruction.
+ */
+ long offset = (char *)fun - (reloc + 5);
+ int i;
+
+ *reloc++ = 0xe9; /* opcode for JMP rel32 */
+ for (i = 0; i < 4; i++) {
+ *reloc++ = offset & 0xff;
+ offset >>= 8;
+ }
+
+ /* write a nop for good measure. */
+ *reloc = 0x90;
+}
+
+void
+arch_write_linkage_table_ref(void * reloc, void * data)
+{
+ *(unsigned long *)reloc = (unsigned long)data;
+}
+
+#endif