vbox的更動 13635 路徑 trunk/src/VBox/VMM/VMMGC/TRPMGC.cpp

時間撮記:

2008-10-28 下午08:27:33 (16 年 以前)

作者:

vboxsync

訊息:

#1865: TRPM.

檔案:

• trunk/src/VBox/VMM/VMMGC/TRPMGC.cpp (修改) (6 筆差異)

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

@@ -105 +105 @@
  *                      (If it's a EIP range this's the EIP, if not it's pvFault.)
  */
-VMMRCDECL(int) trpmgcGuestIDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
+VMMRCDECL(int) trpmRCGuestIDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
 {
     uint16_t    cbIDT;
@@ -118 +118 @@
 
 #if 0
-    /** @note this causes problems in Windows XP as instructions following the update can be dangerous (str eax has been seen) */
-    /** @note not going back to ring 3 could make the code scanner miss them. */
+    /* Note! this causes problems in Windows XP as instructions following the update can be dangerous (str eax has been seen) */
+    /* Note! not going back to ring 3 could make the code scanner miss them. */
     /* Check if we can handle the write here. */
     if (     iGate != 3                                         /* Gate 3 is handled differently; could do it here as well, but let ring 3 handle this case for now. */
@@ -130 +130 @@
             uint32_t iGate1 = (offRange + cb - 1)/sizeof(VBOXIDTE);
 
-            Log(("trpmgcGuestIDTWriteHandler: write to gate %x (%x) offset %x cb=%d\n", iGate, iGate1, offRange, cb));
+            Log(("trpmRCGuestIDTWriteHandler: write to gate %x (%x) offset %x cb=%d\n", iGate, iGate1, offRange, cb));
 
             trpmClearGuestTrapHandler(pVM, iGate);
@@ -136 +136 @@
                 trpmClearGuestTrapHandler(pVM, iGate1);
 
-            STAM_COUNTER_INC(&pVM->trpm.s.StatGCWriteGuestIDTHandled);
+            STAM_COUNTER_INC(&pVM->trpm.s.StatRCWriteGuestIDTHandled);
             return VINF_SUCCESS;
         }
@@ -144 +144 @@
 #endif
 
-    Log(("trpmgcGuestIDTWriteHandler: eip=%VGv write to gate %x offset %x\n", pRegFrame->eip, iGate, offRange));
+    Log(("trpmRCGuestIDTWriteHandler: 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(). */
     VM_FF_SET(pVM, VM_FF_TRPM_SYNC_IDT);
 
-    STAM_COUNTER_INC(&pVM->trpm.s.StatGCWriteGuestIDTFault);
+    STAM_COUNTER_INC(&pVM->trpm.s.StatRCWriteGuestIDTFault);
     return VINF_EM_RAW_EMULATE_INSTR_IDT_FAULT;
 }
@@ -166 +166 @@
  *                      (If it's a EIP range this's the EIP, if not it's pvFault.)
  */
-VMMRCDECL(int) trpmgcShadowIDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
+VMMRCDECL(int) trpmRCShadowIDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
 {
-    LogRel(("FATAL ERROR: trpmgcShadowIDTWriteHandler: eip=%08X pvFault=%VGv pvRange=%08X\r\n", pRegFrame->eip, pvFault, pvRange));
+    LogRel(("FATAL ERROR: trpmRCShadowIDTWriteHandler: eip=%08X pvFault=%VGv pvRange=%08X\r\n", pRegFrame->eip, pvFault, pvRange));
 
     /* If we ever get here, then the guest has executed an sidt instruction that we failed to patch. In theory this could be very bad, but