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

時間撮記:

2009-1-12 下午03:33:49 (16 年 以前)

作者:

vboxsync

訊息:

REM: VME CLI/STI was operating on wrong flag

位置:

trunk/src/recompiler_new/target-i386

檔案:

• op_helper.c (修改) (4 筆差異)
• translate.c (修改) (2 筆差異)

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

@@ -145 +145 @@
     unsigned int new_eflags = t0;
 
+    assert(env->eflags & (1<<VM_SHIFT));
+
     /* if virtual interrupt pending and (virtual) interrupts will be enabled -> #GP */
     /* if TF will be set -> #GP */
@@ -151 +153 @@
         raise_exception(EXCP0D_GPF);
     } else {
-        load_eflags(new_eflags, (TF_MASK | AC_MASK | ID_MASK | NT_MASK) & 0xffff);
+        load_eflags(new_eflags, TF_MASK | AC_MASK | ID_MASK | NT_MASK);
 
         if (new_eflags & IF_MASK) {
@@ -5367 +5369 @@
 void helper_cli_vme(void)
 {
-    env->eflags &= ~IF_MASK;
+    env->eflags &= ~VIF_MASK;
 }
 
@@ -5376 +5378 @@
         raise_exception(EXCP0D_GPF);
     }
-    env->eflags |= IF_MASK;
+    env->eflags |= VIF_MASK;
 }
 #endif

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

@@ -145 +145 @@
 #ifdef VBOX
     int vme;    /* CR4.VME */
+    int pvi;    /* CR4.PVI */
     int record_call;    /* record calls for CSAM or not? */
 #endif
@@ -8347 +8348 @@
 #ifdef VBOX
     dc->vme = !!(env->cr[4] & CR4_VME_MASK);
+    dc->pvi = !!(env->cr[4] & CR4_PVI_MASK);
 #ifdef VBOX_WITH_CALL_RECORD
     if (    !(env->state & CPU_RAW_RING0)