Changeset 7649 in vbox

Timestamp:

Mar 31, 2008 11:31:25 AM (17 years ago)

Author:

vboxsync

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

29159

Message:

Assertion added for detection long mode (reminder)

Location:

trunk/src/recompiler

Files:

• VBoxREMWrapper.cpp (modified) (2 diffs)
• VBoxRecompiler.c (modified) (1 diff)

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -634 +634 @@
     { REMPARMDESC_FLAGS_INT,        sizeof(uint8_t), NULL }
 };
+static const REMPARMDESC g_aArgsPGMGetGuestMode[] = 
+{
+    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
+};
 static const REMPARMDESC g_aArgsPGMGstGetPage[] =
 {
@@ -1030 +1034 @@
     { "PDMGetInterrupt",                        (void *)(uintptr_t)&PDMGetInterrupt,                &g_aArgsPDMGetInterrupt[0],                 ELEMENTS(g_aArgsPDMGetInterrupt),                   REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
     { "PDMIsaSetIrq",                           (void *)(uintptr_t)&PDMIsaSetIrq,                   &g_aArgsPDMIsaSetIrq[0],                    ELEMENTS(g_aArgsPDMIsaSetIrq),                      REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
+    { "PGMGetGuestMode",                        (void *)(uintptr_t)&PGMGetGuestMode,                &g_aArgsPGMGetGuestMode[0],                 ELEMENTS(g_aArgsPGMGetGuestMode),                   REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
     { "PGMGstGetPage",                          (void *)(uintptr_t)&PGMGstGetPage,                  &g_aArgsPGMGstGetPage[0],                   ELEMENTS(g_aArgsPGMGstGetPage),                     REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
     { "PGMInvalidatePage",                      (void *)(uintptr_t)&PGMInvalidatePage,              &g_aArgsPGMInvalidatePage[0],               ELEMENTS(g_aArgsPGMInvalidatePage),                 REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },

trunk/src/recompiler/VBoxRecompiler.c

@@ -3263 +3263 @@
     if (f32BitCode && (env->cr[0] & (X86_CR0_PE | X86_CR0_PG)) == (X86_CR0_PE | X86_CR0_PG))
     {
+        Assert(PGMGetGuestMode(env->pVM) < PGMMODE_AMD64);
+
         /* convert eip to physical address. */
         int rc = PGMPhysGCPtr2HCPtrByGstCR3(env->pVM,