ARM: some support for rotate operand

Author: sipma

chb/ast/ASTCPrettyPrinter.py

@@ -501,7 +501,7 @@ def visit_memref(self, memref: AST.ASTMemRef) -> None:
             memexpb = cast(AST.ASTBinaryOp, memref.memexp)
             exp1 = memexpb.exp1
             exp2 = memexpb.exp2
-            if exp1.is_ast_lval_expr:
+            if exp1.is_ast_lval_expr and memexpb.op == "plus":
                 exp1.accept(self)
                 self.ccode.write("[")
                 exp2.accept(self)

chb/invariants/XXpr.py

@@ -1040,12 +1040,25 @@ def __str__(self) -> str:
             else:
                 return "(" + self.operator + " " + str(args[0]) + ")"
         elif len(args) == 2:
-            return (
-                '('
-                + str(args[0])
-                + xpr_operator_strings[self.operator]
-                + str(args[1])
-                + ')')
+            if self.operator in xpr_operator_strings:
+                return (
+                    '('
+                    + str(args[0])
+                    + xpr_operator_strings[self.operator]
+                    + str(args[1])
+                    + ')')
+            elif self.operator == "xf_ror":
+                return "(" + str(args[0]) + " rotate-right " + str(args[1]) + ")"
+            else:
+                return (
+                    "("
+                    + str(args[0])
+                    + " "
+                    + self.operator
+                    + " "
+                    + str(args[1])
+                    + ")")
+
         else:
             return (
                 '('