diff --git a/common/h/mnemonics/x86_entryIDs.h b/common/h/mnemonics/x86_entryIDs.h index 5df64b2a89..e8ffce0586 100644 --- a/common/h/mnemonics/x86_entryIDs.h +++ b/common/h/mnemonics/x86_entryIDs.h @@ -185,7 +185,7 @@ e_fnop, e_fnstcw, e_fprem, e_frstor, -e_fsave, +e_fnsave, e_fst, e_fnstenv, e_fstp, diff --git a/common/src/arch-x86.C b/common/src/arch-x86.C index 16416655ef..7a6c501144 100644 --- a/common/src/arch-x86.C +++ b/common/src/arch-x86.C @@ -1030,7 +1030,7 @@ COMMON_EXPORT dyn_hash_map entryNames_IAPI = map_list_of (e_fnop, "fnop") (e_fprem, "fprem") (e_frstor, "frstor") - (e_fsave, "fsave") + (e_fnsave, "fnsave") (e_fst, "fst") (e_fnstcw, "fnstcw") (e_fnstenv, "fnstenv") @@ -3543,7 +3543,7 @@ static ia32_entry fpuMap[][2][8] = { { e_fstp, t_done, 0, true, { Efd, ST0, Zz }, 0, s1W2R, 0 }, // stack pop { e_frstor, t_done, 0, true, { M512, Zz, Zz }, 0, s1R, 0 }, { e_fucomp, t_done, 0, true, { ST0, Efd, Zz }, 0, s1R2R, 0 }, // stack pop - { e_fsave, t_done, 0, true, { M512, Zz, Zz }, 0, s1W, 0 }, + { e_fnsave, t_done, 0, true, { M512, Zz, Zz }, 0, s1W, 0 }, { e_fnstsw, t_done, 0, true, { Ew, Zz, Zz }, 0, s1W, 0 } }, { // DD TODO semantics check diff --git a/dataflowAPI/src/convertOpcodes.C b/dataflowAPI/src/convertOpcodes.C index 89e550d2c3..3455bdfa8b 100644 --- a/dataflowAPI/src/convertOpcodes.C +++ b/dataflowAPI/src/convertOpcodes.C @@ -402,7 +402,7 @@ X86InstructionKind RoseInsnX86Factory::convertKind(entryID opcode, prefixEntryID return x86_fnop; case e_frstor: return x86_frstor; - case e_fsave: + case e_fnsave: return x86_fnsave; case e_fst: return x86_fst;