Changeset 9555 for branches

Timestamp:

May 20, 2008, 2:03:07 AM (17 years ago)

Author:

Gary Byers

Message:

Share most of the interrupt_handler() code between Win64 and other
platforms. (Need to test the case where we return from the interrupt.)

File:

• branches/win64/lisp-kernel/x86-exceptions.c (modified) (6 diffs)

branches/win64/lisp-kernel/x86-exceptions.c

@@ -1307 +1307 @@
 
 #ifdef WINDOWS
-void
-interrupt_handler (int signum, siginfo_t *info, ExceptionInformation *context)
-{
-}
-#else
+extern LONG restore_win64_context(ExceptionInformation *, TCR *, int;);
+#endif
+
 void
 interrupt_handler (int signum, siginfo_t *info, ExceptionInformation *context)
@@ -1319 +1317 @@
 #endif
   TCR *tcr = get_interrupt_tcr(false);
+  int old_valence = tcr->valence;
+
   if (tcr) {
     if ((TCR_INTERRUPT_LEVEL(tcr) < 0) ||
@@ -1336 +1336 @@
 
         xframe_list xframe_link;
-        int old_valence;
         signed_natural alloc_displacement = 0;
         LispObj 
@@ -1371 +1370 @@
         tcr->flags |= old_foreign_exception;
         unlock_exception_lock_in_handler(tcr);
+#ifndef WINDOWS
         exit_signal_handler(tcr, old_valence);
+#endif
       }
     }
@@ -1380 +1381 @@
   }
 #endif
+#ifdef WINDOWS
+  restore_win64_context(context,tcr,old_valence);
+#else
   SIGRETURN(context);
-}
-#endif
+#endif
+}
+
 
 #ifndef WINDOWS
@@ -1506 +1511 @@
 }
 
-extern LONG restore_win64_context(ExceptionInformation *, TCR *, int;);
 
 LONG