Changeset 9100 in vbox for trunk

Timestamp:

May 26, 2008 1:24:55 AM (17 years ago)

Author:

vboxsync

Message:

Corrected fstsw to fnstsw. The fstsw mnemonic is assembled into fwait+fnstsw, see the intel manuals (3-432 in Vol. 2A), so the correct name for DF /7 and DF E0 is fnstsw. The disassembler did turn a 9B DF E0 sequence into two instructions like it should, so it's just the mnemonics.

Location:

trunk

Files:

• include/VBox/disopcode.h (modified) (1 diff)
• src/VBox/Disassembler/DisasmTables.cpp (modified) (2 diffs)
• src/VBox/Disassembler/testcase/Makefile.kmk (modified) (3 diffs)
• src/VBox/Disassembler/testcase/tstAsmFnstsw-1.asm (added)

trunk/include/VBox/disopcode.h

@@ -495 +495 @@
 #define OP_FRSTOR       482
 #define OP_FSAVE        483
-#define OP_FSTSW        484
+#define OP_FNSTSW       484
 #define OP_FFREE        485
 #define OP_FUCOM        486

trunk/src/VBox/Disassembler/DisasmTables.cpp

@@ -1784 +1784 @@
     INVALID_OPCODE,
     OP("fsave %M",           IDX_ParseModRM,     0,          0,          OP_FSAVE,   OP_PARM_M,          OP_PARM_NONE,   OP_PARM_NONE, OPTYPE_HARMLESS /* fixme: wasn't initialized! */),
-    OP("fstsw %Mw",          IDX_ParseModRM,     0,          0,          OP_FSTSW,   OP_PARM_Mw,         OP_PARM_NONE,   OP_PARM_NONE, OPTYPE_HARMLESS /* fixme: wasn't initialized! */),
+    OP("fnstsw %Mw",         IDX_ParseModRM,     0,          0,          OP_FNSTSW,  OP_PARM_Mw,         OP_PARM_NONE,   OP_PARM_NONE, OPTYPE_HARMLESS /* fixme: wasn't initialized! */),
 };
 
@@ -1969 +1969 @@
 
     /* e */
-    OP("fstsw ax",           IDX_ParseFixedReg,  0,          0,          OP_FSTSW,   OP_PARM_REG_AX,     OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_HARMLESS),
+    OP("fnstsw ax",          IDX_ParseFixedReg,  0,          0,          OP_FNSTSW,  OP_PARM_REG_AX,     OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_HARMLESS),
     INVALID_OPCODE,
     INVALID_OPCODE,

trunk/src/VBox/Disassembler/testcase/Makefile.kmk

@@ -36 +36 @@
 # Tests that will be build, disassembled and re-build from disassembly.
 VBOX_DISAS_TESTS_BUILD = \
+        tstAsmFnstsw-1.asm \
         tstAsmLock-1.asm \
         tstAsmMovSeg-1.asm \
@@ -51 +52 @@
 ## @todo tstBinMovzx-1.bin: does C7 imply 32-bit reg in 16-bit mode, or what exactly does it do?
 VBOX_DISAS_TESTS_BINARIES := \
-        tstBinMovzx-1.bin
+        tstBinMovzx-1.bin \
+        tstBinFnstsw-1.bin
 ifeq ($(USER),bird)
 VBOX_DISAS_TESTS_BINARIES += \
@@ -57 +59 @@
         tstBin-2.bin \
         tstBin-3.bin \
+        tstBin-4.bin
 #       $(PATH_BIN)/testcase/tstDisasm-2$(SUFF_EXEC)
 endif