Changeset 1095 in vbox for trunk/src/recompiler/new/VBoxRecompiler.c

Timestamp:

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

Author:

vboxsync

Message:

Synced V86 changes.

File:

• trunk/src/recompiler/new/VBoxRecompiler.c (modified) (6 diffs)

trunk/src/recompiler/new/VBoxRecompiler.c

@@ -1875 +1875 @@
         {
             Log2(("REMR3State: SS changed from %04x to %04x!\n", pVM->rem.s.Env.segs[R_SS].selector, pCtx->ss));
-            if (pCtx->eflags.Bits.u1VM == 1)
+
+            cpu_x86_set_cpl(&pVM->rem.s.Env, (pCtx->eflags.Bits.u1VM) ? 3 : (pCtx->ss & 3));
+            sync_seg(&pVM->rem.s.Env, R_SS, pCtx->ss);
+#ifdef VBOX_WITH_STATISTICS
+            if (pVM->rem.s.Env.segs[R_SS].newselector)
             {
-                cpu_x86_set_cpl(&pVM->rem.s.Env, 3);
-                pVM->rem.s.Env.segs[R_SS].selector = (uint16_t)pCtx->ss;
+                STAM_COUNTER_INC(&gStatSelOutOfSync[R_SS]);
             }
-            else
-            {
-                cpu_x86_set_cpl(&pVM->rem.s.Env, pCtx->ss & 3);
-                sync_seg(&pVM->rem.s.Env, R_SS, pCtx->ss);
-#ifdef VBOX_WITH_STATISTICS
-                if (pVM->rem.s.Env.segs[R_SS].newselector)
-                {
-                    STAM_COUNTER_INC(&gStatSelOutOfSync[R_SS]);
-                }
 #endif
-            }
         }
         else
@@ -1898 +1891 @@
         {
             Log2(("REMR3State: ES changed from %04x to %04x!\n", pVM->rem.s.Env.segs[R_ES].selector, pCtx->es));
-            if (pCtx->eflags.Bits.u1VM == 1)
+            sync_seg(&pVM->rem.s.Env, R_ES, pCtx->es);
+#ifdef VBOX_WITH_STATISTICS
+            if (pVM->rem.s.Env.segs[R_ES].newselector)
             {
-                pVM->rem.s.Env.segs[R_ES].selector = (uint16_t)pCtx->es;
+                STAM_COUNTER_INC(&gStatSelOutOfSync[R_ES]);
             }
-            else
-            {
-                sync_seg(&pVM->rem.s.Env, R_ES, pCtx->es);
-#ifdef VBOX_WITH_STATISTICS
-                if (pVM->rem.s.Env.segs[R_ES].newselector)
-                {
-                    STAM_COUNTER_INC(&gStatSelOutOfSync[R_ES]);
-                }
 #endif
-            }
         }
         else
@@ -1919 +1905 @@
         {
             Log2(("REMR3State: CS changed from %04x to %04x!\n", pVM->rem.s.Env.segs[R_CS].selector, pCtx->cs));
-            if (pCtx->eflags.Bits.u1VM == 1)
+            sync_seg(&pVM->rem.s.Env, R_CS, pCtx->cs);
+#ifdef VBOX_WITH_STATISTICS
+            if (pVM->rem.s.Env.segs[R_CS].newselector)
             {
-                pVM->rem.s.Env.segs[R_CS].selector = (uint16_t)pCtx->cs;
+                STAM_COUNTER_INC(&gStatSelOutOfSync[R_CS]);
             }
-            else
-            {
-                sync_seg(&pVM->rem.s.Env, R_CS, pCtx->cs);
-#ifdef VBOX_WITH_STATISTICS
-                if (pVM->rem.s.Env.segs[R_CS].newselector)
-                {
-                    STAM_COUNTER_INC(&gStatSelOutOfSync[R_CS]);
-                }
 #endif
-            }
         }
         else
@@ -1940 +1919 @@
         {
             Log2(("REMR3State: DS changed from %04x to %04x!\n", pVM->rem.s.Env.segs[R_DS].selector, pCtx->ds));
-            if (pCtx->eflags.Bits.u1VM == 1)
+            sync_seg(&pVM->rem.s.Env, R_DS, pCtx->ds);
+#ifdef VBOX_WITH_STATISTICS
+            if (pVM->rem.s.Env.segs[R_DS].newselector)
             {
-                pVM->rem.s.Env.segs[R_DS].selector = (uint16_t)pCtx->ds;
+                STAM_COUNTER_INC(&gStatSelOutOfSync[R_DS]);
             }
-            else
-            {
-                sync_seg(&pVM->rem.s.Env, R_DS, pCtx->ds);
-#ifdef VBOX_WITH_STATISTICS
-                if (pVM->rem.s.Env.segs[R_DS].newselector)
-                {
-                    STAM_COUNTER_INC(&gStatSelOutOfSync[R_DS]);
-                }
 #endif
-            }
         }
         else
@@ -1963 +1935 @@
         {
             Log2(("REMR3State: FS changed from %04x to %04x!\n", pVM->rem.s.Env.segs[R_FS].selector, pCtx->fs));
-            if (pCtx->eflags.Bits.u1VM == 1)
+            sync_seg(&pVM->rem.s.Env, R_FS, pCtx->fs);
+#ifdef VBOX_WITH_STATISTICS
+            if (pVM->rem.s.Env.segs[R_FS].newselector)
             {
-                pVM->rem.s.Env.segs[R_FS].selector = (uint16_t)pCtx->fs;
+                STAM_COUNTER_INC(&gStatSelOutOfSync[R_FS]);
             }
-            else
-            {
-                sync_seg(&pVM->rem.s.Env, R_FS, pCtx->fs);
-#ifdef VBOX_WITH_STATISTICS
-                if (pVM->rem.s.Env.segs[R_FS].newselector)
-                {
-                    STAM_COUNTER_INC(&gStatSelOutOfSync[R_FS]);
-                }
 #endif
-            }
         }
         else
@@ -1984 +1949 @@
         {
             Log2(("REMR3State: GS changed from %04x to %04x!\n", pVM->rem.s.Env.segs[R_GS].selector, pCtx->gs));
-            if (pCtx->eflags.Bits.u1VM == 1)
+            sync_seg(&pVM->rem.s.Env, R_GS, pCtx->gs);
+#ifdef VBOX_WITH_STATISTICS
+            if (pVM->rem.s.Env.segs[R_GS].newselector)
             {
-                pVM->rem.s.Env.segs[R_GS].selector = (uint16_t)pCtx->gs;
+                STAM_COUNTER_INC(&gStatSelOutOfSync[R_GS]);
             }
-            else
-            {
-                sync_seg(&pVM->rem.s.Env, R_GS, pCtx->gs);
-#ifdef VBOX_WITH_STATISTICS
-                if (pVM->rem.s.Env.segs[R_GS].newselector)
-                {
-                    STAM_COUNTER_INC(&gStatSelOutOfSync[R_GS]);
-                }
 #endif
-            }
         }
         else