From 56769060dd252ddd0d85f59f158d256f29080688 Mon Sep 17 00:00:00 2001
From: Tim Haines <thaines.astro@gmail.com>
Date: Thu, 23 Nov 2023 12:09:31 -0600
Subject: [PATCH] Make setnz an alias of setne

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

diff --git a/common/h/mnemonics/x86_entryIDs.h b/common/h/mnemonics/x86_entryIDs.h
index 9d85b9d1eb..07a8be1ef4 100644
--- a/common/h/mnemonics/x86_entryIDs.h
+++ b/common/h/mnemonics/x86_entryIDs.h
@@ -585,10 +585,11 @@ e_setge,
 e_setnl = e_setge,
 e_setl,
 e_setle,
+e_setne,
+e_setnz = e_setne,
 e_setno,
 e_setnp,
 e_setns,
-e_setnz,
 e_seto,
 e_setp,
 e_sets,
diff --git a/common/src/arch-x86.C b/common/src/arch-x86.C
index 814b508a5c..019c6ed64d 100644
--- a/common/src/arch-x86.C
+++ b/common/src/arch-x86.C
@@ -1357,7 +1357,7 @@ COMMON_EXPORT dyn_hash_map<entryID, std::string> entryNames_IAPI = map_list_of
   (e_setno, "setno")
   (e_setnp, "setnp")
   (e_setns, "setns")
-  (e_setnz, "setnz")
+  (e_setne, "setne")
   (e_seto, "seto")
   (e_setp, "setp")
   (e_sets, "sets")
@@ -2164,7 +2164,7 @@ list_of(x86::of)(x86::sf)(x86::zf)(x86::af)(x86::pf)(x86::cf)(x86::tf)(x86::if_)
   flagTable_[e_setno] = flagInfo(list_of(x86::of)(x86::sf)(x86::zf)(x86::pf)(x86::cf), vector<Dyninst::MachRegister>());
   flagTable_[e_setnp] = flagInfo(list_of(x86::of)(x86::sf)(x86::zf)(x86::pf)(x86::cf), vector<Dyninst::MachRegister>());
   flagTable_[e_setns] = flagInfo(list_of(x86::of)(x86::sf)(x86::zf)(x86::pf)(x86::cf), vector<Dyninst::MachRegister>());
-  flagTable_[e_setnz] = flagInfo(list_of(x86::of)(x86::sf)(x86::zf)(x86::pf)(x86::cf), vector<Dyninst::MachRegister>());
+  flagTable_[e_setne] = flagInfo(list_of(x86::of)(x86::sf)(x86::zf)(x86::pf)(x86::cf), vector<Dyninst::MachRegister>());
   flagTable_[e_seto] = flagInfo(list_of(x86::of)(x86::sf)(x86::zf)(x86::pf)(x86::cf), vector<Dyninst::MachRegister>());
   flagTable_[e_setp] = flagInfo(list_of(x86::of)(x86::sf)(x86::zf)(x86::pf)(x86::cf), vector<Dyninst::MachRegister>());
   flagTable_[e_sets] = flagInfo(list_of(x86::of)(x86::sf)(x86::zf)(x86::pf)(x86::cf), vector<Dyninst::MachRegister>());
@@ -2698,7 +2698,7 @@ static ia32_entry twoByteMap[256] = {
   { e_No_Entry,  t_sse_vex_mult, SSEVEX92, false, { Zz, Zz, Zz }, 0, 0, 0 },
   { e_No_Entry,  t_sse_vex_mult, SSEVEX93, false, { Zz, Zz, Zz }, 0, 0, 0 },
   { e_setz,   t_done, 0, true, { Eb, Zz, Zz }, 0, s1W | (fCOND << FPOS), 0 },
-  { e_setnz,  t_done, 0, true, { Eb, Zz, Zz }, 0, s1W | (fCOND << FPOS), 0 },
+  { e_setne,  t_done, 0, true, { Eb, Zz, Zz }, 0, s1W | (fCOND << FPOS), 0 },
   { e_setbe,  t_done, 0, true, { Eb, Zz, Zz }, 0, s1W | (fCOND << FPOS), 0 },
   { e_seta, t_done, 0, true, { Eb, Zz, Zz }, 0, s1W | (fCOND << FPOS), 0 },
   /* 98 */
diff --git a/dataflowAPI/src/convertOpcodes.C b/dataflowAPI/src/convertOpcodes.C
index c44f5c7a5d..49f27eda13 100644
--- a/dataflowAPI/src/convertOpcodes.C
+++ b/dataflowAPI/src/convertOpcodes.C
@@ -832,7 +832,7 @@ X86InstructionKind RoseInsnX86Factory::convertKind(entryID opcode, prefixEntryID
             return x86_setpo;
         case e_setns:
             return x86_setns;
-        case e_setnz:
+        case e_setne:
             return x86_setne;
         case e_seto:
             return x86_seto;