Changeset 19016 in vbox

Timestamp:

Apr 20, 2009 8:01:04 AM (16 years ago)

Author:

vboxsync

Message:

TRPM2VM -> TRPMCPU2VM

Location:

trunk/src/VBox/VMM

Files:

• TRPMInternal.h (modified) (2 diffs)
• VMMGC/TRPMGCHandlers.cpp (modified) (10 diffs)

trunk/src/VBox/VMM/TRPMInternal.h

@@ -67 +67 @@
 
 
+#if 0 /* not used */
 /**
  * Converts a TRPM pointer into a VM pointer.
@@ -73 +74 @@
  */
 #define TRPM2VM(pTRPM)          ( (PVM)((char*)pTRPM - pTRPM->offVM) )
+#endif
 
 /**

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

@@ -260 +260 @@
 {
     RTGCUINTREG uDr6 = ASMGetAndClearDR6();
-    PVM         pVM = TRPM2VM(pTrpmCpu);
+    PVM         pVM = TRPMCPU2VM(pTrpmCpu);
     PVMCPU      pVCpu = VMMGetCpu0(pVM);
 
@@ -325 +325 @@
 {
     LogFlow(("TRPMGC03: %04x:%08x\n", pRegFrame->cs, pRegFrame->eip));
-    PVM pVM = TRPM2VM(pTrpmCpu);
+    PVM pVM = TRPMCPU2VM(pTrpmCpu);
     int rc;
 
@@ -365 +365 @@
 {
     LogFlow(("TRPMGC06: %04x:%08x efl=%x\n", pRegFrame->cs, pRegFrame->eip, pRegFrame->eflags.u32));
-    PVM     pVM = TRPM2VM(pTrpmCpu);
+    PVM     pVM = TRPMCPU2VM(pTrpmCpu);
     PVMCPU  pVCpu = VMMGetCpu0(pVM);
     int     rc;
@@ -470 +470 @@
 {
     LogFlow(("TRPMGC07: %04x:%08x\n", pRegFrame->cs, pRegFrame->eip));
-    PVM     pVM   = TRPM2VM(pTrpmCpu);
+    PVM     pVM   = TRPMCPU2VM(pTrpmCpu);
     PVMCPU  pVCpu = VMMGetCpu0(pVM);
 
@@ -494 +494 @@
 {
     LogFlow(("TRPMGC0b: %04x:%08x\n", pRegFrame->cs, pRegFrame->eip));
-    PVM pVM = TRPM2VM(pTrpmCpu);
+    PVM pVM = TRPMCPU2VM(pTrpmCpu);
 
     /*
@@ -926 +926 @@
 DECLASM(int) TRPMGCTrap0dHandler(PTRPMCPU pTrpmCpu, PCPUMCTXCORE pRegFrame)
 {
-    PVM pVM = TRPM2VM(pTrpmCpu);
+    PVM pVM = TRPMCPU2VM(pTrpmCpu);
     PVMCPU pVCpu = VMMGetCpu0(pVM);
 
@@ -984 +984 @@
 DECLASM(int) TRPMGCTrap0eHandler(PTRPMCPU pTrpmCpu, PCPUMCTXCORE pRegFrame)
 {
-    PVM     pVM = TRPM2VM(pTrpmCpu);
+    PVM     pVM = TRPMCPU2VM(pTrpmCpu);
     PVMCPU  pVCpu = VMMGetCpu0(pVM);
 
@@ -1097 +1097 @@
 DECLASM(int) TRPMGCHyperTrap0bHandler(PTRPMCPU pTrpmCpu, PCPUMCTXCORE pRegFrame)
 {
-    return trpmGCHyperGeneric(TRPM2VM(pTrpmCpu), pRegFrame, g_aTrap0bHandlers, g_aTrap0bHandlersEnd);
+    return trpmGCHyperGeneric(TRPMCPU2VM(pTrpmCpu), pRegFrame, g_aTrap0bHandlers, g_aTrap0bHandlersEnd);
 }
 
@@ -1116 +1116 @@
 DECLASM(int) TRPMGCHyperTrap0dHandler(PTRPMCPU pTrpmCpu, PCPUMCTXCORE pRegFrame)
 {
-    return trpmGCHyperGeneric(TRPM2VM(pTrpmCpu), pRegFrame, g_aTrap0dHandlers, g_aTrap0dHandlersEnd);
+    return trpmGCHyperGeneric(TRPMCPU2VM(pTrpmCpu), pRegFrame, g_aTrap0dHandlers, g_aTrap0dHandlersEnd);
 }
 
@@ -1135 +1135 @@
 DECLASM(int) TRPMGCHyperTrap0eHandler(PTRPMCPU pTrpmCpu, PCPUMCTXCORE pRegFrame)
 {
-    return trpmGCHyperGeneric(TRPM2VM(pTrpmCpu), pRegFrame, g_aTrap0dHandlers, g_aTrap0dHandlersEnd);
+    return trpmGCHyperGeneric(TRPMCPU2VM(pTrpmCpu), pRegFrame, g_aTrap0dHandlers, g_aTrap0dHandlersEnd);
 }