Changeset 20344 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 5, 2009 3:54:01 PM (16 years ago)

Author:

vboxsync

Message:

Updates

File:

• trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (6 diffs)

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

@@ -2406 +2406 @@
 static int svmR0ReplaceTprInstr(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
 {
+    RTGCPTR     oldrip = pCtx->rip;
     DISCPUSTATE Cpu;
-    unsigned cbOp;
+    unsigned    cbOp;
 
     Log(("Replace TPR access at %RGv\n", pCtx->rip));
@@ -2416 +2417 @@
         &&  Cpu.pCurInstr->opcode == OP_MOV)
     {
-        rc = svmR0EmulateTprMov(pVCpu, &Cpu, pCtx, cbOp);
-        if (rc != VINF_SUCCESS)
-            return rc;
-
         uint8_t szInstr[15];
         if (    cbOp == 10
@@ -2441 +2438 @@
              * it does, then we can safely use it ourselves.
              */
+            pCtx->rip += cbOp;
             rc = EMInterpretDisasOne(pVM, pVCpu, CPUMCTX2CORE(pCtx), &Cpu, &cbOp);
+            pCtx->rip = oldrip;
             if (    rc == VINF_SUCCESS
                 &&  Cpu.pCurInstr->opcode == OP_MOV
@@ -2480 +2479 @@
                  *   mov ecx, dword [fffe0080]        (5 bytes)
                  */
+                pCtx->rip += cbOp;
                 rc = EMInterpretDisasOne(pVM, pVCpu, CPUMCTX2CORE(pCtx), &Cpu, &cbOp);
+                pCtx->rip = oldrip;
                 if (    rc == VINF_SUCCESS
                     &&  Cpu.pCurInstr->opcode == OP_MOV
@@ -2527 +2528 @@
                  *   shr eax, 4
                  */
+                pCtx->rip += cbOp;
                 rc = EMInterpretDisasOne(pVM, pVCpu, CPUMCTX2CORE(pCtx), &Cpu, &cbOp);
+                pCtx->rip = oldrip;
                 if (    rc == VINF_SUCCESS
                     &&  Cpu.pCurInstr->opcode == OP_SHR
@@ -2551 +2554 @@
             }
         }
+        rc = svmR0EmulateTprMov(pVCpu, &Cpu, pCtx, cbOp);
+        if (rc != VINF_SUCCESS)
+            return rc;
+
         /* Emulated successfully, so continue. */
         return VINF_SUCCESS;