Replace fstcw with fnstcw

The fstX instructions are actually aliases for 'waitf' followed by the fnstX variant. There's no need to have both.
dyninst · Nov 28, 2023 · 6fcfa17 · 6fcfa17
1 parent 21bd8db
commit 6fcfa17
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/common/h/mnemonics/x86_entryIDs.h b/common/h/mnemonics/x86_entryIDs.h
@@ -187,7 +187,6 @@ e_fprem,
 e_frstor,
 e_fsave,
 e_fst,
-e_fstcw,
 e_fstenv,
 e_fstp,
 e_fstsw,

diff --git a/common/src/arch-x86.C b/common/src/arch-x86.C
@@ -1032,7 +1032,7 @@ COMMON_EXPORT dyn_hash_map<entryID, std::string> entryNames_IAPI = map_list_of
   (e_frstor, "frstor")
   (e_fsave, "fsave")
   (e_fst, "fst")
-  (e_fstcw, "fstcw")
+  (e_fnstcw, "fnstcw")
   (e_fstenv, "fstenv")
   (e_fstp, "fstp")
   (e_fstsw, "fstsw")
@@ -3456,7 +3456,7 @@ static ia32_entry fpuMap[][2][8] = {
         { e_fldenv, t_done, 0, true, { M14, Zz, Zz }, 0, s1R, 0 },
         { e_fldcw,  t_done, 0, true, { Ew,  Zz, Zz }, 0, s1R, 0 },
         { e_fstenv, t_done, 0, true, { M14, Zz, Zz }, 0, s1W, 0 },
-        { e_fstcw,  t_done, 0, true, { Ew,  Zz, Zz }, 0, s1W, 0 }
+        { e_fnstcw,  t_done, 0, true, { Ew,  Zz, Zz }, 0, s1W, 0 }
     },
     { // D9 
         { e_fld,    t_done, 0, true, { ST0, Ef, Zz }, 0, s1W2R, 0 }, // stack push

diff --git a/dataflowAPI/src/convertOpcodes.C b/dataflowAPI/src/convertOpcodes.C
@@ -406,7 +406,7 @@ X86InstructionKind RoseInsnX86Factory::convertKind(entryID opcode, prefixEntryID
             return x86_fnsave;
         case e_fst:
             return x86_fst;
-        case e_fstcw:
+        case e_fnstcw:
             return x86_fnstcw;
         case e_fstenv:
             return x86_fnstenv;