Make jnle an alias of jg

dyninst · Nov 28, 2023 · cd8cb85 · cd8cb85
1 parent 6838629
commit cd8cb85
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/common/h/mnemonics/x86_entryIDs.h b/common/h/mnemonics/x86_entryIDs.h
@@ -242,13 +242,13 @@ e_jb,
 e_jbe,
 e_je,
 e_jg,
+e_jnle = e_jg,
 e_jge,
 e_jnl = e_jge,
 e_jl,
 e_jle,
 e_jmp,
 e_jne,
-e_jnle,
 e_jno,
 e_jnp,
 e_jns,

diff --git a/common/src/arch-x86.C b/common/src/arch-x86.C
@@ -1088,7 +1088,7 @@ COMMON_EXPORT dyn_hash_map<entryID, std::string> entryNames_IAPI = map_list_of
   (e_jnb_jae_j, "jnb")
   (e_ja, "ja")
   (e_jge, "jge")
-  (e_jnle, "jnle")
+  (e_jg, "jg")
   (e_jno, "jno")
   (e_jnp, "jnp")
   (e_jns, "jns")
@@ -2116,7 +2116,7 @@ list_of(x86::of)(x86::sf)(x86::zf)(x86::af)(x86::pf)(x86::cf)(x86::tf)(x86::if_)
   flagTable_[e_jnb_jae_j] = flagInfo(list_of(x86::of)(x86::sf)(x86::zf)(x86::pf)(x86::cf), vector<Dyninst::MachRegister>());
   flagTable_[e_ja] = flagInfo(list_of(x86::of)(x86::sf)(x86::zf)(x86::pf)(x86::cf), vector<Dyninst::MachRegister>());
   flagTable_[e_jge] = flagInfo(list_of(x86::of)(x86::sf)(x86::zf)(x86::pf)(x86::cf), vector<Dyninst::MachRegister>());
-  flagTable_[e_jnle] = flagInfo(list_of(x86::of)(x86::sf)(x86::zf)(x86::pf)(x86::cf), vector<Dyninst::MachRegister>());
+  flagTable_[e_jg] = flagInfo(list_of(x86::of)(x86::sf)(x86::zf)(x86::pf)(x86::cf), vector<Dyninst::MachRegister>());
   flagTable_[e_jno] = flagInfo(list_of(x86::of)(x86::sf)(x86::zf)(x86::pf)(x86::cf), vector<Dyninst::MachRegister>());
   flagTable_[e_jnp] = flagInfo(list_of(x86::of)(x86::sf)(x86::zf)(x86::pf)(x86::cf), vector<Dyninst::MachRegister>());
   flagTable_[e_jns] = flagInfo(list_of(x86::of)(x86::sf)(x86::zf)(x86::pf)(x86::cf), vector<Dyninst::MachRegister>());
@@ -2369,7 +2369,7 @@ static ia32_entry oneByteMap[256] = {
   { e_jl,   t_done, 0, false, { Jb, Zz, Zz }, (IS_JCC | REL_B), s1R, 0 },
   { e_jge,  t_done, 0, false, { Jb, Zz, Zz }, (IS_JCC | REL_B), s1R, 0 },
   { e_jle,  t_done, 0, false, { Jb, Zz, Zz }, (IS_JCC | REL_B), s1R, 0 },
-  { e_jnle, t_done, 0, false, { Jb, Zz, Zz }, (IS_JCC | REL_B), s1R, 0 },
+  { e_jg, t_done, 0, false, { Jb, Zz, Zz }, (IS_JCC | REL_B), s1R, 0 },
   /* 80 */
   { e_No_Entry, t_grp, Grp1a, true, { Zz, Zz, Zz }, 0, 0, 0 },
   { e_No_Entry, t_grp, Grp1b, true, { Zz, Zz, Zz }, 0, 0, 0 },
@@ -2693,7 +2693,7 @@ static ia32_entry twoByteMap[256] = {
   { e_jl,   t_done, 0, false, { Jz, Zz, Zz }, (IS_JCC | REL_X), s1R | (fCOND << FPOS), 0 },
   { e_jge,  t_done, 0, false, { Jz, Zz, Zz }, (IS_JCC | REL_X), s1R | (fCOND << FPOS), 0 },
   { e_jle,  t_done, 0, false, { Jz, Zz, Zz }, (IS_JCC | REL_X), s1R | (fCOND << FPOS), 0 },
-  { e_jnle, t_done, 0, false, { Jz, Zz, Zz }, (IS_JCC | REL_X), s1R | (fCOND << FPOS), 0 },
+  { e_jg, t_done, 0, false, { Jz, Zz, Zz }, (IS_JCC | REL_X), s1R | (fCOND << FPOS), 0 },
   /* 90 */
   { e_No_Entry,  t_sse_vex_mult, SSEVEX90, false, { Zz, Zz, Zz }, 0, 0, 0 },
   { e_No_Entry,  t_sse_vex_mult, SSEVEX91, false, { Zz, Zz, Zz }, 0, 0, 0 },

diff --git a/dataflowAPI/src/convertOpcodes.C b/dataflowAPI/src/convertOpcodes.C
@@ -110,7 +110,7 @@ X86InstructionKind RoseInsnX86Factory::convertKind(entryID opcode, prefixEntryID
             return x86_ja;
         case e_jge:
             return x86_jge;
-        case e_jnle:
+        case e_jg:
             return x86_jg;
         case e_jno:
             return x86_jno;

diff --git a/instructionAPI/src/Instruction.C b/instructionAPI/src/Instruction.C
@@ -573,7 +573,7 @@ namespace Dyninst
                 case e_jnb_jae_j:
                 case e_ja:
                 case e_jge:
-                case e_jnle:
+                case e_jg:
                 case e_jno:
                 case e_jnp:
                 case e_jns:

diff --git a/instructionAPI/src/InstructionCategories.C b/instructionAPI/src/InstructionCategories.C
@@ -62,7 +62,7 @@ namespace Dyninst
       case e_jnb_jae_j:
       case e_ja:
       case e_jge:
-      case e_jnle:
+      case e_jg:
       case e_jno:
       case e_jnp:
       case e_jns:

diff --git a/instructionAPI/src/Operation.C b/instructionAPI/src/Operation.C
@@ -326,7 +326,7 @@ namespace Dyninst
                 nonOperandRegisterWrites.insert(make_pair(e_jnb_jae_j, thePC));
                 nonOperandRegisterWrites.insert(make_pair(e_ja, thePC));
                 nonOperandRegisterWrites.insert(make_pair(e_jge, thePC));
-                nonOperandRegisterWrites.insert(make_pair(e_jnle, thePC));
+                nonOperandRegisterWrites.insert(make_pair(e_jg, thePC));
                 nonOperandRegisterWrites.insert(make_pair(e_jno, thePC));
                 nonOperandRegisterWrites.insert(make_pair(e_jnp, thePC));
                 nonOperandRegisterWrites.insert(make_pair(e_jns, thePC));

diff --git a/parseAPI/src/BoundFactCalculator.C b/parseAPI/src/BoundFactCalculator.C
@@ -264,7 +264,7 @@ static bool IsConditionalJump(Instruction insn) {
 	id == e_jbe || id == e_ja ||
 	id == e_jb_jnaej_j || id == e_jnb_jae_j ||
 	id == e_jle || id == e_jl ||
-	id == e_jge || id == e_jnle) return true;
+	id == e_jge || id == e_jg) return true;
     if (id == aarch64_op_b_cond) return true;
     if (id == power_op_bc || id == power_op_bcctr || id == power_op_bclr) return true;
     return false;

diff --git a/parseAPI/src/BoundFactData.C b/parseAPI/src/BoundFactData.C
@@ -696,7 +696,7 @@ bool BoundFact::ConditionalJumpBound(Instruction insn, EdgeTypeEnum type) {
 	    }
 
 	    // signed
-	    case e_jnle: {
+	    case e_jg: {
 	        if (pred.e1->getID() == AST::V_ConstantAST) {
 		    if (pred.e2->getID() == AST::V_ConstantAST) {
 		        parsing_printf("WARNING: both predicate elements are constants!\n");
@@ -937,7 +937,7 @@ bool BoundFact::ConditionalJumpBound(Instruction insn, EdgeTypeEnum type) {
 		break;
 
 	    }
-	    case e_jnle: {
+	    case e_jg: {
 	        if (pred.e1->getID() == AST::V_ConstantAST) {
 		    if (pred.e2->getID() == AST::V_ConstantAST) {
 		        parsing_printf("WARNING: both predicate elements are constants!\n");