ASTI: replace array type by base type for one-element stack arrays

Author: sipma

chb/astinterface/ASTInterface.py

@@ -934,6 +934,10 @@ def introduce_ssa_variables(
 
         Record addresses associated with a given variable to avoid assigning
         constants to variables that appear multiple times.
+
+        The ssanames, a map from locations to names, provide an alternative
+        prefix for the newly introduced name. The default name is ssa_<reg>,
+        where <reg> is the name of the register being assigned.
         """
 
         for (reg, locs) in rdeflocs.items():
@@ -980,7 +984,9 @@ def introduce_stack_variables(
                         tgttypsize = tgttyp.index(self.bytesize_calculator)
                         if tgttypsize > 0:
                             arraysize = size // tgttypsize
-                            if arraysize > 0:
+                            if arraysize == 1:
+                                vtype = tgttyp
+                            if arraysize > 1:
                                 vtype = self.astree.mk_int_sized_array_type(
                                     tgttyp, arraysize)
                             else:
@@ -989,8 +995,7 @@ def introduce_stack_variables(
                                     + "%s does not fit in stack frame; "
                                     + "adjusting stack buffer to size %d",
                                     str(offset), tgttypsize)
-                                vtype = self.astree.mk_int_sized_array_type(
-                                    tgttyp, 1)
+                                vtype = tgttyp
 
             self.mk_stack_variable_lval(offset, vtype=vtype)
 
@@ -1080,6 +1085,17 @@ def mk_stack_variable_lval(
         if varinfo.vtype is None:
             return lval
 
+        if varinfo.vtype.is_compound:
+            structtyp = cast(AST.ASTTypComp, varinfo.vtype)
+            ckey = structtyp.compkey
+            compinfo = self.globalsymboltable.compinfo(ckey)
+            for (cfoff, fname) in sorted(compinfo.field_offsets.items()):
+                fieldoffset = self.mk_field_offset(fname, ckey)
+                fieldlval = self.astree.mk_vinfo_lval(
+                    varinfo, offset=fieldoffset)
+                self.stack_variables[offset + cfoff] = fieldlval
+            return lval
+
         if varinfo.vtype.is_array:
             arraytyp = cast(AST.ASTTypArray, varinfo.vtype)
             eltyp = arraytyp.tgttyp

chb/astinterface/ASTInterfaceFunction.py

@@ -204,6 +204,11 @@ def mk_high_level_ast(
                 + self.address
                 + "):\n  "
                 + str(e))
+            chklogger.logger.error(
+                "Unable to create high-level ast for %s (%s): %s",
+                self.name,
+                self.address,
+                str(e))
             raise UF.CHBError(msg)
 
         self.complete_instruction_connections()