Changeset 1421 in vbox

Timestamp:

Mar 12, 2007 12:34:42 PM (18 years ago)

Author:

vboxsync

Message:

Use offset instead of fault address (aliases).

File:

• trunk/src/VBox/VMM/VMMGC/TRPMGC.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMGC/TRPMGC.cpp

@@ -113 +113 @@
     uint32_t    iGate       = ((RTGCUINTPTR)pvFault - (RTGCUINTPTR)GCPtrIDT)/sizeof(VBOXIDTE);
 
-    AssertMsg(pvFault >= GCPtrIDT && pvFault < GCPtrIDTEnd, ("pvFault=%VGv GCPtrIDT=%VGv-%VGv pvRange=%VGv\n", pvFault, GCPtrIDT, GCPtrIDTEnd, pvRange));
+    AssertMsg(offRange < cbIDT+1, ("pvFault=%VGv GCPtrIDT=%VGv-%VGv pvRange=%VGv\n", pvFault, GCPtrIDT, GCPtrIDTEnd, pvRange));
     Assert(pvRange == GCPtrIDT);
 
@@ -127 +127 @@
         if (VBOX_SUCCESS(rc) && cb)
         {
-            uint32_t iGate1 = ((RTGCUINTPTR)pvFault - (RTGCUINTPTR)GCPtrIDT + cb - 1)/sizeof(VBOXIDTE);
+            uint32_t iGate1 = (offRange + cb - 1)/sizeof(VBOXIDTE);
 
-            Log(("trpmgcGuestIDTWriteHandler: write to gate %x (%x) offset %x cb=%d\n", iGate, iGate1, (RTGCUINTPTR)pvFault - (RTGCUINTPTR)GCPtrIDT, cb));
+            Log(("trpmgcGuestIDTWriteHandler: write to gate %x (%x) offset %x cb=%d\n", iGate, iGate1, offRange, cb));
 
             trpmClearGuestTrapHandler(pVM, iGate);
@@ -141 +141 @@
 #endif
 
-    Log(("trpmgcGuestIDTWriteHandler: eip=%VGv write to gate %x offset %x\n", pRegFrame->eip, iGate, (RTGCUINTPTR)pvFault - (RTGCUINTPTR)GCPtrIDT));
+    Log(("trpmgcGuestIDTWriteHandler: eip=%VGv write to gate %x offset %x\n", pRegFrame->eip, iGate, offRange));
 
     /** @todo Check which IDT entry and keep the update cost low in TRPMR3SyncIDT() and CSAMCheckGates(). */