Changeset 2890 in vbox

Timestamp:

May 28, 2007 11:49:44 AM (18 years ago)

Author:

vboxsync

Message:

Corrected syncing of CPL.

Location:

trunk/src/recompiler

Files:

• VBoxREMWrapper.cpp (modified) (2 diffs)
• VBoxRecompiler.c (modified) (3 diffs)

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -454 +454 @@
 
 /* VMM args */
+static const REMPARMDESC g_aArgsCPUMGetGuestCpl[] =
+{
+    { REMPARMDESC_FLAGS_INT,        sizeof(PVM) },
+    { REMPARMDESC_FLAGS_INT,        sizeof(PCPUMCTXORE) },
+};
+
 static const REMPARMDESC g_aArgsCPUMGetGuestCpuId[] =
 {
@@ -938 +944 @@
     { "CPUMAreHiddenSelRegsValid",              (void *)(uintptr_t)&CPUMAreHiddenSelRegsValid,      &g_aArgsVM[0],                              ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_INT,    sizeof(bool),       NULL },
     { "CPUMGetAndClearChangedFlagsREM",         (void *)(uintptr_t)&CPUMGetAndClearChangedFlagsREM, &g_aArgsVM[0],                              ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_INT,    sizeof(unsigned),   NULL },
+    { "CPUMGetGuestCPL",                        (void *)(uintptr_t)&CPUMGetGuestCPL,                &g_aArgsCPUMGetGuestCpl[0],                 ELEMENTS(g_aArgsCPUMGetGuestCpl),                   REMFNDESC_FLAGS_RET_INT,    sizeof(unsigned),   NULL },
     { "CPUMGetGuestCpuId",                      (void *)(uintptr_t)&CPUMGetGuestCpuId,              &g_aArgsCPUMGetGuestCpuId[0],               ELEMENTS(g_aArgsCPUMGetGuestCpuId),                 REMFNDESC_FLAGS_RET_VOID,   0,                  NULL },
     { "CPUMGetGuestEAX",                        (void *)(uintptr_t)&CPUMGetGuestEAX,                &g_aArgsVM[0],                              ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_INT,    sizeof(uint32_t),   NULL },

trunk/src/recompiler/VBoxRecompiler.c

@@ -1701 +1701 @@
     pVM->rem.s.Env.hflags      &= ~HF_HALTED_MASK;
 
+    /* Set current CPL */
+    cpu_x86_set_cpl(&pVM->rem.s.Env, CPUMGetGuestCPL(pVM, CPUMCTX2CORE(pCtx)));
+
     /*
      * Replay invlpg?
@@ -1831 +1834 @@
         cpu_x86_load_seg_cache(&pVM->rem.s.Env, R_FS, pCtx->fs, pCtx->fsHid.u32Base, pCtx->fsHid.u32Limit, (pCtx->fsHid.Attr.u << 8) & 0xFFFFFF);
         cpu_x86_load_seg_cache(&pVM->rem.s.Env, R_GS, pCtx->gs, pCtx->gsHid.u32Base, pCtx->gsHid.u32Limit, (pCtx->gsHid.Attr.u << 8) & 0xFFFFFF);
-
-        /* Set current CPL. */
-        if (pCtx->eflags.Bits.u1VM == 1)
-            cpu_x86_set_cpl(&pVM->rem.s.Env, 3);
-        else
-            cpu_x86_set_cpl(&pVM->rem.s.Env, pCtx->ss & 3);
     }
     else
@@ -1845 +1842 @@
             Log2(("REMR3State: SS changed from %04x to %04x!\n", pVM->rem.s.Env.segs[R_SS].selector, pCtx->ss));
 
-            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