modify array handling for multi-dimensional arrays

Signed-off-by: Paul <[email protected]>

src/dwarf_to_c.py

@@ -220,13 +220,11 @@ def get_type_ref(die, attr):
 
     elif die.tag == DW_TAG.array_type:
         subtype = get_type_ref(die, 'type')
-        count = None
+        counts = []
         for val in die.children:
             if val.tag == DW_TAG.subrange_type:
-                count = get_int(val, 'upper_bound')
-        if count is not None:
-            count += 1 # count is upper_bound + 1
-        typeref = array_ref(subtype, count) 
+                counts.append(get_int(val, 'upper_bound') + 1)
+        typeref = array_ref(subtype, counts)
 
     elif die.tag in [DW_TAG.subroutine_type, DW_TAG.subprogram]:
         inline = get_int(die, 'inline', 0)
@@ -282,8 +280,8 @@ def qualified_ref(ref, tag):
     # tag: DW_TAG.const_type, DW_TAG.volatile_type, DW_TAG.restrict_type
     return lambda x: ref(x) #Const(ref(x))
 
-def array_ref(ref, count=None):
-    return lambda x: c_ast.ArrayDecl(ref(x), dim=IntConst(count))
+def array_ref(ref, counts=[]):
+    return lambda x: c_ast.ArrayDecl(ref(x), dim=[(lambda x : IntConst(x))(x) for x in counts])
 
 # Main conversion function
 def parse_dwarf(infile, cuname):

src/pycunparser/c_generator.py

@@ -348,7 +348,8 @@ def _generate_type(self, n, modifiers=[]):
                 if isinstance(modifier, c_ast.ArrayDecl):
                     if (i != 0 and isinstance(modifiers[i - 1], c_ast.PtrDecl)):
                         nstr = '(' + nstr + ')'
-                    nstr += '[' + self.visit(modifier.dim) + ']'
+                    for v in modifier.dim:
+                        nstr += '[' + self.visit(v) + ']'
                 elif isinstance(modifier, c_ast.FuncDecl):
                     if (i != 0 and isinstance(modifiers[i - 1], c_ast.PtrDecl)):
                         nstr = '(' + nstr + ')'