Changeset 40451 in vbox

Timestamp:

Mar 13, 2012 4:13:54 PM (13 years ago)

Author:

vboxsync

Message:

EM: build fix.

Location:

trunk

Files:

• include/VBox/vmm/em.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/EMAll.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMAll/PGMAllPool.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/EMRaw.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMRC/PATMRC.cpp (modified) (1 diff)
• src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/em.h

@@ -158 +158 @@
                                               PDISCPUSTATE pDISState, unsigned *pcbInstr);
 VMMDECL(VBOXSTRICTRC)   EMInterpretInstruction(PVMCPU pVCpu, PCPUMCTXCORE pCoreCtx, RTGCPTR pvFault);
-VMMDECL(VBOXSTRICTRC)   EMInterpretInstructionEx(PVMCPU pVCpu, PCPUMCTXCORE pCoreCtx, RTGCPTR pvFault, uint32_t *pcbSize);
-VMMDECL(VBOXSTRICTRC)   EMInterpretInstructionCpuUpdtPC(PVMCPU pVCpu, PDISCPUSTATE pDis, PCPUMCTXCORE pCoreCtx, RTGCPTR pvFault, EMCODETYPE enmCodeType);
+VMMDECL(VBOXSTRICTRC)   EMInterpretInstructionEx(PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbWritten);
+VMMDECL(VBOXSTRICTRC)   EMInterpretInstructionDisasState(PVMCPU pVCpu, PDISCPUSTATE pDis, PCPUMCTXCORE pCoreCtx, RTGCPTR pvFault, EMCODETYPE enmCodeType);
 
 #ifndef VBOX_WITH_IEM

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

@@ -541 +541 @@
  *          to worry about e.g. invalid modrm combinations (!)
  */
-VMMDECL(VBOXSTRICTRC) EMInterpretInstructionEx(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbWritten)
+VMMDECL(VBOXSTRICTRC) EMInterpretInstructionEx(PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbWritten)
 {
     LogFlow(("EMInterpretInstructionEx %RGv fault %RGv\n", (RTGCPTR)pRegFrame->rip, pvFault));
@@ -606 +606 @@
  *          Make sure this can't happen!! (will add some assertions/checks later)
  */
-VMMDECL(VBOXSTRICTRC) EMInterpretInstructionCpuUpdtPC(PVMCPU pVCpu, PDISCPUSTATE pDis, PCPUMCTXCORE pRegFrame,
-                                                      RTGCPTR pvFault, EMCODETYPE enmCodeType)
+VMMDECL(VBOXSTRICTRC) EMInterpretInstructionDisasState(PVMCPU pVCpu, PDISCPUSTATE pDis, PCPUMCTXCORE pRegFrame,
+                                                       RTGCPTR pvFault, EMCODETYPE enmCodeType)
 {
     STAM_PROFILE_START(&pVCpu->em.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,Emulate), a);

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

@@ -840 +840 @@
      * Must do this in raw mode (!); XP boot will fail otherwise.
      */
-    VBOXSTRICTRC rc2 = EMInterpretInstructionCpuUpdtPC(pVCpu, pDis, pRegFrame, pvFault, EMCODETYPE_ALL);
+    VBOXSTRICTRC rc2 = EMInterpretInstructionDisasState(pVCpu, pDis, pRegFrame, pvFault, EMCODETYPE_ALL);
     if (RT_SUCCESS(rc2))
         AssertMsg(rc2 == VINF_SUCCESS, ("%Rrc\n", VBOXSTRICTRC_VAL(rc2))); /* ASSUMES no complicated stuff here. */
@@ -979 +979 @@
      * Interpret the instruction.
      */
-    VBOXSTRICTRC rc = EMInterpretInstructionCpuUpdtPC(pVCpu, pDis, pRegFrame, pvFault, EMCODETYPE_ALL);
+    VBOXSTRICTRC rc = EMInterpretInstructionDisasState(pVCpu, pDis, pRegFrame, pvFault, EMCODETYPE_ALL);
     if (RT_SUCCESS(rc))
         AssertMsg(rc == VINF_SUCCESS, ("%Rrc\n", VBOXSTRICTRC_VAL(rc))); /* ASSUMES no complicated stuff here. */

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -3335 +3335 @@
 
                     default:
-                        rc = EMInterpretInstructionCpuUpdtPC(pVCpu, pDis, CPUMCTX2CORE(pCtx), 0, EMCODETYPE_SUPERVISOR);
+                        rc = EMInterpretInstructionDisasState(pVCpu, pDis, CPUMCTX2CORE(pCtx), 0, EMCODETYPE_SUPERVISOR);
                         fUpdateRIP = false;
                         break;

trunk/src/VBox/VMM/VMMR3/EMRaw.cpp

@@ -605 +605 @@
                 AssertRC(rc);
 
-                rc = VBOXSTRICTRC_TODO(EMInterpretInstructionCpuUpdtPC(pVCpu, &cpu, CPUMCTX2CORE(pCtx), 0, EMCODETYPE_SUPERVISOR));
+                rc = VBOXSTRICTRC_TODO(EMInterpretInstructionDisasState(pVCpu, &cpu, CPUMCTX2CORE(pCtx), 0, EMCODETYPE_SUPERVISOR));
                 if (RT_SUCCESS(rc))
                     return rc;
@@ -1094 +1094 @@
 #endif
 
-                    rc = VBOXSTRICTRC_TODO(EMInterpretInstructionCpuUpdtPC(pVCpu, &Cpu, CPUMCTX2CORE(pCtx), 0, EMCODETYPE_SUPERVISOR));
+                    rc = VBOXSTRICTRC_TODO(EMInterpretInstructionDisasState(pVCpu, &Cpu, CPUMCTX2CORE(pCtx), 0, EMCODETYPE_SUPERVISOR));
                     if (RT_SUCCESS(rc))
                     {

trunk/src/VBox/VMM/VMMRC/PATMRC.cpp

@@ -520 +520 @@
             }
 
-            rc = EMInterpretInstructionCpuUpdtPC(VMMGetCpu0(pVM), &cpu, pRegFrame, 0 /* not relevant here */,
-                                                 EMCODETYPE_SUPERVISOR);
+            rc = EMInterpretInstructionDisasState(VMMGetCpu0(pVM), &cpu, pRegFrame, 0 /* not relevant here */,
+                                                  EMCODETYPE_SUPERVISOR);
             if (rc != VINF_SUCCESS)
             {

trunk/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp

@@ -556 +556 @@
         {
             LogFlow(("TRPMGCTrap06Handler: -> EMInterpretInstructionCPU\n"));
-            rc = EMInterpretInstructionCpuUpdtPC(pVCpu, &Cpu, pRegFrame, PC, EMCODETYPE_SUPERVISOR);
+            rc = EMInterpretInstructionDisasState(pVCpu, &Cpu, pRegFrame, PC, EMCODETYPE_SUPERVISOR);
         }
         /* Never generate a raw trap here; it might be an instruction, that requires emulation. */
@@ -798 +798 @@
         case OP_WRMSR:
         {
-            rc = EMInterpretInstructionCpuUpdtPC(pVCpu, pCpu, pRegFrame, PC, EMCODETYPE_SUPERVISOR);
+            rc = EMInterpretInstructionDisasState(pVCpu, pCpu, pRegFrame, PC, EMCODETYPE_SUPERVISOR);
             if (rc == VERR_EM_INTERPRETER)
                 rc = VINF_EM_RAW_EXCEPTION_PRIVILEGED;
@@ -874 +874 @@
         case OP_RDPMC:
         {
-            rc = EMInterpretInstructionCpuUpdtPC(pVCpu, pCpu, pRegFrame, PC, EMCODETYPE_SUPERVISOR);
+            rc = EMInterpretInstructionDisasState(pVCpu, pCpu, pRegFrame, PC, EMCODETYPE_SUPERVISOR);
             if (rc == VERR_EM_INTERPRETER)
                 rc = VINF_EM_RAW_EXCEPTION_PRIVILEGED;