Changeset 47323 in vbox for trunk/src

Timestamp:

Jul 22, 2013 7:04:20 PM (12 years ago)

Author:

vboxsync

Message:

IEM: BSWAP fix (don't blindly trust the intel manual).

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (2 diffs)
• VMMAll/IEMAllInstructions.cpp.h (modified) (8 diffs)

trunk/src/VBox/VMM/Makefile.kmk

@@ -706 +706 @@
 # Always optimize the interpreter.
 #
+ifn1of ($(USERNAME),bird)
 if1of ($(KBUILD_TARGET), win)
  # -noover is recognized despite the statement saying otherwise. It silences these warnings:
@@ -717 +718 @@
  VMMAll/IEMAll.cpp_CXXFLAGS += -fomit-frame-pointer # Omitting the frame pointer results in larger code, but it might be worth it. (esp addressing vs ebp?)
 endif
+endif # bird wants good stacks
 
 include $(FILE_KBUILD_SUB_FOOTER)

trunk/src/VBox/VMM/VMMAll/IEMAllInstructions.cpp.h

@@ -5279 +5279 @@
 {
     IEMOP_MNEMONIC("bswap rAX/r8");
-    return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xAX | pIemCpu->uRexReg);
+    /* Note! Intel manuals states that R8-R15 can be accessed by using a REX.X
+             prefix.  REX.B is the correct prefix it appears.  For a parallel
+             case, see iemOp_mov_AL_Ib and iemOp_mov_eAX_Iv. */
+    return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xAX | pIemCpu->uRexB);
 }
 
@@ -5287 +5290 @@
 {
     IEMOP_MNEMONIC("bswap rCX/r9");
-    return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xCX | pIemCpu->uRexReg);
+    return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xCX | pIemCpu->uRexB);
 }
 
@@ -5295 +5298 @@
 {
     IEMOP_MNEMONIC("bswap rDX/r9");
-    return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xDX | pIemCpu->uRexReg);
+    return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xDX | pIemCpu->uRexB);
 }
 
@@ -5303 +5306 @@
 {
     IEMOP_MNEMONIC("bswap rBX/r9");
-    return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xBX | pIemCpu->uRexReg);
+    return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xBX | pIemCpu->uRexB);
 }
 
@@ -5311 +5314 @@
 {
     IEMOP_MNEMONIC("bswap rSP/r12");
-    return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xSP | pIemCpu->uRexReg);
+    return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xSP | pIemCpu->uRexB);
 }
 
@@ -5319 +5322 @@
 {
     IEMOP_MNEMONIC("bswap rBP/r13");
-    return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xBP | pIemCpu->uRexReg);
+    return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xBP | pIemCpu->uRexB);
 }
 
@@ -5327 +5330 @@
 {
     IEMOP_MNEMONIC("bswap rSI/r14");
-    return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xSI | pIemCpu->uRexReg);
+    return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xSI | pIemCpu->uRexB);
 }
 
@@ -5335 +5338 @@
 {
     IEMOP_MNEMONIC("bswap rDI/r15");
-    return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xDI | pIemCpu->uRexReg);
+    return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xDI | pIemCpu->uRexB);
 }