support for conditional return instruction

Author: sipma

chb/arm/ARMInstruction.py

@@ -171,6 +171,10 @@ def is_store_instruction(self) -> bool:
     def is_return_instruction(self) -> bool:
         return self.opcode.is_return_instruction(self.xdata)
 
+    @property
+    def is_conditional_return_instruction(self) -> bool:
+        return self.opcode.is_conditional_return_instruction(self.xdata)
+
     @property
     def is_nop_instruction(self) -> bool:
         return self.opcode.is_nop_instruction(self.xdata)

chb/arm/ARMOpcode.py

@@ -522,6 +522,9 @@ def is_branch_instruction(self) -> bool:
     def is_return_instruction(self, xdata: InstrXData) -> bool:
         return False
 
+    def is_conditional_return_instruction(self, xdata: InstrXData) -> bool:
+        return False
+
     def return_value(self, xdata: InstrXData) -> Optional[XXpr]:
         return None
 

chb/arm/opcodes/ARMLoadRegisterSignedByte.py

@@ -126,6 +126,10 @@ def __init__(self, d: "ARMDictionary", ixval: IndexedTableValue) -> None:
     def operands(self) -> List[ARMOperand]:
         return [self.armd.arm_operand(self.args[i]) for i in [0, 3]]
 
+    @property
+    def opargs(self) -> List[ARMOperand]:
+        return [self.armd.arm_operand(self.args[i]) for i in [0, 1, 2, 3]]
+
     def is_load_instruction(self, xdata: InstrXData) -> bool:
         return True
 

chb/arm/opcodes/ARMLoadRegisterSignedHalfword.py

@@ -183,6 +183,7 @@ def ast_prov(
                 rhs, xdata, iaddr, astree, memaddr=xaddr, size=2)
 
         elif xd.is_xrmem_unknown and xd.is_address_known:
+            lhs = xd.vrt
             xaddr = xd.xaddr
             hl_lhs = XU.xvariable_to_ast_lval(lhs, xdata, iaddr, astree)
             hl_rhs = XU.xmemory_dereference_lval_expr(

chb/arm/opcodes/ARMMove.py

@@ -90,6 +90,18 @@ def cresult(self) -> "XXpr":
     def is_cresult_ok(self) -> bool:
         return self.is_cxpr_ok(0)
 
+    def has_instruction_condition(self) -> bool:
+        return self.xdata.has_instruction_condition()
+
+    def get_instruction_condition(self) -> "XXpr":
+        return self.xdata.get_instruction_condition()
+
+    def has_valid_instruction_c_condition(self) -> bool:
+        return self.xdata.has_valid_instruction_c_condition()
+
+    def get_instruction_c_condition(self) -> "XXpr":
+        return self.xdata.get_instruction_c_condition()
+
     @property
     def annotation(self) -> str:
         if self.xdata.instruction_is_subsumed():

chb/arm/opcodes/ARMPop.py

@@ -196,6 +196,11 @@ def operandstring(self) -> str:
     def is_return_instruction(self, xdata: InstrXData) -> bool:
         return ARMPopXData(xdata).has_return_xpr()
 
+    def is_conditional_return_instruction(self, xdata: InstrXData) -> bool:
+        if self.is_return_instruction(xdata):
+            return xdata.has_instruction_condition()
+        return False
+
     def return_value(self, xdata: InstrXData) -> Optional[XXpr]:
         xd = ARMPopXData(xdata)
         if xd.has_return_xpr():
@@ -222,10 +227,13 @@ def ast_condition_prov(
         ll_astcond = self.ast_cc_expr(astree)
 
         if xdata.has_instruction_condition():
+            pcond = xdata.get_instruction_condition()
+            '''
             if reverse:
                 pcond = xdata.xprs[(2 * len(xdata.vars)) + 3]
             else:
                 pcond = xdata.xprs[(2 * len(xdata.vars)) + 2]
+            '''
             hl_astcond = XU.xxpr_to_ast_def_expr(pcond, xdata, iaddr, astree)
 
             astree.add_expr_mapping(hl_astcond, ll_astcond)

chb/arm/opcodes/opcodes_covered.json

@@ -815,7 +815,8 @@
 		    {
 			"T": "A1",
 			"E": "<cc><6>PUDW1<rn><vd><11><-imm7>1",
-			"D": "Y"
+			"D": "Y",
+			"U": ["210b90ec"]
 		    },
 		    {
 			"T": "A2",
@@ -843,7 +844,8 @@
 		    {
 			"T": "A1",
 			"E": "<cc><6>01D00<rn><vd><11><-imm7>1",
-			"D": "Y"
+			"D": "Y",
+			"U": ["210b80ec"]
 		    },
 		    {
 			"T": "A1-wb",
@@ -895,7 +897,10 @@
 			"U": ["02a1f0ec"]
 		    },
 		    {
-			"T": "A2"
+			"T": "A2",
+			"E": "<15><6>PUDW1<rn><cd><cp><-imm8->",
+			"D": "Y",
+			"U": ["0181b0fc"]
 		    },
 		    {
 			"T": "T1",
@@ -2662,7 +2667,9 @@
 		"all": [
 		    {
 			"T": "A2",
-			"E": "<15>110PU0W0<rn><cd><cp><-imm8->"
+			"E": "<15>110PU0W0<rn><cd><cp><-imm8->",
+			"D": "Y",
+			"U": ["0181a0fc"]
 		    },
 		    {
 			"T": "T2",
@@ -2692,7 +2699,9 @@
 		"all": [
 		    {
 			"T": "A1",
-			"E": "<cc>110PU1W0<rn><cd><cp><-imm8->"
+			"E": "<cc>110PU1W0<rn><cd><cp><-imm8->",
+			"D": "Y",
+			"U": ["0201e0ec"]
 		    },
 		    {
 			"T": "T1",

chb/astinterface/ASTInterfaceBasicBlock.py

@@ -119,6 +119,10 @@ def trampoline_block_instructions(
     def has_return(self) -> bool:
         return self.basicblock.has_return
 
+    @property
+    def has_conditional_return(self) -> bool:
+        return self.basicblock.has_conditional_return
+
     @property
     def last_instruction(self) -> ASTInterfaceInstruction:
         bb_lastinstr = self.basicblock.last_instruction