Changeset 1094 in vbox

Timestamp:

Feb 28, 2007 10:28:48 AM (18 years ago)

Author:

vboxsync

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

18989

Message:

Synced sync_seg (V86 changes)

File:

• trunk/src/recompiler/new/target-i386/helper.c (modified) (1 diff)

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

@@ -4116 +4116 @@
     CPUX86State *savedenv = env;
     env = env1;
-    if (setjmp(env1->jmp_env) == 0)
+
+    if (env->eflags & X86_EFL_VM)
     {
-        if (seg_reg == R_CS)
+        load_seg_vm(seg_reg, selector);
+
+        env = savedenv;
+
+        /* Successful sync. */
+        env1->segs[seg_reg].newselector = 0;
+    }
+    else
+    {
+        if (setjmp(env1->jmp_env) == 0)
         {
-            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);
-                /* Successful sync. */
-        env->segs[seg_reg].newselector = 0;
-
-        env = savedenv;
-    }
-    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;
-        Log(("sync_seg: out of sync seg_reg=%d selector=%#x\n", seg_reg, selector));
-    }
+            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;
+            Log(("sync_seg: out of sync seg_reg=%d selector=%#x\n", seg_reg, selector));
+        }
+    }
+
 }