Changeset 41675 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Jun 12, 2012 8:27:37 PM (13 years ago)

Author:

vboxsync

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

78482

Message:

DIS: The start of the scoping exercise... Fixed PREFIX_ADDRSIZE that I just busted in the previous commit.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (1 diff)
• HWVMXR0.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

@@ -2972 +2972 @@
      */
     DISCPUMODE enmMode = SELMGetCpuModeFromSelector(pVCpu, pRegFrame->eflags, pRegFrame->cs, &pRegFrame->csHid);
-    if (enmMode != CPUMODE_16BIT)
+    if (enmMode != DISCPUMODE_16BIT)
     {
         RTGCPTR pbCode;

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -3585 +3585 @@
                         X86EFLAGS eflags;
 
-                        if (pDis->prefix & PREFIX_OPSIZE)
+                        if (pDis->prefix & DISPREFIX_OPSIZE)
                         {
                             cbParm = 4;
@@ -3627 +3627 @@
                         X86EFLAGS eflags;
 
-                        if (pDis->prefix & PREFIX_OPSIZE)
+                        if (pDis->prefix & DISPREFIX_OPSIZE)
                         {
                             cbParm = 4;
@@ -3669 +3669 @@
                         uint16_t  aIretFrame[3];
 
-                        if (pDis->prefix & (PREFIX_OPSIZE | PREFIX_ADDRSIZE))
+                        if (pDis->prefix & (DISPREFIX_OPSIZE | DISPREFIX_ADDRSIZE))
                         {
                             rc = VERR_EM_INTERPRETER;