ARM: handle function pointer as function argument

Author: sipma

chb/app/CHVersion.py

@@ -1 +1 @@
-chbversion: str = "0.3.0-20250709"
+chbversion: str = "0.3.0-20250714

chb/app/FunctionsData.py

@@ -196,9 +196,26 @@ def is_unique_app_function_name(self, name: str) -> bool:
                 return False
         return False
 
+    def is_library_stub_name(self, name: str) -> bool:
+        if (name in self.functionnames
+            and len(self.functionnames[name]) == 1):
+            faddr = self.functionnames[name][0]
+            return faddr in self.library_stubs()
+        return False
+
+    def is_unique_function_name(self, name: str) -> bool:
+        return (
+            self.is_unique_app_function_name(name)
+            and len(self.functionnames[name]) == 1)
+
     def function_address_from_name(self, name: str) -> str:
-        if self.is_unique_app_function_name(name):
+        if name in self.functionnames and len(self.functionnames[name]) == 1:
             return self.functionnames[name][0]
+        elif name in self.functionnames:
+            raise UF.CHBError("Functionnames length: "
+                              + str(len(self.functionnames[name]))
+                              + ": "
+                              + ", ".join(self.functionnames[name]))
         else:
             raise UF.CHBError("No function found with name " + name)
 

chb/app/InstrXData.py

@@ -54,6 +54,7 @@
 if TYPE_CHECKING:
     from chb.api.CallTarget import CallTarget
     from chb.api.InterfaceDictionary import InterfaceDictionary
+    from chb.app.AppAccess import AppAccess
     from chb.app.Function import Function
     from chb.app.FunctionDictionary import FunctionDictionary
     from chb.invariants.FnVarDictionary import FnVarDictionary
@@ -94,6 +95,10 @@ def functiondictionary(self) -> "FunctionDictionary":
     def function(self) -> "Function":
         return self.functiondictionary.function
 
+    @property
+    def app(self) -> "AppAccess":
+        return self.function.app
+
     @property
     def bdictionary(self) -> "BDictionary":
         return self.function.bd

chb/arm/ARMOpcode.py

@@ -201,8 +201,12 @@ def get_instruction_c_condition(self) -> "XXpr":
     def add_instruction_condition(self, s: str) -> str:
         if self.xdata.has_unknown_instruction_condition():
             return "if ? then " + s
-        elif self.xdata.has_instruction_condition():
-            c = str(self.xdata.get_instruction_condition())
+        if self.has_valid_instruction_c_condition():
+            ccond = "(C: " + str(self.get_instruction_c_condition()) + ")"
+        else:
+            ccond = "(C: none)"
+        if self.xdata.has_instruction_condition():
+            c = str(self.xdata.get_instruction_condition()) + ccond
             return "if " + c + " then " + s
         else:
             return s

chb/arm/opcodes/ARMPop.py

@@ -224,24 +224,7 @@ def ast_condition_prov(
             reverse: bool
     ) -> Tuple[Optional[AST.ASTExpr], Optional[AST.ASTExpr]]:
 
-        ll_astcond = self.ast_cc_expr(astree)
-
-        if xdata.has_instruction_condition():
-            pcond = xdata.get_instruction_condition()
-            hl_astcond = XU.xxpr_to_ast_def_expr(pcond, xdata, iaddr, astree)
-
-            astree.add_expr_mapping(hl_astcond, ll_astcond)
-            astree.add_expr_reachingdefs(hl_astcond, xdata.reachingdefs)
-            astree.add_flag_expr_reachingdefs(ll_astcond, xdata.flag_reachingdefs)
-            astree.add_condition_address(ll_astcond, [iaddr])
-
-            return (hl_astcond, ll_astcond)
-
-        else:
-            chklogger.logger.error(
-                "No condition found at address %s", iaddr)
-            hl_astcond = astree.mk_temp_lval_expression()
-            return (hl_astcond, ll_astcond)
+        return self.ast_cc_condition_prov(astree, iaddr, bytestring, xdata)
 
     def ast_prov(
             self,

chb/ast/ASTSymbolTable.py

@@ -117,7 +117,10 @@ def __str__(self) -> str:
         lines.append("Variables:")
         lines.append("-" * 80)
         for vinfo in self.table.values():
-            lines.append(" - " + str(vinfo.vtype) + " " + vinfo.vname)
+            gaddr = (
+                " (" + hex(vinfo.globaladdress) + ")"
+                if vinfo.globaladdress is not None else "")
+            lines.append(" - " + str(vinfo.vtype) + " " + vinfo.vname + gaddr)
         return "\n".join(lines)
 
 

chb/cmdline/astcmds.py

@@ -255,6 +255,8 @@ def buildast(args: argparse.Namespace) -> NoReturn:
                 gaddr = int("0x" + vname[4:(index+4)], 16)
             else:
                 gaddr = int("0x" + vname[4:], 16)
+        elif app.functionsdata.is_unique_function_name(vname):
+            gaddr = int(app.functionsdata.function_address_from_name(vname), 16)
         elif vname.startswith("gv_"):
             if "_" in vname[3:]:
                 index = vname[3:].index("_")