* files for more information.
*/
-/*
- * $Header$
- */
-
#include <stdio.h>
#include "runtime.h"
#include "interrupt.h"
#include "interr.h"
#include "breakpoint.h"
+#include "monitor.h"
+#include "thread.h"
+
+#include "genesis/static-symbols.h"
+#include "genesis/symbol.h"
#define BREAKPOINT_INST 0xcc /* INT3 */
return &context->uc_mcontext.gregs[16];
#elif defined __FreeBSD__
return &context->uc_mcontext.mc_eflags;
-#elif defined __OpenBSD__
+#elif defined __OpenBSD__ || defined __NetBSD__
return &context->sc_eflags;
+#elif defined __NetBSD__
+ return &(context->uc_mcontext.__gregs[_REG_EFL]);
#else
#error unsupported OS
#endif
int vlen;
int code;
- FSHOW((stderr, "[arch_skip_inst at %x]\n", *os_context_pc_addr(context)));
-
+
/* Get and skip the Lisp interrupt code. */
code = *(char*)(*os_context_pc_addr(context))++;
switch (code)
vlen = *(char*)(*os_context_pc_addr(context))++;
/* Skip Lisp error arg data bytes. */
while (vlen-- > 0) {
- (char*)(*os_context_pc_addr(context))++;
+ ( (char*)(*os_context_pc_addr(context)) )++;
}
break;
case trap_Breakpoint: /* not tested */
- case trap_FunctionEndBreakpoint: /* not tested */
+ case trap_FunEndBreakpoint: /* not tested */
break;
case trap_PendingInterrupt:
}
FSHOW((stderr,
- "[arch_skip_inst resuming at %x]\n",
+ "/[arch_skip_inst resuming at %x]\n",
*os_context_pc_addr(context)));
}
boolean
arch_pseudo_atomic_atomic(os_context_t *context)
{
- return SymbolValue(PSEUDO_ATOMIC_ATOMIC);
+ return SymbolValue(PSEUDO_ATOMIC_ATOMIC,arch_os_get_current_thread());
}
void
arch_set_pseudo_atomic_interrupted(os_context_t *context)
{
- SetSymbolValue(PSEUDO_ATOMIC_INTERRUPTED, make_fixnum(1));
+ SetSymbolValue(PSEUDO_ATOMIC_INTERRUPTED, make_fixnum(1),
+ arch_os_get_current_thread());
}
\f
/*
\f
/* When single stepping, single_stepping holds the original instruction
* PC location. */
-unsigned int *single_stepping=NULL;
-#ifndef __linux__
+unsigned int *single_stepping = NULL;
+#ifdef CANNOT_GET_TO_SINGLE_STEP_FLAG
unsigned int single_step_save1;
unsigned int single_step_save2;
unsigned int single_step_save3;
#endif
void
-arch_do_displaced_inst(os_context_t *context, unsigned long orig_inst)
+arch_do_displaced_inst(os_context_t *context, unsigned int orig_inst)
{
unsigned int *pc = (unsigned int*)(*os_context_pc_addr(context));
*((char *)pc) = orig_inst & 0xff;
*((char *)pc + 1) = (orig_inst & 0xff00) >> 8;
-#ifdef __linux__
- *context_eflags_addr(context) |= 0x100;
-#else
+#ifdef CANNOT_GET_TO_SINGLE_STEP_FLAG
/* Install helper instructions for the single step:
* pushf; or [esp],0x100; popf. */
single_step_save1 = *(pc-3);
*(pc-3) = 0x9c909090;
*(pc-2) = 0x00240c81;
*(pc-1) = 0x9d000001;
+#else
+ *context_eflags_addr(context) |= 0x100;
#endif
single_stepping = (unsigned int*)pc;
-#ifndef __linux__
+#ifdef CANNOT_GET_TO_SINGLE_STEP_FLAG
*os_context_pc_addr(context) = (char *)pc - 9;
#endif
}
int code = info->si_code;
os_context_t *context = (os_context_t*)void_context;
unsigned int trap;
-
- SHOW("entering sigtrap_handler(..)"); /* REMOVEME */
+ sigset_t ss;
if (single_stepping && (signal==SIGTRAP))
{
/* fprintf(stderr,"* single step trap %x\n", single_stepping); */
-#ifndef __linux__
+#ifdef CANNOT_GET_TO_SINGLE_STEP_FLAG
/* Un-install single step helper instructions. */
*(single_stepping-3) = single_step_save1;
*(single_stepping-2) = single_step_save2;
if (*os_context_pc_addr(context) == (int)single_stepping + 1) {
fprintf(stderr, "warning: couldn't reinstall breakpoint\n");
} else {
- char *ptr = (char*)single_stepping;
*((char *)single_stepping) = BREAKPOINT_INST; /* x86 INT3 */
*((char *)single_stepping+1) = trap_Breakpoint;
}
/* This is just for info in case the monitor wants to print an
* approximation. */
current_control_stack_pointer =
- (lispobj*)*os_context_sp_addr(context);
+ (lispobj *)*os_context_sp_addr(context);
+
+ /* FIXME: CMUCL puts the float control restoration code here.
+ Thus, it seems to me that single-stepping won't restore the
+ float control. Since SBCL currently doesn't support
+ single-stepping (as far as I can tell) this is somewhat moot,
+ but it might be worth either moving this code up or deleting
+ the single-stepping code entirely. -- CSR, 2002-07-15 */
+#ifdef LISP_FEATURE_LINUX
+ os_restore_fp_control(context);
+#endif
/* On entry %eip points just after the INT3 byte and aims at the
* 'kind' value (eg trap_Cerror). For error-trap and Cerror-trap a
switch (trap) {
case trap_PendingInterrupt:
- FSHOW((stderr, "<trap pending interrupt>\n"));
+ FSHOW((stderr, "/<trap pending interrupt>\n"));
arch_skip_instruction(context);
+ sigemptyset(&ss);
+ sigaddset(&ss,SIGTRAP);
+ sigprocmask(SIG_UNBLOCK,&ss,0);
interrupt_handle_pending(context);
break;
* here, and restore it after we do our thing, but there
* seems to be no point in doing that, since we're just
* going to lose(..) anyway. */
- SHOW("in trap_Halt case of sigtrap_handler(..)"); /* REMOVEME */
fake_foreign_function_call(context);
- lose("%%primitive halt called; the party is over.");
+ lose("%%PRIMITIVE HALT called; the party is over.");
case trap_Error:
case trap_Cerror:
handle_breakpoint(signal, info, context);
break;
- case trap_FunctionEndBreakpoint:
+ case trap_FunEndBreakpoint:
(char*)(*os_context_pc_addr(context)) -= 1;
*os_context_pc_addr(context) =
- (int)handle_function_end_breakpoint(signal, info, context);
+ (int)handle_fun_end_breakpoint(signal, info, context);
break;
default:
- FSHOW((stderr,"[C--trap default %d %d %x]\n",
+ FSHOW((stderr,"/[C--trap default %d %d %x]\n",
signal, code, context));
interrupt_handle_now(signal, info, context);
break;
}
- SHOW("leaving sigtrap_handler(..)"); /* REMOVEME */
+}
+
+static void
+sigill_handler(int signal, siginfo_t *siginfo, void *void_context) {
+ os_context_t *context = (os_context_t*)void_context;
+ fake_foreign_function_call(context);
+ monitor_or_something();
}
void
arch_install_interrupt_handlers()
{
- interrupt_install_low_level_handler(SIGILL , sigtrap_handler);
- interrupt_install_low_level_handler(SIGTRAP, sigtrap_handler);
+ SHOW("entering arch_install_interrupt_handlers()");
+
+ /* Note: The old CMU CL code here used sigtrap_handler() to handle
+ * SIGILL as well as SIGTRAP. I couldn't see any reason to do
+ * things that way. So, I changed to separate handlers when
+ * debugging a problem on OpenBSD, where SBCL wasn't catching
+ * SIGILL properly, but was instead letting the process be
+ * terminated with an "Illegal instruction" output. If this change
+ * turns out to break something (maybe breakpoint handling on some
+ * OS I haven't tested on?) and we have to go back to the old CMU
+ * CL way, I hope there will at least be a comment to explain
+ * why.. -- WHN 2001-06-07 */
+ undoably_install_low_level_interrupt_handler(SIGILL , sigill_handler);
+ undoably_install_low_level_interrupt_handler(SIGTRAP, sigtrap_handler);
+
+ SHOW("returning from arch_install_interrupt_handlers()");
}
\f
/* This is implemented in assembly language and called from C: */
* could be in registers depending on what the compiler likes. So we
* copy the args into a portable vector and let the assembly language
* call-in function figure it out. */
+
lispobj
funcall0(lispobj function)
{
lispobj *args = NULL;
+ FSHOW((stderr, "/entering funcall0(0x%lx)\n", (long)function));
return call_into_lisp(function, args, 0);
}
lispobj
projects / sbcl.git / blobdiff