Changeset 9965 in vbox

Timestamp:

Jun 26, 2008 2:58:52 PM (16 years ago)

Author:

vboxsync

Message:

Hyper and intermediate CR3 values can be 64 bits.

Location:

trunk

Files:

• include/VBox/pgm.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (10 diffs)

trunk/include/VBox/pgm.h

@@ -307 +307 @@
 
 
-PGMDECL(uint32_t) PGMGetHyperCR3(PVM pVM);
-PGMDECL(uint32_t) PGMGetNestedCR3(PVM pVM, PGMMODE enmShadowMode);
-PGMDECL(uint32_t) PGMGetHyper32BitCR3(PVM pVM);
-PGMDECL(uint32_t) PGMGetHyperPaeCR3(PVM pVM);
-PGMDECL(uint32_t) PGMGetHyperAmd64CR3(PVM pVM);
-PGMDECL(uint32_t) PGMGetInterHCCR3(PVM pVM);
-PGMDECL(uint32_t) PGMGetInterGCCR3(PVM pVM);
-PGMDECL(uint32_t) PGMGetInter32BitCR3(PVM pVM);
-PGMDECL(uint32_t) PGMGetInterPaeCR3(PVM pVM);
-PGMDECL(uint32_t) PGMGetInterAmd64CR3(PVM pVM);
+PGMDECL(RTHCPHYS) PGMGetHyperCR3(PVM pVM);
+PGMDECL(RTHCPHYS) PGMGetNestedCR3(PVM pVM, PGMMODE enmShadowMode);
+PGMDECL(RTHCPHYS) PGMGetHyper32BitCR3(PVM pVM);
+PGMDECL(RTHCPHYS) PGMGetHyperPaeCR3(PVM pVM);
+PGMDECL(RTHCPHYS) PGMGetHyperAmd64CR3(PVM pVM);
+PGMDECL(RTHCPHYS) PGMGetInterHCCR3(PVM pVM);
+PGMDECL(RTHCPHYS) PGMGetInterGCCR3(PVM pVM);
+PGMDECL(RTHCPHYS) PGMGetInter32BitCR3(PVM pVM);
+PGMDECL(RTHCPHYS) PGMGetInterPaeCR3(PVM pVM);
+PGMDECL(RTHCPHYS) PGMGetInterAmd64CR3(PVM pVM);
 PGMDECL(int)    PGMTrap0eHandler(PVM pVM, RTGCUINT uErr, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault);
 PGMDECL(int)    PGMPrefetchPage(PVM pVM, RTGCPTR GCPtrPage);

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

@@ -1037 +1037 @@
  * @param   pVM         The VM handle.
  */
-PGMDECL(uint32_t) PGMGetHyperCR3(PVM pVM)
+PGMDECL(RTHCPHYS) PGMGetHyperCR3(PVM pVM)
 {
     PGMMODE enmShadowMode = pVM->pgm.s.enmShadowMode;
@@ -1067 +1067 @@
  * @param   pVM         The VM handle.
  */
-PGMDECL(uint32_t) PGMGetNestedCR3(PVM pVM, PGMMODE enmShadowMode)
+PGMDECL(RTHCPHYS) PGMGetNestedCR3(PVM pVM, PGMMODE enmShadowMode)
 {
     switch (enmShadowMode)
@@ -1094 +1094 @@
  * @param   pVM         The VM handle.
  */
-PGMDECL(uint32_t) PGMGetHyper32BitCR3(PVM pVM)
+PGMDECL(RTHCPHYS) PGMGetHyper32BitCR3(PVM pVM)
 {
     return pVM->pgm.s.HCPhys32BitPD;
@@ -1105 +1105 @@
  * @param   pVM         The VM handle.
  */
-PGMDECL(uint32_t) PGMGetHyperPaeCR3(PVM pVM)
+PGMDECL(RTHCPHYS) PGMGetHyperPaeCR3(PVM pVM)
 {
     return pVM->pgm.s.HCPhysPaePDPT;
@@ -1116 +1116 @@
  * @param   pVM         The VM handle.
  */
-PGMDECL(uint32_t) PGMGetHyperAmd64CR3(PVM pVM)
+PGMDECL(RTHCPHYS) PGMGetHyperAmd64CR3(PVM pVM)
 {
     return pVM->pgm.s.HCPhysPaePML4;
@@ -1127 +1127 @@
  * @param   pVM         The VM handle.
  */
-PGMDECL(uint32_t) PGMGetInterHCCR3(PVM pVM)
+PGMDECL(RTHCPHYS) PGMGetInterHCCR3(PVM pVM)
 {
     switch (pVM->pgm.s.enmHostMode)
@@ -1159 +1159 @@
  * @param   pVM         The VM handle.
  */
-PGMDECL(uint32_t) PGMGetInterGCCR3(PVM pVM)
+PGMDECL(RTHCPHYS) PGMGetInterGCCR3(PVM pVM)
 {
     switch (pVM->pgm.s.enmShadowMode)
@@ -1189 +1189 @@
  * @param   pVM         The VM handle.
  */
-PGMDECL(uint32_t) PGMGetInter32BitCR3(PVM pVM)
+PGMDECL(RTHCPHYS) PGMGetInter32BitCR3(PVM pVM)
 {
     return pVM->pgm.s.HCPhysInterPD;
@@ -1200 +1200 @@
  * @param   pVM         The VM handle.
  */
-PGMDECL(uint32_t) PGMGetInterPaeCR3(PVM pVM)
+PGMDECL(RTHCPHYS) PGMGetInterPaeCR3(PVM pVM)
 {
     return pVM->pgm.s.HCPhysInterPaePDPT;
@@ -1211 +1211 @@
  * @param   pVM         The VM handle.
  */
-PGMDECL(uint32_t) PGMGetInterAmd64CR3(PVM pVM)
+PGMDECL(RTHCPHYS) PGMGetInterAmd64CR3(PVM pVM)
 {
     return pVM->pgm.s.HCPhysInterPaePML4;