Changeset 9659 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jun 12, 2008 12:37:02 PM (17 years ago)

Author:

vboxsync

Message:

SELMGetCpuModeFromSelector is a better name.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• EMAll.cpp (modified) (3 diffs)
• IOMAllMMIO.cpp (modified) (4 diffs)
• SELMAll.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -167 +167 @@
 EMDECL(int) EMInterpretDisasOneEx(PVM pVM, RTGCUINTPTR GCPtrInstr, PCCPUMCTXCORE pCtxCore, PDISCPUSTATE pCpu, unsigned *pcbInstr)
 {
-    int rc = DISCoreOneEx(GCPtrInstr, SELMGetSelectorType(pVM, pCtxCore->eflags, pCtxCore->cs, (PCPUMSELREGHID)&pCtxCore->csHid),
+    int rc = DISCoreOneEx(GCPtrInstr, SELMGetCpuModeFromSelector(pVM, pCtxCore->eflags, pCtxCore->cs, (PCPUMSELREGHID)&pCtxCore->csHid),
 #ifdef IN_GC
                           NULL, NULL,
@@ -209 +209 @@
         uint32_t    cbOp;
         DISCPUSTATE Cpu;
-        Cpu.mode = SELMGetSelectorType(pVM, pRegFrame->eflags, pRegFrame->cs, &pRegFrame->csHid);
+        Cpu.mode = SELMGetCpuModeFromSelector(pVM, pRegFrame->eflags, pRegFrame->cs, &pRegFrame->csHid);
         rc = emDisCoreOne(pVM, &Cpu, (RTGCUINTPTR)pbCode, &cbOp);
         if (VBOX_SUCCESS(rc))
@@ -631 +631 @@
 
             /* Read stack value first */
-            if (SELMGetSelectorType(pVM, pRegFrame->eflags, pRegFrame->ss, &pRegFrame->ssHid) == CPUMODE_16BIT)
+            if (SELMGetCpuModeFromSelector(pVM, pRegFrame->eflags, pRegFrame->ss, &pRegFrame->ssHid) == CPUMODE_16BIT)
                 return VERR_EM_INTERPRETER; /* No legacy 16 bits stuff here, please. */
 

trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp

@@ -302 +302 @@
     {
         cTransfers = pRegFrame->ecx;
-        if (SELMGetSelectorType(pVM, pRegFrame->eflags, pRegFrame->cs, &pRegFrame->csHid) == CPUMODE_16BIT)
+        if (SELMGetCpuModeFromSelector(pVM, pRegFrame->eflags, pRegFrame->cs, &pRegFrame->csHid) == CPUMODE_16BIT)
             cTransfers &= 0xffff;
 
@@ -543 +543 @@
     {
         cTransfers = pRegFrame->ecx;
-        if (SELMGetSelectorType(pVM, pRegFrame->eflags, pRegFrame->cs, &pRegFrame->csHid) == CPUMODE_16BIT)
+        if (SELMGetCpuModeFromSelector(pVM, pRegFrame->eflags, pRegFrame->cs, &pRegFrame->csHid) == CPUMODE_16BIT)
             cTransfers &= 0xffff;
 
@@ -1310 +1310 @@
         cTransfers = pRegFrame->ecx;
 
-        if (SELMGetSelectorType(pVM, pRegFrame->eflags, pRegFrame->cs, &pRegFrame->csHid) == CPUMODE_16BIT)
+        if (SELMGetCpuModeFromSelector(pVM, pRegFrame->eflags, pRegFrame->cs, &pRegFrame->csHid) == CPUMODE_16BIT)
             cTransfers &= 0xffff;
 
@@ -1465 +1465 @@
     {
         cTransfers = pRegFrame->ecx;
-        if (SELMGetSelectorType(pVM, pRegFrame->eflags, pRegFrame->cs, &pRegFrame->csHid) == CPUMODE_16BIT)
+        if (SELMGetCpuModeFromSelector(pVM, pRegFrame->eflags, pRegFrame->cs, &pRegFrame->csHid) == CPUMODE_16BIT)
             cTransfers &= 0xffff;
 

trunk/src/VBox/VMM/VMMAll/SELMAll.cpp

@@ -536 +536 @@
 
 /**
- * Return the selector type
+ * Return the cpu mode corresponding to the (CS) selector
  *
  * @returns DISCPUMODE according to the selector type (16, 32 or 64 bits)
@@ -542 +542 @@
  * @param   Sel     The selector.
  */
-static DISCPUMODE selmGetSelectorType(PVM pVM, RTSEL Sel)
+static DISCPUMODE selmGetCpuModeFromSelector(PVM pVM, RTSEL Sel)
 {
     Assert(!CPUMAreHiddenSelRegsValid(pVM));
@@ -561 +561 @@
 
 /**
- * Return the selector type
+ * Return the cpu mode corresponding to the (CS) selector
  *
  * @returns DISCPUMODE according to the selector type (16, 32 or 64 bits)
@@ -569 +569 @@
  * @param   pHiddenSel The hidden selector register.
  */
-SELMDECL(DISCPUMODE) SELMGetSelectorType(PVM pVM, X86EFLAGS eflags, RTSEL Sel, CPUMSELREGHID *pHiddenSel)
+SELMDECL(DISCPUMODE) SELMGetCpuModeFromSelector(PVM pVM, X86EFLAGS eflags, RTSEL Sel, CPUMSELREGHID *pHiddenSel)
 {
     if (!CPUMAreHiddenSelRegsValid(pVM))
@@ -580 +580 @@
             return CPUMODE_16BIT;
 
-        return selmGetSelectorType(pVM, Sel);
+        return selmGetCpuModeFromSelector(pVM, Sel);
     }
     if (    CPUMIsGuestInLongMode(pVM)