Changeset 9647 in vbox

Timestamp:

Jun 12, 2008 9:34:27 AM (16 years ago)

Author:

vboxsync

Message:

DRx access functions must use uint64_t now.

Location:

trunk

Files:

• include/VBox/cpum.h (modified) (2 diffs)
• src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (9 diffs)
• src/VBox/VMM/VMMAll/EMAll.cpp (modified) (1 diff)

trunk/include/VBox/cpum.h

@@ -422 +422 @@
 CPUMDECL(RTSEL)     CPUMGetGuestGS(PVM pVM);
 CPUMDECL(RTSEL)     CPUMGetGuestSS(PVM pVM);
-CPUMDECL(RTGCUINTREG) CPUMGetGuestDR0(PVM pVM);
-CPUMDECL(RTGCUINTREG) CPUMGetGuestDR1(PVM pVM);
-CPUMDECL(RTGCUINTREG) CPUMGetGuestDR2(PVM pVM);
-CPUMDECL(RTGCUINTREG) CPUMGetGuestDR3(PVM pVM);
-CPUMDECL(RTGCUINTREG) CPUMGetGuestDR6(PVM pVM);
-CPUMDECL(RTGCUINTREG) CPUMGetGuestDR7(PVM pVM);
-CPUMDECL(int)       CPUMGetGuestDRx(PVM pVM, uint32_t iReg, uint32_t *pValue);
+CPUMDECL(uint64_t)  CPUMGetGuestDR0(PVM pVM);
+CPUMDECL(uint64_t)  CPUMGetGuestDR1(PVM pVM);
+CPUMDECL(uint64_t)  CPUMGetGuestDR2(PVM pVM);
+CPUMDECL(uint64_t)  CPUMGetGuestDR3(PVM pVM);
+CPUMDECL(uint64_t)  CPUMGetGuestDR6(PVM pVM);
+CPUMDECL(uint64_t)  CPUMGetGuestDR7(PVM pVM);
+CPUMDECL(int)       CPUMGetGuestDRx(PVM pVM, uint32_t iReg, uint64_t *pValue);
 CPUMDECL(void)      CPUMGetGuestCpuId(PVM pVM, uint32_t iLeaf, uint32_t *pEax, uint32_t *pEbx, uint32_t *pEcx, uint32_t *pEdx);
 CPUMDECL(RCPTRTYPE(PCCPUMCPUID)) CPUMGetGuestCpuIdStdGCPtr(PVM pVM);
@@ -451 +451 @@
 CPUMDECL(int)       CPUMSetGuestCR3(PVM pVM, uint64_t cr3);
 CPUMDECL(int)       CPUMSetGuestCR4(PVM pVM, uint64_t cr4);
-CPUMDECL(int)       CPUMSetGuestDR0(PVM pVM, RTGCUINTREG uDr0);
-CPUMDECL(int)       CPUMSetGuestDR1(PVM pVM, RTGCUINTREG uDr1);
-CPUMDECL(int)       CPUMSetGuestDR2(PVM pVM, RTGCUINTREG uDr2);
-CPUMDECL(int)       CPUMSetGuestDR3(PVM pVM, RTGCUINTREG uDr3);
-CPUMDECL(int)       CPUMSetGuestDR6(PVM pVM, RTGCUINTREG uDr6);
-CPUMDECL(int)       CPUMSetGuestDR7(PVM pVM, RTGCUINTREG uDr7);
-CPUMDECL(int)       CPUMSetGuestDRx(PVM pVM, uint32_t iReg, uint32_t Value);
+CPUMDECL(int)       CPUMSetGuestDR0(PVM pVM, uint64_t uDr0);
+CPUMDECL(int)       CPUMSetGuestDR1(PVM pVM, uint64_t uDr1);
+CPUMDECL(int)       CPUMSetGuestDR2(PVM pVM, uint64_t uDr2);
+CPUMDECL(int)       CPUMSetGuestDR3(PVM pVM, uint64_t uDr3);
+CPUMDECL(int)       CPUMSetGuestDR6(PVM pVM, uint64_t uDr6);
+CPUMDECL(int)       CPUMSetGuestDR7(PVM pVM, uint64_t uDr7);
+CPUMDECL(int)       CPUMSetGuestDRx(PVM pVM, uint32_t iReg, uint64_t Value);
 CPUMDECL(int)       CPUMSetGuestEFlags(PVM pVM, uint32_t eflags);
 CPUMDECL(int)       CPUMSetGuestEIP(PVM pVM, uint32_t eip);

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

@@ -822 +822 @@
 }
 
-CPUMDECL(RTGCUINTREG) CPUMGetGuestDR0(PVM pVM)
+CPUMDECL(uint64_t) CPUMGetGuestDR0(PVM pVM)
 {
     return pVM->cpum.s.Guest.dr0;
 }
 
-CPUMDECL(RTGCUINTREG) CPUMGetGuestDR1(PVM pVM)
+CPUMDECL(uint64_t) CPUMGetGuestDR1(PVM pVM)
 {
     return pVM->cpum.s.Guest.dr1;
 }
 
-CPUMDECL(RTGCUINTREG) CPUMGetGuestDR2(PVM pVM)
+CPUMDECL(uint64_t) CPUMGetGuestDR2(PVM pVM)
 {
     return pVM->cpum.s.Guest.dr2;
 }
 
-CPUMDECL(RTGCUINTREG) CPUMGetGuestDR3(PVM pVM)
+CPUMDECL(uint64_t) CPUMGetGuestDR3(PVM pVM)
 {
     return pVM->cpum.s.Guest.dr3;
 }
 
-CPUMDECL(RTGCUINTREG) CPUMGetGuestDR6(PVM pVM)
+CPUMDECL(uint64_t) CPUMGetGuestDR6(PVM pVM)
 {
     return pVM->cpum.s.Guest.dr6;
 }
 
-CPUMDECL(RTGCUINTREG) CPUMGetGuestDR7(PVM pVM)
+CPUMDECL(uint64_t) CPUMGetGuestDR7(PVM pVM)
 {
     return pVM->cpum.s.Guest.dr7;
@@ -853 +853 @@
 
 /** @todo drx should be an array */
-CPUMDECL(int) CPUMGetGuestDRx(PVM pVM, uint32_t iReg, uint32_t *pValue)
+CPUMDECL(int) CPUMGetGuestDRx(PVM pVM, uint32_t iReg, uint64_t *pValue)
 {
     switch (iReg)
@@ -1223 +1223 @@
 
 
-CPUMDECL(int) CPUMSetGuestDR0(PVM pVM, RTGCUINTREG uDr0)
+CPUMDECL(int) CPUMSetGuestDR0(PVM pVM, uint64_t uDr0)
 {
     pVM->cpum.s.Guest.dr0 = uDr0;
@@ -1229 +1229 @@
 }
 
-CPUMDECL(int) CPUMSetGuestDR1(PVM pVM, RTGCUINTREG uDr1)
+CPUMDECL(int) CPUMSetGuestDR1(PVM pVM, uint64_t uDr1)
 {
     pVM->cpum.s.Guest.dr1 = uDr1;
@@ -1235 +1235 @@
 }
 
-CPUMDECL(int) CPUMSetGuestDR2(PVM pVM, RTGCUINTREG uDr2)
+CPUMDECL(int) CPUMSetGuestDR2(PVM pVM, uint64_t uDr2)
 {
     pVM->cpum.s.Guest.dr2 = uDr2;
@@ -1241 +1241 @@
 }
 
-CPUMDECL(int) CPUMSetGuestDR3(PVM pVM, RTGCUINTREG uDr3)
+CPUMDECL(int) CPUMSetGuestDR3(PVM pVM, uint64_t uDr3)
 {
     pVM->cpum.s.Guest.dr3 = uDr3;
@@ -1247 +1247 @@
 }
 
-CPUMDECL(int) CPUMSetGuestDR6(PVM pVM, RTGCUINTREG uDr6)
+CPUMDECL(int) CPUMSetGuestDR6(PVM pVM, uint64_t uDr6)
 {
     pVM->cpum.s.Guest.dr6 = uDr6;
@@ -1253 +1253 @@
 }
 
-CPUMDECL(int) CPUMSetGuestDR7(PVM pVM, RTGCUINTREG uDr7)
+CPUMDECL(int) CPUMSetGuestDR7(PVM pVM, uint64_t uDr7)
 {
     pVM->cpum.s.Guest.dr7 = uDr7;
@@ -1260 +1260 @@
 
 /** @todo drx should be an array */
-CPUMDECL(int) CPUMSetGuestDRx(PVM pVM, uint32_t iReg, uint32_t Value)
+CPUMDECL(int) CPUMSetGuestDRx(PVM pVM, uint32_t iReg, uint64_t Value)
 {
     switch (iReg)

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

@@ -1890 +1890 @@
 EMDECL(int) EMInterpretDRxRead(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t DestRegGen, uint32_t SrcRegDrx)
 {
-    uint32_t val32;
-
-    int rc = CPUMGetGuestDRx(pVM, SrcRegDrx, &val32);
+    uint64_t val64;
+
+    int rc = CPUMGetGuestDRx(pVM, SrcRegDrx, &val64);
     AssertMsgRCReturn(rc, ("CPUMGetGuestDRx %d failed\n", SrcRegDrx), VERR_EM_INTERPRETER);
-    rc = DISWriteReg32(pRegFrame, DestRegGen, val32);
+    rc = DISWriteReg32(pRegFrame, DestRegGen, (uint32_t)val64);
     if (VBOX_SUCCESS(rc))
         return VINF_SUCCESS;