Fix jlo and jhs

Author: joshwatson

lifter.py

@@ -305,7 +305,7 @@ def lift_jge(il, instr):
     def lift_jhs(il, instr):
         cond_branch(
             il,
-            il.flag_condition(LowLevelILFlagCondition.LLFC_UGE),
+            il.flag_condition(LowLevelILFlagCondition.LLFC_ULE),
             il.const(2, instr.src.value),
         )
 
@@ -321,7 +321,7 @@ def lift_jl(il, instr):
     def lift_jlo(il, instr):
         cond_branch(
             il,
-            il.flag_condition(LowLevelILFlagCondition.LLFC_ULT),
+            il.flag_condition(LowLevelILFlagCondition.LLFC_UGT),
             il.const(2, instr.src.value),
         )
 

msp430.py

@@ -39,14 +39,16 @@ class MSP430(Architecture):
     }
 
     flags_required_for_flag_condition = {
-        LowLevelILFlagCondition.LLFC_UGE: ["c"],
-        LowLevelILFlagCondition.LLFC_ULT: ["c"],
-        LowLevelILFlagCondition.LLFC_SGE: ["n", "v"],
-        LowLevelILFlagCondition.LLFC_SLT: ["n", "v"],
-        LowLevelILFlagCondition.LLFC_E: ["z"],
-        LowLevelILFlagCondition.LLFC_NE: ["z"],
-        LowLevelILFlagCondition.LLFC_NEG: ["n"],
-        LowLevelILFlagCondition.LLFC_POS: ["n"],
+        LowLevelILFlagCondition.LLFC_UGE: ['c'],
+        LowLevelILFlagCondition.LLFC_UGT: ['c'],
+        LowLevelILFlagCondition.LLFC_ULT: ['c'],
+        LowLevelILFlagCondition.LLFC_ULE: ['c'],
+        LowLevelILFlagCondition.LLFC_SGE: ['n', 'v'],
+        LowLevelILFlagCondition.LLFC_SLT: ['n', 'v'],
+        LowLevelILFlagCondition.LLFC_E: ['z'],
+        LowLevelILFlagCondition.LLFC_NE: ['z'],
+        LowLevelILFlagCondition.LLFC_NEG: ['n'],
+        LowLevelILFlagCondition.LLFC_POS: ['n']
     }
 
     def get_instruction_info(self, data, addr):