From 00d015f5a3b4b9fa07e3bd86b5be052ea256eec2 Mon Sep 17 00:00:00 2001
From: Tim Haines <thaines.astro@gmail.com>
Date: Mon, 20 Nov 2023 23:30:31 -0600
Subject: [PATCH] Make e_fstenv an alias of e_fnstenv

---
 common/h/mnemonics/x86_entryIDs.h | 3 ++-
 common/src/arch-x86.C             | 4 ++--
 dataflowAPI/src/convertOpcodes.C  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/h/mnemonics/x86_entryIDs.h b/common/h/mnemonics/x86_entryIDs.h
index 511c9e5839..e609770371 100644
--- a/common/h/mnemonics/x86_entryIDs.h
+++ b/common/h/mnemonics/x86_entryIDs.h
@@ -186,9 +186,10 @@ e_fprem,
 e_frstor,
 e_fsave,
 e_fst,
-e_fstenv,
 e_fnstcw,
 e_fstcw = e_fnstcw,
+e_fnstenv,
+e_fstenv = e_fnstenv,
 e_fstp,
 e_fstsw,
 e_fsub,
diff --git a/common/src/arch-x86.C b/common/src/arch-x86.C
index 5c7e39ddfc..28bea58b66 100644
--- a/common/src/arch-x86.C
+++ b/common/src/arch-x86.C
@@ -1033,7 +1033,7 @@ COMMON_EXPORT dyn_hash_map<entryID, std::string> entryNames_IAPI = map_list_of
   (e_fsave, "fsave")
   (e_fst, "fst")
   (e_fnstcw, "fnstcw")
-  (e_fstenv, "fstenv")
+  (e_fnstenv, "fnstenv")
   (e_fstp, "fstp")
   (e_fstsw, "fstsw")
   (e_fsub, "fsub")
@@ -3455,7 +3455,7 @@ static ia32_entry fpuMap[][2][8] = {
         { e_fstp,   t_done, 0, true, { Ef, ST0, Zz }, 0, s1W2R, 0 }, // stack pop
         { 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_fnstenv, t_done, 0, true, { M14, Zz, Zz }, 0, s1W, 0 },
         { e_fnstcw,  t_done, 0, true, { Ew,  Zz, Zz }, 0, s1W, 0 }
     },
     { // D9 
diff --git a/dataflowAPI/src/convertOpcodes.C b/dataflowAPI/src/convertOpcodes.C
index 5baa49ef4c..92a20b0c5d 100644
--- a/dataflowAPI/src/convertOpcodes.C
+++ b/dataflowAPI/src/convertOpcodes.C
@@ -408,7 +408,7 @@ X86InstructionKind RoseInsnX86Factory::convertKind(entryID opcode, prefixEntryID
             return x86_fst;
         case e_fnstcw:
             return x86_fnstcw;
-        case e_fstenv:
+        case e_fnstenv:
             return x86_fnstenv;
         case e_fstp:
             return x86_fstp;