yet more stuff for storm

[ia32rtools.git] / tools / protoparse.h

diff --git a/tools/protoparse.h b/tools/protoparse.h
index be1dca9..9a126cc 100644 (file)
--- a/tools/protoparse.h
+++ b/tools/protoparse.h
@@ -28,10 +28,11 @@ struct parsed_proto {
        unsigned int is_func:1;
        unsigned int is_stdcall:1;
        unsigned int is_fastcall:1;
-       unsigned int is_vararg:1;
+       unsigned int is_vararg:1;     // vararg func
        unsigned int is_fptr:1;
        unsigned int is_noreturn:1;
        unsigned int is_unresolved:1;
+       unsigned int is_arg:1;        // decl in func arg
        unsigned int has_structarg:1;
 };
 
@@ -138,10 +139,12 @@ static const char *known_type_mod[] = {
        "struct",
        "enum",
        "CONST",
+       "volatile",
 };
 
 static const char *known_ptr_types[] = {
        "FARPROC",
+       "WNDPROC",
        "HACCEL",
        "HANDLE",
        "HBITMAP",
@@ -160,14 +163,17 @@ static const char *known_ptr_types[] = {
        "HKEY",
        "HMENU",
        "HWND",
+       "PBYTE",
        "PCRITICAL_SECTION",
        "PDWORD",
+       "PFILETIME",
        "PHKEY",
        "PLONG",
        "PMEMORY_BASIC_INFORMATION",
        "PUINT",
        "PVOID",
        "PCVOID",
+       "PWORD",
        "DLGPROC",
        "TIMERPROC",
        "WNDENUMPROC",
@@ -507,6 +513,10 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
                                        hdrfn, hdrfline, p1 - protostr);
                                return -1;
                        }
+                       arg->fptr->is_arg = 1;
+                       // we don't use actual names right now..
+                       snprintf(arg->fptr->name,
+                               sizeof(arg->fptr->name), "a%d", xarg);
                        // we'll treat it as void * for non-calls
                        arg->type.name = strdup("void *");
                        arg->type.is_ptr = 1;
@@ -533,6 +543,16 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
                        arg->reg = strdup(map_reg(regparm));
                }
 
+               if (strstr(arg->type.name, "int64")
+                   || IS(arg->type.name, "double"))
+               {
+                       // hack..
+                       free(arg->type.name);
+                       arg->type.name = strdup("int");
+                       pp_copy_arg(&pp->arg[xarg], arg);
+                       xarg++;
+               }
+
                ret = check_struct_arg(arg);
                if (ret > 0) {
                        pp->has_structarg = 1;
@@ -698,6 +718,28 @@ struct parsed_proto *proto_clone(const struct parsed_proto *pp_c)
        return pp;
 }
 
+static inline void pp_print(char *buf, size_t buf_size,
+  const struct parsed_proto *pp)
+{
+  size_t l;
+  int i;
+
+  snprintf(buf, buf_size, "%s %s(", pp->ret_type.name, pp->name);
+  l = strlen(buf);
+
+  for (i = 0; i < pp->argc_reg; i++) {
+    snprintf(buf + l, buf_size - l, "%s%s",
+      i == 0 ? "" : ", ", pp->arg[i].reg);
+    l = strlen(buf);
+  }
+  if (pp->argc_stack > 0) {
+    snprintf(buf + l, buf_size - l, "%s{%d stack}",
+      i == 0 ? "" : ", ", pp->argc_stack);
+    l = strlen(buf);
+  }
+  snprintf(buf + l, buf_size - l, ")");
+}
+
 static inline void proto_release(struct parsed_proto *pp)
 {
        int i;