Changeset 1078 in vbox for trunk/src/recompiler/target-i386

Timestamp:

Feb 28, 2007 8:24:49 AM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

18970

Message:

Fixes for V86 segment syncing. (+ cleanup)

File:

• trunk/src/recompiler/target-i386/helper.c (modified) (5 diffs)

trunk/src/recompiler/target-i386/helper.c

@@ -3730 +3730 @@
     CPUX86State *savedenv = env;
     env = env1;
-#ifdef VBOX
-    if (setjmp(env1->jmp_env) == 0)
+
+    if (env->eflags & X86_EFL_VM)
     {
-#endif 
-    if (seg_reg == R_CS)
-    {
-        uint32_t e1, e2;
-        load_segment(&e1, &e2, selector);
-        cpu_x86_load_seg_cache(env, R_CS, selector, 
-                       get_seg_base(e1, e2),
-                       get_seg_limit(e1, e2),
-                       e2);
-    }
-    else
-        load_seg(seg_reg, selector);
-    env = savedenv;
-
-#ifdef VBOX
+        load_seg_vm(seg_reg, selector);
+
+        env = savedenv;
+
         /* Successful sync. */
         env1->segs[seg_reg].newselector = 0;
     }
-    else 
+    else
     {
-        env = savedenv;
-
-        /* Postpone sync until the guest uses the selector. */
-        env1->segs[seg_reg].selector    = selector;     /* hidden values are now incorrect, but will be resynced when this register is accessed. */
-        env1->segs[seg_reg].newselector = selector;
+        if (setjmp(env1->jmp_env) == 0)
+        {
+            if (seg_reg == R_CS)
+            {
+                uint32_t e1, e2;
+                load_segment(&e1, &e2, selector);
+                cpu_x86_load_seg_cache(env, R_CS, selector, 
+                               get_seg_base(e1, e2),
+                               get_seg_limit(e1, e2),
+                               e2);
+            }
+            else
+                load_seg(seg_reg, selector);
+            env = savedenv;
+
+            /* Successful sync. */
+            env1->segs[seg_reg].newselector = 0;
+        }
+        else 
+        {
+            env = savedenv;
+
+            /* Postpone sync until the guest uses the selector. */
+            env1->segs[seg_reg].selector    = selector;     /* hidden values are now incorrect, but will be resynced when this register is accessed. */
+            env1->segs[seg_reg].newselector = selector;
 #ifdef VBOX_STRICT
-        printf("sync_seg: out of sync seg_reg=%d selector=%#x\n", seg_reg, selector);
-#endif
-    }
-#endif 
+            printf("sync_seg: out of sync seg_reg=%d selector=%#x\n", seg_reg, selector);
+#endif
+        }
+    }
 
 }
@@ -3777 +3786 @@
     CPUX86State *saved_env = env;
     target_ulong saved_T0 = T0;
-#ifdef VBOX
     if (setjmp(env1->jmp_env) == 0)
     {
-#endif 
         env = env1;
         T0 = selector;
@@ -3786 +3793 @@
         T0 = saved_T0;
         env = saved_env;
-#ifdef VBOX
     }
     else 
@@ -3796 +3802 @@
 #endif 
     }
-#endif 
 }
 
@@ -4169 +4174 @@
 //*****************************************************************************
 
-#endif
-
+#endif /* VBOX */
+