Changeset 9289 in vbox for trunk/src/VBox

Timestamp:

Jun 2, 2008 11:40:28 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

31495

Message:

Updates for 64 bits guests

Location:

trunk/src/VBox/VMM

Files:

• TRPM.cpp (modified) (7 diffs)
• VMMAll/EMAll.cpp (modified) (1 diff)

trunk/src/VBox/VMM/TRPM.cpp

@@ -1051 +1051 @@
 {
     /** @todo cleanup trpmR3ClearPassThroughHandler()! */
-    RTGCPTR32 aGCPtrs[TRPM_HANDLER_MAX];
+    RTRCPTR aGCPtrs[TRPM_HANDLER_MAX];
     int rc;
 
@@ -1076 +1076 @@
     {
         Assert(pIdteTemplate->u16OffsetLow == TRPM_HANDLER_INT);
-        Assert(sizeof(RTGCPTR) <= sizeof(aGCPtrs[0]));
-        RTGCPTR Offset = (RTGCPTR)aGCPtrs[pIdteTemplate->u16OffsetLow];
+        Assert(sizeof(RTRCPTR) == sizeof(aGCPtrs[0]));
+        RTRCPTR Offset = (RTRCPTR)aGCPtrs[pIdteTemplate->u16OffsetLow];
 
         /*
@@ -1107 +1107 @@
  * @param   GCPtr       GC address to check.
  */
-TRPMR3DECL(uint32_t) TRPMR3QueryGateByHandler(PVM pVM, RTGCPTR GCPtr)
+TRPMR3DECL(uint32_t) TRPMR3QueryGateByHandler(PVM pVM, RTRCPTR GCPtr)
 {
     for (uint32_t iTrap = 0; iTrap < ELEMENTS(pVM->trpm.s.aGuestTrapHandler); iTrap++)
@@ -1135 +1135 @@
  * @param   iTrap       Interrupt/trap number.
  */
-TRPMR3DECL(RTGCPTR) TRPMR3GetGuestTrapHandler(PVM pVM, unsigned iTrap)
+TRPMR3DECL(RTRCPTR) TRPMR3GetGuestTrapHandler(PVM pVM, unsigned iTrap)
 {
     AssertReturn(iTrap < ELEMENTS(pVM->trpm.s.aIdt), TRPM_INVALID_HANDLER);
@@ -1152 +1152 @@
  * @param   pHandler    GC handler pointer
  */
-TRPMR3DECL(int) TRPMR3SetGuestTrapHandler(PVM pVM, unsigned iTrap, RTGCPTR pHandler)
+TRPMR3DECL(int) TRPMR3SetGuestTrapHandler(PVM pVM, unsigned iTrap, RTRCPTR pHandler)
 {
     /*
@@ -1269 +1269 @@
  * @param   GCPtr       GC address to check.
  */
-TRPMR3DECL(bool) TRPMR3IsGateHandler(PVM pVM, RTGCPTR GCPtr)
+TRPMR3DECL(bool) TRPMR3IsGateHandler(PVM pVM, RTRCPTR GCPtr)
 {
     /*
@@ -1302 +1302 @@
                 if (pIDTE->Gen.u1Present)
                 {
-                    RTGCPTR GCPtrHandler = (pIDTE->Gen.u16OffsetHigh << 16) | pIDTE->Gen.u16OffsetLow;
+                    RTRCPTR GCPtrHandler = (pIDTE->Gen.u16OffsetHigh << 16) | pIDTE->Gen.u16OffsetLow;
                     if (GCPtr == GCPtrHandler)
                         return true;

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

@@ -633 +633 @@
 #ifdef IN_GC
                 /* Safety check (in theory it could cross a page boundary and fault there though) */
-                AssertMsgReturn(pParam1 == pvFault || (RTGCPTR)pRegFrame->esp == pvFault, ("%VGv != %VGv ss:esp=%04X:%VGv\n", pParam1, pvFault, pRegFrame->ss, pRegFrame->esp), VERR_EM_INTERPRETER);
+                AssertMsgReturn(pParam1 == pvFault || (RTGCPTR)pRegFrame->esp == pvFault, ("%VGv != %VGv ss:esp=%04X:%08x\n", pParam1, pvFault, pRegFrame->ss, pRegFrame->esp), VERR_EM_INTERPRETER);
 #endif
                 rc = emRamWrite(pVM, pParam1, &valpar1, param1.size);