Changeset 2047 in vbox for trunk/src/VBox/VMM/PATM

Timestamp:

Apr 12, 2007 1:41:53 PM (18 years ago)

Author:

vboxsync

Message:

Size override fixes

Location:

trunk/src/VBox/VMM/PATM

Files:

• PATMA.asm (modified) (2 diffs)
• PATMPatch.cpp (modified) (3 diffs)

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

@@ -2534 +2534 @@
 
 
-; push ss, check and correct RPL
+; check and correct RPL of pushed ss
 BEGINPROC PATMMovFromSS
 PATMMovFromSS_Start:
-    push    ss
     push    eax
     pushfd
@@ -2549 +2548 @@
     popfd
     pop     eax
-    add     esp, 2          ; ss popped off as 16 bits value
 PATMMovFromSS_Start_End:
 ENDPROC PATMMovFromSS

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

@@ -1286 +1286 @@
 
     Log(("patmPatchGenMovFromSS %VGv\n", pCurInstrGC));
+    
+    Assert(pPatch->flags & PATMFL_CODE32);
 
     PATCHGEN_PROLOG(pVM, pPatch);
@@ -1291 +1293 @@
     PATCHGEN_EPILOG(pPatch, size);
 
-    /* pushes ss, checks and corrects RPL */
+    /* push ss */
+    PATCHGEN_PROLOG_NODEF(pVM, pPatch);
+    offset = 0;
+    if (pCpu->prefix & PREFIX_OPSIZE)
+        pPB[offset++] = 0x66;       /* size override -> 16 bits push */
+    pPB[offset++] = 0x16;
+    PATCHGEN_EPILOG(pPatch, offset);
+
+    /* checks and corrects RPL of pushed ss*/
     PATCHGEN_PROLOG_NODEF(pVM, pPatch);
     size = patmPatchGenCode(pVM, pPatch, pPB, &PATMMovFromSSRecord, 0, false);
@@ -1299 +1309 @@
     PATCHGEN_PROLOG_NODEF(pVM, pPatch);
     offset = 0;
-    if (pPatch->flags & PATMFL_CODE32)
+    if (pCpu->prefix & PREFIX_OPSIZE)
         pPB[offset++] = 0x66; /* size override -> 16 bits pop */
     pPB[offset++] = 0x58 + pCpu->param1.base.reg_gen32;