Changeset 41728 in vbox for trunk/src

Timestamp:

Jun 14, 2012 11:04:57 PM (13 years ago)

Author:

vboxsync

Message:

DIS: register macro name adjustments - part two.

Location:

trunk/src/VBox

Files:

• Disassembler/DisasmCore.cpp (modified) (1 diff)
• VMM/VMMAll/CPUMAllRegs.cpp (modified) (5 diffs)
• VMM/VMMAll/EMAll.cpp (modified) (5 diffs)
• VMM/VMMR0/HWVMXR0.cpp (modified) (1 diff)
• VMM/VMMR3/EMRaw.cpp (modified) (2 diffs)
• VMM/VMMR3/PATMPatch.cpp (modified) (3 diffs)
• VMM/include/EMInternal.h (modified) (1 diff)

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -743 +743 @@
                 {
                     pCpu->prefix &= ~DISPREFIX_LOCK;
-                    pParam->base.reg_ctrl = USE_REG_CR8;
+                    pParam->base.reg_ctrl = DISCREG_CR8;
                 }
                 else

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -1265 +1265 @@
 {
     uint64_t u64;
-    int rc = CPUMGetGuestCRx(pVCpu, USE_REG_CR8, &u64);
+    int rc = CPUMGetGuestCRx(pVCpu, DISCREG_CR8, &u64);
     if (RT_FAILURE(rc))
         u64 = 0;
@@ -1348 +1348 @@
     switch (iReg)
     {
-        case USE_REG_CR0:
+        case DISCREG_CR0:
             *pValue = pVCpu->cpum.s.Guest.cr0;
             break;
 
-        case USE_REG_CR2:
+        case DISCREG_CR2:
             *pValue = pVCpu->cpum.s.Guest.cr2;
             break;
 
-        case USE_REG_CR3:
+        case DISCREG_CR3:
             *pValue = pVCpu->cpum.s.Guest.cr3;
             break;
 
-        case USE_REG_CR4:
+        case DISCREG_CR4:
             *pValue = pVCpu->cpum.s.Guest.cr4;
             break;
 
-        case USE_REG_CR8:
+        case DISCREG_CR8:
         {
             uint8_t u8Tpr;
@@ -1423 +1423 @@
 VMMDECL(int) CPUMGetGuestDRx(PVMCPU pVCpu, uint32_t iReg, uint64_t *pValue)
 {
-    AssertReturn(iReg <= USE_REG_DR7, VERR_INVALID_PARAMETER);
+    AssertReturn(iReg <= DISDREG_DR7, VERR_INVALID_PARAMETER);
     /* DR4 is an alias for DR6, and DR5 is an alias for DR7. */
     if (iReg == 4 || iReg == 5)
@@ -1970 +1970 @@
 VMMDECL(int) CPUMSetGuestDRx(PVMCPU pVCpu, uint32_t iReg, uint64_t Value)
 {
-    AssertReturn(iReg <= USE_REG_DR7, VERR_INVALID_PARAMETER);
+    AssertReturn(iReg <= DISDREG_DR7, VERR_INVALID_PARAMETER);
     /* DR4 is an alias for DR6, and DR5 is an alias for DR7. */
     if (iReg == 4 || iReg == 5)

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

@@ -2209 +2209 @@
     switch (DestRegCrx)
     {
-    case USE_REG_CR0:
+    case DISCREG_CR0:
         oldval = CPUMGetGuestCR0(pVCpu);
 #ifdef IN_RC
@@ -2262 +2262 @@
         return rc2 == VINF_SUCCESS ? rc : rc2;
 
-    case USE_REG_CR2:
+    case DISCREG_CR2:
         rc = CPUMSetGuestCR2(pVCpu, val); AssertRC(rc);
         return VINF_SUCCESS;
 
-    case USE_REG_CR3:
+    case DISCREG_CR3:
         /* Reloading the current CR3 means the guest just wants to flush the TLBs */
         rc = CPUMSetGuestCR3(pVCpu, val); AssertRC(rc);
@@ -2277 +2277 @@
         return rc;
 
-    case USE_REG_CR4:
+    case DISCREG_CR4:
         oldval = CPUMGetGuestCR4(pVCpu);
         rc = CPUMSetGuestCR4(pVCpu, val); AssertRC(rc);
@@ -2315 +2315 @@
         return rc2 == VINF_SUCCESS ? rc : rc2;
 
-    case USE_REG_CR8:
+    case DISCREG_CR8:
         return PDMApicSetTPR(pVCpu, val << 4);  /* cr8 bits 3-0 correspond to bits 7-4 of the task priority mmio register. */
 
     default:
         AssertFailed();
-    case USE_REG_CR1: /* illegal op */
+    case DISCREG_CR1: /* illegal op */
         break;
     }
@@ -2377 +2377 @@
                     | (u16Data &  (X86_CR0_PE | X86_CR0_MP | X86_CR0_EM | X86_CR0_TS));
 
-    return emUpdateCRx(pVM, pVCpu, pRegFrame, USE_REG_CR0, NewCr0);
+    return emUpdateCRx(pVM, pVCpu, pRegFrame, DISCREG_CR0, NewCr0);
 }
 

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

@@ -4169 +4169 @@
                 Assert(   !pVM->hwaccm.s.fNestedPaging
                        || !CPUMIsGuestInPagedProtectedModeEx(pCtx)
-                       || VMX_EXIT_QUALIFICATION_CRX_REGISTER(exitQualification) != USE_REG_CR3);
+                       || VMX_EXIT_QUALIFICATION_CRX_REGISTER(exitQualification) != DISCREG_CR3);
 
                 /* CR8 reads only cause an exit when the TPR shadow feature isn't present. */

trunk/src/VBox/VMM/VMMR3/EMRaw.cpp

@@ -994 +994 @@
                     //read
                     Assert(Cpu.param2.fUse & DISUSE_REG_CR);
-                    Assert(Cpu.param2.base.reg_ctrl <= USE_REG_CR4);
+                    Assert(Cpu.param2.base.reg_ctrl <= DISCREG_CR4);
                     STAM_COUNTER_INC(&pStats->StatMovReadCR[Cpu.param2.base.reg_ctrl]);
                 }
@@ -1001 +1001 @@
                     //write
                     Assert(Cpu.param1.fUse & DISUSE_REG_CR);
-                    Assert(Cpu.param1.base.reg_ctrl <= USE_REG_CR4);
+                    Assert(Cpu.param1.base.reg_ctrl <= DISCREG_CR4);
                     STAM_COUNTER_INC(&pStats->StatMovWriteCR[Cpu.param1.base.reg_ctrl]);
                 }

trunk/src/VBox/VMM/VMMR3/PATMPatch.cpp

@@ -1151 +1151 @@
 {
     int rc = VINF_SUCCESS;
-    int reg, mod, rm, dbgreg;
+    unsigned reg, mod, rm, dbgreg;
     uint32_t offset;
 
@@ -1183 +1183 @@
     pPB[1] = MAKE_MODRM(mod, reg, rm);
 
-    AssertReturn(dbgreg <= USE_REG_DR7, VERR_INVALID_PARAMETER);
+    AssertReturn(dbgreg <= DISDREG_DR7, VERR_INVALID_PARAMETER);
     offset = RT_OFFSETOF(CPUMCTX, dr[dbgreg]);
 
@@ -1235 +1235 @@
     switch (ctrlreg)
     {
-    case USE_REG_CR0:
+    case DISCREG_CR0:
         offset = RT_OFFSETOF(CPUMCTX, cr0);
         break;
-    case USE_REG_CR2:
+    case DISCREG_CR2:
         offset = RT_OFFSETOF(CPUMCTX, cr2);
         break;
-    case USE_REG_CR3:
+    case DISCREG_CR3:
         offset = RT_OFFSETOF(CPUMCTX, cr3);
         break;
-    case USE_REG_CR4:
+    case DISCREG_CR4:
         offset = RT_OFFSETOF(CPUMCTX, cr4);
         break;

trunk/src/VBox/VMM/include/EMInternal.h

@@ -272 +272 @@
     STAMCOUNTER             StatInvlpg;
     STAMCOUNTER             StatHlt;
-    STAMCOUNTER             StatMovReadCR[USE_REG_CR4 + 1];
-    STAMCOUNTER             StatMovWriteCR[USE_REG_CR4 + 1];
+    STAMCOUNTER             StatMovReadCR[DISCREG_CR4 + 1];
+    STAMCOUNTER             StatMovWriteCR[DISCREG_CR4 + 1];
     STAMCOUNTER             StatMovDRx;
     STAMCOUNTER             StatIret;