Changeset 97209 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Oct 18, 2022 2:37:10 PM (2 years ago)

Author:

vboxsync

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

154185

Message:

VMM/HMSVMAll: Replace DISFetchReg32 and DISWriteReg32 with direct register accesses, because the two functions use CPUMCTXCORE and will soon be removed.

File:

• trunk/src/VBox/VMM/VMMAll/HMSVMAll.cpp (modified) (3 diffs)

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

@@ -68 +68 @@
     Log4(("Emulated VMMCall TPR access replacement at RIP=%RGv\n", pCtx->rip));
 
+    AssertCompile(DISGREG_EAX  == X86_GREG_xAX);
+    AssertCompile(DISGREG_ECX  == X86_GREG_xCX);
+    AssertCompile(DISGREG_EDX  == X86_GREG_xDX);
+    AssertCompile(DISGREG_EBX  == X86_GREG_xBX);
+    AssertCompile(DISGREG_ESP  == X86_GREG_xSP);
+    AssertCompile(DISGREG_EBP  == X86_GREG_xBP);
+    AssertCompile(DISGREG_ESI  == X86_GREG_xSI);
+    AssertCompile(DISGREG_EDI  == X86_GREG_xDI);
+    AssertCompile(DISGREG_R8D  == X86_GREG_x8);
+    AssertCompile(DISGREG_R9D  == X86_GREG_x9);
+    AssertCompile(DISGREG_R10D == X86_GREG_x10);
+    AssertCompile(DISGREG_R11D == X86_GREG_x11);
+    AssertCompile(DISGREG_R12D == X86_GREG_x12);
+    AssertCompile(DISGREG_R13D == X86_GREG_x13);
+    AssertCompile(DISGREG_R14D == X86_GREG_x14);
+    AssertCompile(DISGREG_R15D == X86_GREG_x15);
+
     /*
      * We do this in a loop as we increment the RIP after a successful emulation
@@ -89 +106 @@
                 AssertRC(rc);
 
-                rc = DISWriteReg32(CPUMCTX2CORE(pCtx), pPatch->uDstOperand, u8Tpr);
-                AssertRC(rc);
+                uint8_t idxReg = pPatch->uDstOperand;
+                AssertStmt(idxReg < RT_ELEMENTS(pCtx->aGRegs), idxReg = RT_ELEMENTS(pCtx->aGRegs) - 1);
+                pCtx->aGRegs[idxReg].u64 = u8Tpr;
                 pCtx->rip += pPatch->cbOp;
                 pCtx->eflags.Bits.u1RF = 0;
@@ -101 +119 @@
                 if (pPatch->enmType == HMTPRINSTR_WRITE_REG)
                 {
-                    uint32_t u32Val;
-                    int rc = DISFetchReg32(CPUMCTX2CORE(pCtx), pPatch->uSrcOperand, &u32Val);
-                    AssertRC(rc);
-                    u8Tpr = u32Val;
+                    uint8_t idxReg = pPatch->uDstOperand;
+                    AssertStmt(idxReg < RT_ELEMENTS(pCtx->aGRegs), idxReg = RT_ELEMENTS(pCtx->aGRegs) - 1);
+                    u8Tpr = pCtx->aGRegs[idxReg].u8;
                 }
                 else