Changeset 9308

Timestamp:

Apr 27, 2008, 11:06:25 AM (11 years ago)

Author:

gb

Message:

Try to get more things working.

Recognize stylized instruction sequences used for consing on Windows
(with TCR in a GPR.)

Make windows exception handler interact with suspend_tcr() mechanisms.

File:

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

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

@@ -626 +626 @@
 }
 
-#ifdef WINDOWS
 Boolean
 handle_fault(TCR *tcr, ExceptionInformation *xp, siginfo_t *info, int old_valence)
 {
-}
-
-Boolean
-handle_floating_point_exception(TCR *tcr, ExceptionInformation *xp, siginfo_t *info)
-{
-}
-#else
-Boolean
-handle_fault(TCR *tcr, ExceptionInformation *xp, siginfo_t *info, int old_valence)
-{
 #ifdef FREEBSD
   BytePtr addr = (BytePtr) xp->uc_mcontext.mc_addr;
 #else
+#ifdef WINDOWS
+  BytePtr addr = NULL;          /* FIX THIS */
+#else
   BytePtr addr = (BytePtr) info->si_addr;
+#endif
 #endif
 
@@ -681 +674 @@
 handle_floating_point_exception(TCR *tcr, ExceptionInformation *xp, siginfo_t *info)
 {
-  int code = info->si_code, rfn = 0, skip;
+  int code, skip;
   pc program_counter = (pc)xpPC(xp);
-  LispObj rpc = (LispObj) program_counter, xcf, cmain = nrs_CMAIN.vcell,
-
+  LispObj xcf, cmain = nrs_CMAIN.vcell,
     save_rbp = xpGPR(xp,Irbp), save_vsp = xpGPR(xp,Isp);
 
+#ifdef WINDOWS
+  code = info->ExceptionCode;
+#else
+  code = info->si_code;
+#endif  
   if ((fulltag_of(cmain) == fulltag_misc) &&
       (header_subtag(header_of(cmain)) == subtag_macptr)) {
@@ -699 +696 @@
   }
 }
-#endif
+
 
 Boolean
@@ -968 +965 @@
   tcr->valence = TCR_STATE_EXCEPTION_WAIT;
 
+#ifdef WINDOWS
+  if (tcr->flags & (1<<TCR_FLAG_BIT_PENDING_SUSPEND)) {
+    CLR_TCR_FLAG(tcr, TCR_FLAG_BIT_PENDING_SUSPEND);
+    SEM_RAISE(tcr->suspend);
+    SEM_WAIT_FOREVER(tcr->resume);
+  }
+#else
   ALLOW_EXCEPTIONS(context);
+#endif
   return old_valence;
 }  
@@ -1508 +1513 @@
   TCR *tcr = get_tcr(false);
   DWORD code = exception_pointers->ExceptionRecord->ExceptionCode;
-  int old_valence = tcr->valence, 
-    signal_number = map_windows_exception_code_to_posix_signal(code);
+  int old_valence, signal_number;
   ExceptionInformation *context = exception_pointers->ContextRecord;
-    siginfo_t *info = exception_pointers->ExceptionRecord;
-    xframe_list xframes;
-
+  siginfo_t *info = exception_pointers->ExceptionRecord;
+  xframe_list xframes;
+
+  old_valence = prepare_to_wait_for_exception_lock(tcr, context);
   wait_for_exception_lock_in_handler(tcr, context, &xframes);
+
+  signal_number = map_windows_exception_code_to_posix_signal(code);
   
   if (!handle_exception(signal_number, info, context, tcr, old_valence)) {
@@ -1544 +1551 @@
   EXCEPTION_POINTERS *new_ep;
 
-  new_context = ((CONTEXT *)(foreign_rsp&~2))-1;
+  new_context = ((CONTEXT *)(foreign_rsp&~15))-1;
   *new_context = *context;
   foreign_rsp = (LispObj)new_context;
-  new_info = ((siginfo_t *)(foreign_rsp&~2))-1;
+  new_info = ((siginfo_t *)(foreign_rsp&~15))-1;
   *new_info = *original_ep->ExceptionRecord;
   foreign_rsp = (LispObj)new_info;
-  new_ep = ((EXCEPTION_POINTERS *)(foreign_rsp&~2))-1;
+  new_ep = ((EXCEPTION_POINTERS *)(foreign_rsp&~15))-1;
   foreign_rsp = (LispObj)new_ep;
   new_ep->ContextRecord = new_context;
@@ -1885 +1892 @@
 
 opcode load_allocptr_reg_from_tcr_save_allocptr_instruction[] =
-  {0x65,0x48,0x8b,0x1c,0x25,0xd8,0x00,0x00,0x00};
+#ifdef WINDOWS
+  {0x49,0x8b,0x9b,0xd8,0x00,0x00,0x00}
+#else
+  {0x65,0x48,0x8b,0x1c,0x25,0xd8,0x00,0x00,0x00}
+#endif
+;
 opcode compare_allocptr_reg_to_tcr_save_allocbase_instruction[] =
-  {0x65,0x48,0x3b,0x1c,0x25,0xe0,0x00,0x00,0x00};
+#ifdef WINDOWS
+  {0x49,0x3b,0x9b,0xe0,0x00,0x00,0x00}
+#else
+  {0x65,0x48,0x3b,0x1c,0x25,0xe0,0x00,0x00,0x00}
+#endif
+
+;
 opcode branch_around_alloc_trap_instruction[] =
   {0x7f,0x02};
@@ -1893 +1911 @@
   {0xcd,0xc5};
 opcode clear_tcr_save_allocptr_tag_instruction[] =
-  {0x65,0x80,0x24,0x25,0xd8,0x00,0x00,0x00,0xf0};
+#ifdef WINDOWS
+  {0x41,0x80,0xa3,0xd8,0x00,0x00,0x00,0xf0}
+#else
+  {0x65,0x80,0x24,0x25,0xd8,0x00,0x00,0x00,0xf0}
+#endif
+;
 opcode set_allocptr_header_instruction[] =
   {0x48,0x89,0x43,0xf3};
@@ -1905 +1928 @@
   case 0x7f: return ID_branch_around_alloc_trap_instruction;
   case 0x48: return ID_set_allocptr_header_instruction;
+#ifdef WINDOWS
+  case 0x41: return ID_clear_tcr_save_allocptr_tag_instruction;
+  case 0x49:
+    switch(program_counter[1]) {
+    case 0x8b: return ID_load_allocptr_reg_from_tcr_save_allocptr_instruction;
+    case 0x3b: return ID_compare_allocptr_reg_to_tcr_save_allocbase_instruction;
+    }
+#else
   case 0x65: 
     switch(program_counter[1]) {
@@ -1914 +1945 @@
       }
     }
+#endif
+  default: break;
   }
   return ID_unrecognized_alloc_instruction;
 }
       
-#ifdef WINDOWS  
-void
-pc_luser_xp(ExceptionInformation *xp, TCR *tcr, signed_natural *interrupt_displacement)
-{
-}
-#else
 void
 pc_luser_xp(ExceptionInformation *xp, TCR *tcr, signed_natural *interrupt_displacement)
@@ -1981 +2008 @@
          attempt. */
       {
-        int flags = (int)xpGPR(xp,Iflags);
+        int flags = (int)eflags_register(xp);
         
         if ((!(flags & (1 << X86_ZERO_FLAG_BIT))) &&
@@ -2023 +2050 @@
       }
       break;
-    }
+    default: 
+      break;
+    }
+
+   
     return;
   }
@@ -2035 +2066 @@
       if ((program_counter < &egc_store_node_conditional_success_test) ||
           ((program_counter == &egc_store_node_conditional_success_test) &&
-           !(xpGPR(xp, Iflags) & (1 << X86_ZERO_FLAG_BIT)))) {
+           !(eflags_register(xp) & (1 << X86_ZERO_FLAG_BIT)))) {
         /* Back up the PC, try again */
         xpPC(xp) = (LispObj) &egc_store_node_conditional;
@@ -2086 +2117 @@
   }
 }
-#endif
+
 
 void