Changeset 1380 in vbox for trunk

Timestamp:

Mar 9, 2007 3:47:21 PM (18 years ago)

Author:

vboxsync

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

19376

Message:

Naming

File:

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

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

@@ -111 +111 @@
     RTGCPTR     GCPtrIDTEnd = (RTGCPTR)((RTGCUINTPTR)GCPtrIDT + cbIDT + 1);
 #endif
-    uint32_t    iTrap       = ((RTGCUINTPTR)pvFault - (RTGCUINTPTR)GCPtrIDT)/sizeof(VBOXIDTE);
+    uint32_t    iGate       = ((RTGCUINTPTR)pvFault - (RTGCUINTPTR)GCPtrIDT)/sizeof(VBOXIDTE);
 
     Assert(pvFault >= GCPtrIDT && pvFault < GCPtrIDTEnd);
@@ -118 +118 @@
 #if 0
     /* Check if we can handle the write here. */    
-    if (     iTrap != 3                                         /* Gate 3 is handled differently; could do it here as well, but let ring 3 handle this case for now. */
-        &&  !ASMBitTest(&pVM->trpm.s.au32IdtPatched[0], iTrap)) /* Passthru gates need special attention too. */
+    if (     iGate != 3                                         /* Gate 3 is handled differently; could do it here as well, but let ring 3 handle this case for now. */
+        &&  !ASMBitTest(&pVM->trpm.s.au32IdtPatched[0], iGate)) /* Passthru gates need special attention too. */
     {
         uint32_t cb;
@@ -125 +125 @@
         if (VBOX_SUCCESS(rc) && cb)
         {
-            uint32_t iTrap1 = ((RTGCUINTPTR)pvFault - (RTGCUINTPTR)GCPtrIDT + cb - 1)/sizeof(VBOXIDTE);
+            uint32_t iGate1 = ((RTGCUINTPTR)pvFault - (RTGCUINTPTR)GCPtrIDT + cb - 1)/sizeof(VBOXIDTE);
 
-            Log(("trpmgcGuestIDTWriteHandler: write to gate %x (%x) offset %x cb=%d\n", iTrap, iTrap1, (RTGCUINTPTR)pvFault - (RTGCUINTPTR)GCPtrIDT, cb));
+            Log(("trpmgcGuestIDTWriteHandler: write to gate %x (%x) offset %x cb=%d\n", iGate, iGate1, (RTGCUINTPTR)pvFault - (RTGCUINTPTR)GCPtrIDT, cb));
 
-            trpmClearGuestTrapHandler(pVM, iTrap);
-            if (iTrap != iTrap1)
-                trpmClearGuestTrapHandler(pVM, iTrap1);
+            trpmClearGuestTrapHandler(pVM, iGate);
+            if (iGate != iGate1)
+                trpmClearGuestTrapHandler(pVM, iGate1);
 
             STAM_COUNTER_INC(&pVM->trpm.s.StatGCWriteGuestIDTHandled);
@@ -139 +139 @@
 #endif
 
-    Log(("trpmgcGuestIDTWriteHandler: write to gate %x offset %x\n", iTrap, (RTGCUINTPTR)pvFault - (RTGCUINTPTR)GCPtrIDT));
+    Log(("trpmgcGuestIDTWriteHandler: write to gate %x offset %x\n", iGate, (RTGCUINTPTR)pvFault - (RTGCUINTPTR)GCPtrIDT));
 
     /** @todo Check which IDT entry and keep the update cost low in TRPMR3SyncIDT() and CSAMCheckGates(). */