Changeset 13869

Timestamp:

Jun 22, 2010, 9:24:17 AM (14 years ago)

Author:

Gary Byers

Message:

For Windows: as suggested by 'maetbag' on #ccl: suspend_tcr() and
raise_thread_interrupt() need to check for the suspended/interrupted
thread's PC being in the readonly (or managed_static) areas and treat
those cases as "really running lisp code"; this hopefully fixes
ticket:677 and ticket:696.

In pc_luser_restore_windows_context(): if we're at (the first instruction
of) restore_windows_context on Win32, the context is still on the stack
(not yet in %ecx.) Also, if the thread was suspended while in the act of
restoring context, it's also restoring the thread's valence to TCR_STATE_LISP
(unless/until we can return from foreign exceptions.)

File:

• trunk/source/lisp-kernel/thread_manager.c (modified) (4 diffs)

trunk/source/lisp-kernel/thread_manager.c

@@ -100 +100 @@
       (!((where < (pc)lisp_global(HEAP_END)) &&
          (where >= (pc)lisp_global(HEAP_START))) &&
+       (!((where < (pc)(managed_static_area->active)) &&
+         (where >= (pc)(readonly_area->low)))) &&
        !((where < spentry_end) && (where >= spentry_start)) &&
        !((where < subprims_end) && (where >= subprims_start)) &&
@@ -1947 +1949 @@
     *pcontext = * (CONTEXT *)(pcontext->Rcx);
 #else
-    *pcontext = * (CONTEXT *)(pcontext->Ecx);
+    if (where == restore_windows_context_start) {
+      *pcontext = * (CONTEXT *)((pcontext->Esp)+4);
+    } else {
+      *pcontext = * (CONTEXT *)(pcontext->Ecx);
+    }
 #endif
   } else {
@@ -1970 +1976 @@
   }
   tcr->pending_exception_context = NULL;
+  /* We basically never return from an exception unless we
+     were executing lisp code when the exception returned.
+     If that ever changes, we need to know what valence
+     would have been restored here.*/
+  tcr->valence = TCR_STATE_LISP;
 }
 
@@ -2016 +2027 @@
         if (!((where < (pc)lisp_global(HEAP_END)) &&
               (where >= (pc)lisp_global(HEAP_START))) &&
+            (!((where < (pc)(managed_static_area->active)) &&
+              (where >= (pc)(readonly_area->low)))) &&
             !((where < spentry_end) && (where >= spentry_start)) &&
             !((where < subprims_end) && (where >= subprims_start)) &&