projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Windows console I/O overhaul
[sbcl.git]
/
src
/
runtime
/
x86-arch.c
diff --git
a/src/runtime/x86-arch.c
b/src/runtime/x86-arch.c
index
b000e0f
..
dfbf908
100644
(file)
--- a/
src/runtime/x86-arch.c
+++ b/
src/runtime/x86-arch.c
@@
-18,7
+18,6
@@
#include "os.h"
#include "arch.h"
#include "lispregs.h"
#include "os.h"
#include "arch.h"
#include "lispregs.h"
-#include "signal.h"
#include "alloc.h"
#include "interrupt.h"
#include "interr.h"
#include "alloc.h"
#include "interrupt.h"
#include "interr.h"
@@
-78,7
+77,7
@@
context_eflags_addr(os_context_t *context)
#elif defined __NetBSD__
return &(context->uc_mcontext.__gregs[_REG_EFL]);
#elif defined LISP_FEATURE_WIN32
#elif defined __NetBSD__
return &(context->uc_mcontext.__gregs[_REG_EFL]);
#elif defined LISP_FEATURE_WIN32
- return (int *)&context->EFlags;
+ return (int *)&context->win32_context->EFlags;
#else
#error unsupported OS
#endif
#else
#error unsupported OS
#endif
@@
-113,6
+112,10
@@
void arch_skip_instruction(os_context_t *context)
case trap_FunEndBreakpoint: /* not tested */
break;
case trap_FunEndBreakpoint: /* not tested */
break;
+#ifdef LISP_FEATURE_SB_SAFEPOINT
+ case trap_GlobalSafepoint:
+ case trap_CspSafepoint:
+#endif
case trap_PendingInterrupt:
case trap_Halt:
case trap_SingleStepAround:
case trap_PendingInterrupt:
case trap_Halt:
case trap_SingleStepAround:
@@
-287,7
+290,7
@@
sigtrap_handler(int signal, siginfo_t *info, os_context_t *context)
/* This is just for info in case the monitor wants to print an
* approximation. */
/* This is just for info in case the monitor wants to print an
* approximation. */
- current_control_stack_pointer =
+ access_control_stack_pointer(arch_os_get_current_thread()) =
(lispobj *)*os_context_sp_addr(context);
#ifdef LISP_FEATURE_SUNOS
(lispobj *)*os_context_sp_addr(context);
#ifdef LISP_FEATURE_SUNOS