VirtualBox

Changeset 9647

Show
Ignore:
Timestamp:
06/12/08 11:34:27 (6 months ago)
Author:
vboxsync
Message:

DRx access functions must use uint64_t now.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/include/VBox/cpum.h

    r9430 r9647  
    422422CPUMDECL(RTSEL)     CPUMGetGuestGS(PVM pVM); 
    423423CPUMDECL(RTSEL)     CPUMGetGuestSS(PVM pVM); 
    424 CPUMDECL(RTGCUINTREG) CPUMGetGuestDR0(PVM pVM); 
    425 CPUMDECL(RTGCUINTREG) CPUMGetGuestDR1(PVM pVM); 
    426 CPUMDECL(RTGCUINTREG) CPUMGetGuestDR2(PVM pVM); 
    427 CPUMDECL(RTGCUINTREG) CPUMGetGuestDR3(PVM pVM); 
    428 CPUMDECL(RTGCUINTREG) CPUMGetGuestDR6(PVM pVM); 
    429 CPUMDECL(RTGCUINTREG) CPUMGetGuestDR7(PVM pVM); 
    430 CPUMDECL(int)       CPUMGetGuestDRx(PVM pVM, uint32_t iReg, uint32_t *pValue); 
     424CPUMDECL(uint64_t) CPUMGetGuestDR0(PVM pVM); 
     425CPUMDECL(uint64_t) CPUMGetGuestDR1(PVM pVM); 
     426CPUMDECL(uint64_t) CPUMGetGuestDR2(PVM pVM); 
     427CPUMDECL(uint64_t) CPUMGetGuestDR3(PVM pVM); 
     428CPUMDECL(uint64_t) CPUMGetGuestDR6(PVM pVM); 
     429CPUMDECL(uint64_t) CPUMGetGuestDR7(PVM pVM); 
     430CPUMDECL(int)       CPUMGetGuestDRx(PVM pVM, uint32_t iReg, uint64_t *pValue); 
    431431CPUMDECL(void)      CPUMGetGuestCpuId(PVM pVM, uint32_t iLeaf, uint32_t *pEax, uint32_t *pEbx, uint32_t *pEcx, uint32_t *pEdx); 
    432432CPUMDECL(RCPTRTYPE(PCCPUMCPUID)) CPUMGetGuestCpuIdStdGCPtr(PVM pVM); 
    …… 
    451451CPUMDECL(int)       CPUMSetGuestCR3(PVM pVM, uint64_t cr3); 
    452452CPUMDECL(int)       CPUMSetGuestCR4(PVM pVM, uint64_t cr4); 
    453 CPUMDECL(int)       CPUMSetGuestDR0(PVM pVM, RTGCUINTREG uDr0); 
    454 CPUMDECL(int)       CPUMSetGuestDR1(PVM pVM, RTGCUINTREG uDr1); 
    455 CPUMDECL(int)       CPUMSetGuestDR2(PVM pVM, RTGCUINTREG uDr2); 
    456 CPUMDECL(int)       CPUMSetGuestDR3(PVM pVM, RTGCUINTREG uDr3); 
    457 CPUMDECL(int)       CPUMSetGuestDR6(PVM pVM, RTGCUINTREG uDr6); 
    458 CPUMDECL(int)       CPUMSetGuestDR7(PVM pVM, RTGCUINTREG uDr7); 
    459 CPUMDECL(int)       CPUMSetGuestDRx(PVM pVM, uint32_t iReg, uint32_t Value); 
     453CPUMDECL(int)       CPUMSetGuestDR0(PVM pVM, uint64_t uDr0); 
     454CPUMDECL(int)       CPUMSetGuestDR1(PVM pVM, uint64_t uDr1); 
     455CPUMDECL(int)       CPUMSetGuestDR2(PVM pVM, uint64_t uDr2); 
     456CPUMDECL(int)       CPUMSetGuestDR3(PVM pVM, uint64_t uDr3); 
     457CPUMDECL(int)       CPUMSetGuestDR6(PVM pVM, uint64_t uDr6); 
     458CPUMDECL(int)       CPUMSetGuestDR7(PVM pVM, uint64_t uDr7); 
     459CPUMDECL(int)       CPUMSetGuestDRx(PVM pVM, uint32_t iReg, uint64_t Value); 
    460460CPUMDECL(int)       CPUMSetGuestEFlags(PVM pVM, uint32_t eflags); 
    461461CPUMDECL(int)       CPUMSetGuestEIP(PVM pVM, uint32_t eip); 

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

    r9574 r9647  
    822822} 
    823823 
    824 CPUMDECL(RTGCUINTREG) CPUMGetGuestDR0(PVM pVM) 
     824CPUMDECL(uint64_t) CPUMGetGuestDR0(PVM pVM) 
    825825{ 
    826826    return pVM->cpum.s.Guest.dr0; 
    827827} 
    828828 
    829 CPUMDECL(RTGCUINTREG) CPUMGetGuestDR1(PVM pVM) 
     829CPUMDECL(uint64_t) CPUMGetGuestDR1(PVM pVM) 
    830830{ 
    831831    return pVM->cpum.s.Guest.dr1; 
    832832} 
    833833 
    834 CPUMDECL(RTGCUINTREG) CPUMGetGuestDR2(PVM pVM) 
     834CPUMDECL(uint64_t) CPUMGetGuestDR2(PVM pVM) 
    835835{ 
    836836    return pVM->cpum.s.Guest.dr2; 
    837837} 
    838838 
    839 CPUMDECL(RTGCUINTREG) CPUMGetGuestDR3(PVM pVM) 
     839CPUMDECL(uint64_t) CPUMGetGuestDR3(PVM pVM) 
    840840{ 
    841841    return pVM->cpum.s.Guest.dr3; 
    842842} 
    843843 
    844 CPUMDECL(RTGCUINTREG) CPUMGetGuestDR6(PVM pVM) 
     844CPUMDECL(uint64_t) CPUMGetGuestDR6(PVM pVM) 
    845845{ 
    846846    return pVM->cpum.s.Guest.dr6; 
    847847} 
    848848 
    849 CPUMDECL(RTGCUINTREG) CPUMGetGuestDR7(PVM pVM) 
     849CPUMDECL(uint64_t) CPUMGetGuestDR7(PVM pVM) 
    850850{ 
    851851    return pVM->cpum.s.Guest.dr7; 
    …… 
    853853 
    854854/** @todo drx should be an array */ 
    855 CPUMDECL(int) CPUMGetGuestDRx(PVM pVM, uint32_t iReg, uint32_t *pValue) 
     855CPUMDECL(int) CPUMGetGuestDRx(PVM pVM, uint32_t iReg, uint64_t *pValue) 
    856856{ 
    857857    switch (iReg) 
    …… 
    12231223 
    12241224 
    1225 CPUMDECL(int) CPUMSetGuestDR0(PVM pVM, RTGCUINTREG uDr0) 
     1225CPUMDECL(int) CPUMSetGuestDR0(PVM pVM, uint64_t uDr0) 
    12261226{ 
    12271227    pVM->cpum.s.Guest.dr0 = uDr0; 
    …… 
    12291229} 
    12301230 
    1231 CPUMDECL(int) CPUMSetGuestDR1(PVM pVM, RTGCUINTREG uDr1) 
     1231CPUMDECL(int) CPUMSetGuestDR1(PVM pVM, uint64_t uDr1) 
    12321232{ 
    12331233    pVM->cpum.s.Guest.dr1 = uDr1; 
    …… 
    12351235} 
    12361236 
    1237 CPUMDECL(int) CPUMSetGuestDR2(PVM pVM, RTGCUINTREG uDr2) 
     1237CPUMDECL(int) CPUMSetGuestDR2(PVM pVM, uint64_t uDr2) 
    12381238{ 
    12391239    pVM->cpum.s.Guest.dr2 = uDr2; 
    …… 
    12411241} 
    12421242 
    1243 CPUMDECL(int) CPUMSetGuestDR3(PVM pVM, RTGCUINTREG uDr3) 
     1243CPUMDECL(int) CPUMSetGuestDR3(PVM pVM, uint64_t uDr3) 
    12441244{ 
    12451245    pVM->cpum.s.Guest.dr3 = uDr3; 
    …… 
    12471247} 
    12481248 
    1249 CPUMDECL(int) CPUMSetGuestDR6(PVM pVM, RTGCUINTREG uDr6) 
     1249CPUMDECL(int) CPUMSetGuestDR6(PVM pVM, uint64_t uDr6) 
    12501250{ 
    12511251    pVM->cpum.s.Guest.dr6 = uDr6; 
    …… 
    12531253} 
    12541254 
    1255 CPUMDECL(int) CPUMSetGuestDR7(PVM pVM, RTGCUINTREG uDr7) 
     1255CPUMDECL(int) CPUMSetGuestDR7(PVM pVM, uint64_t uDr7) 
    12561256{ 
    12571257    pVM->cpum.s.Guest.dr7 = uDr7; 
    …… 
    12601260 
    12611261/** @todo drx should be an array */ 
    1262 CPUMDECL(int) CPUMSetGuestDRx(PVM pVM, uint32_t iReg, uint32_t Value) 
     1262CPUMDECL(int) CPUMSetGuestDRx(PVM pVM, uint32_t iReg, uint64_t Value) 
    12631263{ 
    12641264    switch (iReg) 

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

    r9353 r9647  
    18901890EMDECL(int) EMInterpretDRxRead(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t DestRegGen, uint32_t SrcRegDrx) 
    18911891{ 
    1892     uint32_t val32; 
    1893  
    1894     int rc = CPUMGetGuestDRx(pVM, SrcRegDrx, &val32); 
     1892    uint64_t val64; 
     1893 
     1894    int rc = CPUMGetGuestDRx(pVM, SrcRegDrx, &val64); 
    18951895    AssertMsgRCReturn(rc, ("CPUMGetGuestDRx %d failed\n", SrcRegDrx), VERR_EM_INTERPRETER); 
    1896     rc = DISWriteReg32(pRegFrame, DestRegGen, val32); 
     1896    rc = DISWriteReg32(pRegFrame, DestRegGen, (uint32_t)val64); 
    18971897    if (VBOX_SUCCESS(rc)) 
    18981898        return VINF_SUCCESS; 

© 2008 Sun Microsystems, Inc.
Contact – Privacy policy