ARM:AST: update some instructions

Author: sipma

chb/arm/opcodes/ARMAdr.py

@@ -4,7 +4,7 @@
 # ------------------------------------------------------------------------------
 # The MIT License (MIT)
 #
-# Copyright (c) 2021-2023 Aarno Labs LLC
+# Copyright (c) 2021-2024 Aarno Labs LLC
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -102,10 +102,7 @@ def ast_prov(
 
         annotations: List[str] = [iaddr, "ADR"]
 
-        lhs = xdata.vars[0]
-        rhs = xdata.xprs[0]
-        defuses = xdata.defuses
-        defuseshigh = xdata.defuseshigh
+        # low-level assignment
 
         (ll_lhs, _, _) = self.operands[0].ast_lvalue(astree)
         (ll_rhs, _, _) = self.operands[1].ast_rvalue(astree)
@@ -117,27 +114,15 @@ def ast_prov(
             bytestring=bytestring,
             annotations=annotations)
 
-        lhsasts = XU.xvariable_to_ast_lvals(lhs, xdata, astree)
-        if len(lhsasts) == 0:
-            raise UF.CHBError("Adr: no lval found")
-
-        if len(lhsasts) > 1:
-            raise UF.CHBError(
-                "Adr: multiple lvals found: "
-                + ", ".join(str(v) for v in lhsasts))
-
-        hl_lhs = lhsasts[0]
+        # high-level assignment
 
-        rhsasts = XU.xxpr_to_ast_exprs(rhs, xdata, iaddr, astree)
-        if len(rhsasts) == 0:
-            raise UF.CHBError("Adr: no rhs value found")
-
-        if len(rhsasts) > 1:
-            raise UF.CHBError(
-                "Adr: multiple rhs values found: "
-                + ", ".join(str(v) for v in rhsasts))
+        lhs = xdata.vars[0]
+        rhs = xdata.xprs[0]
+        defuses = xdata.defuses
+        defuseshigh = xdata.defuseshigh
 
-        hl_rhs = rhsasts[0]
+        hl_lhs = XU.xvariable_to_ast_lval(lhs, xdata, iaddr, astree, rhs=rhs)
+        hl_rhs = XU.xxpr_to_ast_def_expr(rhs, xdata, iaddr, astree)
 
         hl_assign = astree.mk_assign(
             hl_lhs,
@@ -146,7 +131,6 @@ def ast_prov(
             bytestring=bytestring,
             annotations=annotations)
 
-        astree.add_reg_definition(iaddr, hl_lhs, hl_rhs)
         astree.add_instr_mapping(hl_assign, ll_assign)
         astree.add_instr_address(hl_assign, [iaddr])
         astree.add_expr_mapping(hl_rhs, ll_rhs)

chb/arm/opcodes/ARMLoadRegisterByte.py

@@ -174,18 +174,14 @@ def ast_prov(
 
         lhs = xdata.vars[0]
         rhs = xdata.xprs[3]
+        xaddr = xdata.xprs[4]
         rdefs = xdata.reachingdefs
         defuses = xdata.defuses
         defuseshigh = xdata.defuseshigh
 
         hl_lhs = XU.xvariable_to_ast_lval(lhs, xdata, iaddr, astree)
-
-        if rhs.is_tmp_variable or rhs.has_unknown_memory_base():
-            xaddr = xdata.xprs[4]
-            hl_rhs = XU.xmemory_dereference_to_ast_def_expr(
-                xaddr, xdata, iaddr, astree)
-        else:
-            hl_rhs = XU.xxpr_to_ast_def_expr(rhs, xdata, iaddr, astree, size=1)
+        hl_rhs = XU.xxpr_to_ast_def_expr(
+            rhs, xdata, iaddr, astree, size=1, memaddr=xaddr)
 
         hl_assign = astree.mk_assign(
             hl_lhs,

chb/arm/opcodes/ARMMove.py

@@ -99,6 +99,9 @@ def operandstring(self) -> str:
         return ", ".join(str(op) for op in self.operands)
 
     def annotation(self, xdata: InstrXData) -> str:
+        if xdata.is_nop:
+            return "NOP"
+
         lhs = str(xdata.vars[0])
         rhs = str(xdata.xprs[1])
         assignment = lhs + " := " + rhs
@@ -149,11 +152,21 @@ def ast_prov(
             xdata: InstrXData) -> Tuple[
                 List[AST.ASTInstruction], List[AST.ASTInstruction]]:
 
+        annotations: List[str] = [iaddr, "MOV"]
+
+        if xdata.is_nop:
+            nopinstr = astree.mk_nop_instruction(
+                "MOV:NOP",
+                iaddr=iaddr,
+                bytestring=bytestring,
+                annotations=annotations)
+            astree.add_instr_address(nopinstr, [iaddr])
+
+            return ([], [nopinstr])
+
         if xdata.instruction_is_subsumed():
             return self.ast_prov_subsumed(astree, iaddr, bytestring, xdata)
 
-        annotations: List[str] = [iaddr, "MOV"]
-
         # low-level assignment
 
         (ll_lhs, _, _) = self.opargs[0].ast_lvalue(astree)

chb/arm/opcodes/ARMNoOperation.py

@@ -4,7 +4,7 @@
 # ------------------------------------------------------------------------------
 # The MIT License (MIT)
 #
-# Copyright (c) 2021-2023  Aarno Labs LLC
+# Copyright (c) 2021-2024  Aarno Labs LLC
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal