From 419d736b55d9b7485924110513bb44fd4a278878 Mon Sep 17 00:00:00 2001
From: Tim Haines <thaines.astro@gmail.com>
Date: Thu, 23 Nov 2023 12:07:45 -0600
Subject: [PATCH] Make setnl an alias of setge

---
 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 67f919dea0..3a03e9ec88 100644
--- a/common/h/mnemonics/x86_entryIDs.h
+++ b/common/h/mnemonics/x86_entryIDs.h
@@ -579,9 +579,10 @@ e_setae,
 e_setnb = e_setae,
 e_setb,
 e_setbe,
+e_setge,
+e_setnl = e_setge,
 e_setl,
 e_setle,
-e_setnl,
 e_setnle,
 e_setno,
 e_setnp,
diff --git a/common/src/arch-x86.C b/common/src/arch-x86.C
index f86d7a5b68..02749a6059 100644
--- a/common/src/arch-x86.C
+++ b/common/src/arch-x86.C
@@ -1352,7 +1352,7 @@ COMMON_EXPORT dyn_hash_map<entryID, std::string> entryNames_IAPI = map_list_of
   (e_setle, "setle")
   (e_setae, "setae")
   (e_seta, "seta")
-  (e_setnl, "setnl")
+  (e_setge, "setge")
   (e_setnle, "setnle")
   (e_setno, "setno")
   (e_setnp, "setnp")
@@ -2159,7 +2159,7 @@ list_of(x86::of)(x86::sf)(x86::zf)(x86::af)(x86::pf)(x86::cf)(x86::tf)(x86::if_)
   flagTable_[e_setle] = flagInfo(list_of(x86::of)(x86::sf)(x86::zf)(x86::pf)(x86::cf), vector<Dyninst::MachRegister>());
   flagTable_[e_setae] = flagInfo(list_of(x86::of)(x86::sf)(x86::zf)(x86::pf)(x86::cf), vector<Dyninst::MachRegister>());
   flagTable_[e_seta] = flagInfo(list_of(x86::of)(x86::sf)(x86::zf)(x86::pf)(x86::cf), vector<Dyninst::MachRegister>());
-  flagTable_[e_setnl] = flagInfo(list_of(x86::of)(x86::sf)(x86::zf)(x86::pf)(x86::cf), vector<Dyninst::MachRegister>());
+  flagTable_[e_setge] = flagInfo(list_of(x86::of)(x86::sf)(x86::zf)(x86::pf)(x86::cf), vector<Dyninst::MachRegister>());
   flagTable_[e_setnle] = flagInfo(list_of(x86::of)(x86::sf)(x86::zf)(x86::pf)(x86::cf), vector<Dyninst::MachRegister>());
   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>());
@@ -2707,7 +2707,7 @@ static ia32_entry twoByteMap[256] = {
   { e_setp,   t_done, 0, true, { Eb, Zz, Zz }, 0, s1W | (fCOND << FPOS), 0 },
   { e_setnp,  t_done, 0, true, { Eb, Zz, Zz }, 0, s1W | (fCOND << FPOS), 0 },
   { e_setl,   t_done, 0, true, { Eb, Zz, Zz }, 0, s1W | (fCOND << FPOS), 0 },
-  { e_setnl,  t_done, 0, true, { Eb, Zz, Zz }, 0, s1W | (fCOND << FPOS), 0 },
+  { e_setge,  t_done, 0, true, { Eb, Zz, Zz }, 0, s1W | (fCOND << FPOS), 0 },
   { e_setle,  t_done, 0, true, { Eb, Zz, Zz }, 0, s1W | (fCOND << FPOS), 0 },
   { e_setnle, t_done, 0, true, { Eb, Zz, Zz }, 0, s1W | (fCOND << FPOS), 0 },
   /* A0 */
diff --git a/dataflowAPI/src/convertOpcodes.C b/dataflowAPI/src/convertOpcodes.C
index 6036889bf7..ca828e3be9 100644
--- a/dataflowAPI/src/convertOpcodes.C
+++ b/dataflowAPI/src/convertOpcodes.C
@@ -822,7 +822,7 @@ X86InstructionKind RoseInsnX86Factory::convertKind(entryID opcode, prefixEntryID
             return x86_setae;
         case e_seta:
             return x86_seta;
-        case e_setnl:
+        case e_setge:
             return x86_setge;
         case e_setnle:
             return x86_setg;