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

Timestamp:

Apr 12, 2007 1:23:27 PM (18 years ago)

Author:

vboxsync

Message:

Corrections and activation of mov gpr,ss patch.

Location:

trunk/src/VBox/VMM/PATM

Files:

• PATM.cpp (modified) (3 diffs)
• PATMA.asm (modified) (1 diff)
• PATMPatch.cpp (modified) (2 diffs)
• PATMPatch.h (modified) (1 diff)

trunk/src/VBox/VMM/PATM/PATM.cpp

@@ -1652 +1652 @@
 
     case OP_MOV:
-        if (pCpu->pCurInstr->optype & OPTYPE_INHIBIT_IRQS)
-        {
-            Assert(pCpu->pCurInstr->param1 == OP_PARM_Sw && (pCpu->param1.flags & USE_REG_SEG));
-
+        if (pCpu->pCurInstr->optype & OPTYPE_POTENTIALLY_DANGEROUS)
+        {
             /* mov ss, src? */
             if (    (pCpu->param1.flags & USE_REG_SEG)
@@ -1664 +1662 @@
                 /** @todo this could cause a fault (ring 0 selector being loaded in ring 1) */
             }
-#if 0
             else
             if (    (pCpu->param2.flags & USE_REG_SEG)
@@ -1671 +1668 @@
             {
                 /* mov GPR, ss */
-                rc = patmPatchGenMovFromSS(pVM, pPatch, pCpu);
+                rc = patmPatchGenMovFromSS(pVM, pPatch, pCpu, pCurInstrGC);
                 if (VBOX_SUCCESS(rc))
                     rc = VWRN_CONTINUE_RECOMPILE;
                 break;
             }
-#endif
         }
         goto duplicate_instr;

trunk/src/VBox/VMM/PATM/PATMA.asm

@@ -2557 +2557 @@
     DD      0
     DD      0
+    DD      0
     DD      PATMMovFromSS_Start_End - PATMMovFromSS_Start
-    DD      0
     DD      0
     DD      0ffffffffh

trunk/src/VBox/VMM/PATM/PATMPatch.cpp

@@ -1281 +1281 @@
  * mov GPR, SS
  */
-int patmPatchGenMovFromSS(PVM pVM, PPATCHINFO pPatch, DISCPUSTATE *pCpu)
+int patmPatchGenMovFromSS(PVM pVM, PPATCHINFO pPatch, DISCPUSTATE *pCpu, RTGCPTR pCurInstrGC)
 {
     uint32_t size, offset;
 
-    PATCHGEN_PROLOG(pVM, pPatch);
-    size = patmPatchGenCode(pVM, pPatch, pPB, &PATMSetPIFRecord, 0, false);
+    Log(("patmPatchGenMovFromSS %VGv\n", pCurInstrGC));
+
+    PATCHGEN_PROLOG(pVM, pPatch);
+    size = patmPatchGenCode(pVM, pPatch, pPB, &PATMClearPIFRecord, 0, false);
     PATCHGEN_EPILOG(pPatch, size);
 
@@ -1299 +1301 @@
     if (pPatch->flags & PATMFL_CODE32)
         pPB[offset++] = 0x66; /* size override -> 16 bits pop */
-    pPB[offset++] = 0x50 + pCpu->param1.base.reg_gen32;
+    pPB[offset++] = 0x58 + pCpu->param1.base.reg_gen32;
     PATCHGEN_EPILOG(pPatch, offset);
 
 
     PATCHGEN_PROLOG_NODEF(pVM, pPatch);
-    size = patmPatchGenCode(pVM, pPatch, pPB, &PATMClearPIFRecord, 0, false);
+    size = patmPatchGenCode(pVM, pPatch, pPB, &PATMSetPIFRecord, 0, false);
     PATCHGEN_EPILOG(pPatch, size);
 

trunk/src/VBox/VMM/PATM/PATMPatch.h

@@ -30 +30 @@
 int patmPatchGenMovControl(PVM pVM, PPATCHINFO pPatch, DISCPUSTATE *pCpu);
 int patmPatchGenMovDebug(PVM pVM, PPATCHINFO pPatch, DISCPUSTATE *pCpu);
-int patmPatchGenMovFromSS(PVM pVM, PPATCHINFO pPatch, DISCPUSTATE *pCpu);
+int patmPatchGenMovFromSS(PVM pVM, PPATCHINFO pPatch, DISCPUSTATE *pCpu, RTGCPTR pCurInstrGC);
 int patmPatchGenRelJump(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t *)pTargetGC, uint32_t opcode, bool fSizeOverride);
 int patmPatchGenLoop(PVM pVM, PPATCHINFO pPatch, GCPTRTYPE(uint8_t *)pTargetGC, uint32_t opcode, bool fSizeOverride);