vbox的更動 16340 路徑 trunk/src/recompiler_new

時間撮記:

2009-1-28 下午09:11:20 (16 年 以前)

作者:

vboxsync

訊息:

target-i386/op_helper.c: fixed stack alignment check in helper_external_event so it works on 64-bit darwin as well.

檔案:

• trunk/src/recompiler_new/target-i386/op_helper.c (修改) (9 筆差異)

trunk/src/recompiler_new/target-i386/op_helper.c

@@ -153 +153 @@
         raise_exception(EXCP0D_GPF);
     } else {
-        load_eflags(new_eflags, 
+        load_eflags(new_eflags,
                     (TF_MASK | AC_MASK | ID_MASK | NT_MASK) & 0xffff);
 
@@ -185 +185 @@
 {
     LogRel(("CS:EIP=%08x:%08x, FLAGS=%08x\n", env->segs[R_CS].base, env->eip, env->eflags));
-    LogRel(("EAX=%08x\tECX=%08x\tEDX=%08x\tEBX=%08x\n", 
-            (uint32_t)env->regs[R_EAX], (uint32_t)env->regs[R_ECX], 
+    LogRel(("EAX=%08x\tECX=%08x\tEDX=%08x\tEBX=%08x\n",
+            (uint32_t)env->regs[R_EAX], (uint32_t)env->regs[R_ECX],
             (uint32_t)env->regs[R_EDX], (uint32_t)env->regs[R_EBX]));
-    LogRel(("ESP=%08x\tEBP=%08x\tESI=%08x\tEDI=%08x\n", 
-            (uint32_t)env->regs[R_ESP], (uint32_t)env->regs[R_EBP], 
-            (uint32_t)env->regs[R_ESI], (uint32_t)env->regs[R_EDI]));    
+    LogRel(("ESP=%08x\tEBP=%08x\tESI=%08x\tEDI=%08x\n",
+            (uint32_t)env->regs[R_ESP], (uint32_t)env->regs[R_EBP],
+            (uint32_t)env->regs[R_ESI], (uint32_t)env->regs[R_EDI]));
 }
 #endif
@@ -206 +206 @@
     target_ulong ptr;
 
-#ifdef VBOX 
-    /* Trying to load a selector with CPL=1? */ 
-    if ((env->hflags & HF_CPL_MASK) == 0 && (selector & 3) == 1 && (env->state & CPU_RAW_RING0)) 
-    { 
-        Log(("RPL 1 -> sel %04X -> %04X\n", selector, selector & 0xfffc)); 
-        selector = selector & 0xfffc; 
-    } 
-#endif 
+#ifdef VBOX
+    /* Trying to load a selector with CPL=1? */
+    if ((env->hflags & HF_CPL_MASK) == 0 && (selector & 3) == 1 && (env->state & CPU_RAW_RING0))
+    {
+        Log(("RPL 1 -> sel %04X -> %04X\n", selector, selector & 0xfffc));
+        selector = selector & 0xfffc;
+    }
+#endif
 
     if (selector & 0x4)
@@ -332 +332 @@
     int rpl, dpl, cpl;
 
-#ifdef VBOX 
-    e1 = e2 = 0; 
-    cpl = env->hflags & HF_CPL_MASK; 
-    /* Trying to load a selector with CPL=1? */ 
-    if (cpl == 0 && (selector & 3) == 1 && (env->state & CPU_RAW_RING0)) 
-    { 
-        Log(("RPL 1 -> sel %04X -> %04X\n", selector, selector & 0xfffc)); 
-        selector = selector & 0xfffc; 
-    } 
-#endif 
+#ifdef VBOX
+    e1 = e2 = 0;
+    cpl = env->hflags & HF_CPL_MASK;
+    /* Trying to load a selector with CPL=1? */
+    if (cpl == 0 && (selector & 3) == 1 && (env->state & CPU_RAW_RING0))
+    {
+        Log(("RPL 1 -> sel %04X -> %04X\n", selector, selector & 0xfffc));
+        selector = selector & 0xfffc;
+    }
+#endif
 
     if ((selector & 0xfffc) != 0) {
@@ -1429 +1429 @@
 {
 #if defined(RT_OS_DARWIN) && defined(VBOX_STRICT)
-    uintptr_t uESP;
-    __asm__ __volatile__("movl %%esp, %0" : "=r" (uESP));
-    AssertMsg(!(uESP & 15), ("esp=%#p\n", uESP));
+    uintptr_t uSP;
+# ifdef RT_ARCH_AMD64
+    __asm__ __volatile__("movl %%rsp, %0" : "=r" (uSP));
+# else
+    __asm__ __volatile__("movl %%esp, %0" : "=r" (uSP));
+# endif
+    AssertMsg(!(uSP & 15), ("xSP=%#p\n", uSP));
 #endif
     /* Keep in sync with flags checked by gen_check_external_event() */
@@ -3653 +3657 @@
 }
 
-#ifdef VBOX 
-void helper_rdtscp(void) 
-{ 
-    uint64_t val; 
-    if ((env->cr[4] & CR4_TSD_MASK) && ((env->hflags & HF_CPL_MASK) != 0)) { 
-        raise_exception(EXCP0D_GPF); 
-    }
-    
-    val = cpu_get_tsc(env); 
-    EAX = (uint32_t)(val); 
-    EDX = (uint32_t)(val >> 32); 
-    ECX = cpu_rdmsr(env, MSR_K8_TSC_AUX); 
-} 
-#endif 
+#ifdef VBOX
+void helper_rdtscp(void)
+{
+    uint64_t val;
+    if ((env->cr[4] & CR4_TSD_MASK) && ((env->hflags & HF_CPL_MASK) != 0)) {
+        raise_exception(EXCP0D_GPF);
+    }
+
+    val = cpu_get_tsc(env);
+    EAX = (uint32_t)(val);
+    EDX = (uint32_t)(val >> 32);
+    ECX = cpu_rdmsr(env, MSR_K8_TSC_AUX);
+}
+#endif
 
 void helper_rdpmc(void)
@@ -3857 +3861 @@
             break;
         }
-        case MSR_K8_TSC_AUX: 
-            val = cpu_rdmsr(env, MSR_K8_TSC_AUX); 
-            break; 
+        case MSR_K8_TSC_AUX:
+            val = cpu_rdmsr(env, MSR_K8_TSC_AUX);
+            break;
 #endif /* VBOX */
     }
@@ -5469 +5473 @@
 #if defined(VBOX) && defined(REM_PHYS_ADDR_IN_TLB)
 /* This code assumes real physical address always fit into host CPU reg,
-   which is wrong in general, but true for our current use cases. */   
+   which is wrong in general, but true for our current use cases. */
 RTCCUINTREG REGPARM __ldb_vbox_phys(RTCCUINTREG addr)
 {
@@ -5675 +5679 @@
     else
     {
-        /* For some reasons, it works even w/o save/restore of the jump buffer, so as code is 
+        /* For some reasons, it works even w/o save/restore of the jump buffer, so as code is
            time critical - let's not do that */
 #if 0