std types for defs.h, support for multi-dim array & related bug fix

Author: pdreiter

genprog_decomp_ida.py

@@ -652,7 +652,7 @@ def get_data_declarations(self, lines):
             array_size=len(re.findall("\[\d*\]",dataName))
             print("Array Size:", array_size)
             defLine=""
-            if array_size==2:
+            if array_size>=2:
                 print("// --- WARNING! Two-dimensional array objects are not yet supported")
                 defLine += "%s *(p%s);\n" %(dataType, dataName)
                 dataName = dataName.split("[")[0] # handle arrays
@@ -885,12 +885,11 @@ def generate_wrapper(self, target, funcs, stubMap, dataMap):
             dataDef = dataDef.split("=")[0].strip()
             dataType, dataName = self.getTypeAndLabel(dataDef)
             array_size=len(re.findall("\[\d*\]",dataName))
-            if array_size==2:
+            if array_size>=2:
                 print("SORRY: two-dimensional array objects just aren't working right now")
                 print(" ==> "+dataType+" "+dataName)
                 wrapperStub += "// --- WARNING! Two-dimensional array objects are not yet supported"
                 wrapperStub += "\tvoid* my%s,\n" % dataName
-                wrapperStub += " // --- END OF WARNING!\n"
             elif array_size==1 and "*" not in dataType:
                 dataNamex = dataName.split("[")[0] # handle arrays
                 wrapperStub += "\tvoid* my%s,\n" % dataNamex
@@ -925,7 +924,7 @@ def generate_wrapper(self, target, funcs, stubMap, dataMap):
             dataDef = dataDef.split("=")[0].strip()
             dataType, dataName = self.getTypeAndLabel(dataDef)
             array_size=len(re.findall("\[\d*\]",dataName))
-            if array_size==2:
+            if array_size>=2:
                 print("// --- WARNING! Two-dimensional array objects are not yet supported\n")
                 wrapperStub += "\tp%s = (%s*) my%s;\n" % (dataName, dataType, dataName)
                 print(" // --- END OF WARNING!\n")

refs/defs.h

@@ -4,4 +4,10 @@
 #define LODWORD(x) (*((unsigned int*)&(x)))
 #define HIWORD(x) (*((unsigned short*)&(x)+1))
 #define LOWORD(x) (*((unsigned short*)&(x)))
-#define COERCE_UNSIGNED_INT64(x) (*((unsigned long*)(&x)))
+#define COERCE_UNSIGNED_INT64(x) (*((unsigned long*)(&x)))
+#define HIBYTE(x) (*((unsigned char*)&(x)+1))
+
+
+// from IDADOC support: _OWORD is an unknown type; the only known info is its size: 16 bytes
+#define _OWORD (unsigned long long)
+