Changeset 41728 in vbox for trunk/src/VBox/VMM/VMMAll/EMAll.cpp

Timestamp:

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

Author:

vboxsync

Message:

DIS: register macro name adjustments - part two.

File:

• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (modified) (5 diffs)

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);
 }