1.0.0.10:

[sbcl.git] / src / runtime / win32-os.c

diff --git a/src/runtime/win32-os.c b/src/runtime/win32-os.c
index baac264..02c6704 100644 (file)
--- a/src/runtime/win32-os.c
+++ b/src/runtime/win32-os.c
@@ -49,7 +49,17 @@
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <unistd.h>
+
+/* KLUDGE: Avoid double definition of boolean by rpcndr.h included via
+ * shlobj.h.
+ *
+ * FIXME: We should probably arrange to use the rpcndr.h boolean on Windows,
+ * or get rid of our own boolean type.
+ */
+#define boolean rpcndr_boolean
 #include <shlobj.h>
+#undef boolean
+
 #include <math.h>
 
 #include <excpt.h>
@@ -324,8 +334,9 @@ extern boolean internal_errors_enabled;
  * unwinding in Lisp.
  */
 
-EXCEPTION_DISPOSITION sigtrap_emulator(CONTEXT *context,
-                                       struct lisp_exception_frame *exception_frame)
+EXCEPTION_DISPOSITION 
+sigtrap_emulator(CONTEXT *context,
+                struct lisp_exception_frame *exception_frame)
 {
     if (*((char *)context->Eip + 1) == trap_ContextRestore) {
         /* This is the cleanup for what is immediately below, and
@@ -414,19 +425,26 @@ void sigtrap_wrapper(void)
 /*     set_seh_frame(handler.handler[0]); */
 }
 
-EXCEPTION_DISPOSITION handle_exception(EXCEPTION_RECORD *exception_record,
-                                       struct lisp_exception_frame *exception_frame,
-                                       CONTEXT *context,
-                                       void *dc) /* FIXME: What's dc again? */
+EXCEPTION_DISPOSITION 
+handle_exception(EXCEPTION_RECORD *exception_record,
+                struct lisp_exception_frame *exception_frame,
+                CONTEXT *context,
+                void *dc) /* FIXME: What's dc again? */
 {
-
     /* For EXCEPTION_ACCESS_VIOLATION only. */
     void *fault_address = (void *)exception_record->ExceptionInformation[1];
 
+    if (single_stepping && 
+       exception_record->ExceptionCode == EXCEPTION_SINGLE_STEP) {
+       /* We are doing a displaced instruction. At least function
+        * end breakpoints uses this. */
+       restore_breakpoint_from_single_step(context);
+       return ExceptionContinueExecution;
+    }    
+
     if (exception_record->ExceptionCode == EXCEPTION_BREAKPOINT) {
         /* Pick off sigtrap case first. */
         return sigtrap_emulator(context, exception_frame);
-
     }
     else if (exception_record->ExceptionCode == EXCEPTION_ACCESS_VIOLATION &&
              (is_valid_lisp_addr(fault_address) ||