Changeset 11462 in vbox

Timestamp:

Aug 18, 2008 12:35:02 PM (16 years ago)

Author:

vboxsync

Message:

Correct fix for forced flag handling in instruction groups.

Location:

trunk/src/VBox/Disassembler

Files:

• DisasmCore.cpp (modified) (2 diffs)
• DisasmTest.cpp (modified) (1 diff)
• DisasmTestA.asm (modified) (1 diff)

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -441 +441 @@
     {
         if (pOp->optype & OPTYPE_FORCED_64_OP_SIZE)
-            pCpu->opsize = CPUMODE_64BIT;
+            pCpu->opmode = CPUMODE_64BIT;
         else
         if (    (pOp->optype & OPTYPE_DEFAULT_64_OP_SIZE)
             &&  !(pCpu->prefix & PREFIX_OPSIZE))
-            pCpu->opsize = CPUMODE_64BIT;
+            pCpu->opmode = CPUMODE_64BIT;
     }
 
@@ -515 +515 @@
         /* Note: redundant, but just in case this ever changes */
         if (fpop->optype & OPTYPE_FORCED_64_OP_SIZE)
-            pCpu->opsize = CPUMODE_64BIT;
+            pCpu->opmode = CPUMODE_64BIT;
         else
         if (    (fpop->optype & OPTYPE_DEFAULT_64_OP_SIZE)
             &&  !(pCpu->prefix & PREFIX_OPSIZE))
-            pCpu->opsize = CPUMODE_64BIT;
+            pCpu->opmode = CPUMODE_64BIT;
     }
 

trunk/src/VBox/Disassembler/DisasmTest.cpp

@@ -72 +72 @@
         pInstr = (RTUINTPTR)TestProc64;
 
+////__debugbreak();
         for (int i=0;i<50;i++)
         {

trunk/src/VBox/Disassembler/DisasmTestA.asm

@@ -71 +71 @@
 align 16
 BEGINPROC TestProc64
+      call qword [r8+10h]
+      ; test
+      db 48h
+      db 8bh
+      db 44h
+      db 0ah
+      db 0f8h
       ;incorrectly assembled by yasm; REX.W should not be added!
       ;test rax, dword 0cc90cc90h
+      db 8bh
+      db 04h
+      db 8dh
+      db 00h
+      db 00h
+      db 0feh
+      db 0ffh
       mov   qword [rcx+rdx], 0
       mov   dword [rcx+rdx], 0