int64/double hack

[ia32rtools.git] / tools / protoparse.h

diff --git a/tools/protoparse.h b/tools/protoparse.h
index 46c2005..ab16632 100644 (file)
--- a/tools/protoparse.h
+++ b/tools/protoparse.h
@@ -27,6 +27,7 @@ struct parsed_proto {
        int argc_reg;
        unsigned int is_func:1;
        unsigned int is_stdcall:1;
+       unsigned int is_fastcall:1;
        unsigned int is_vararg:1;
        unsigned int is_fptr:1;
        unsigned int is_noreturn:1;
@@ -137,9 +138,12 @@ static const char *known_type_mod[] = {
        "struct",
        "enum",
        "CONST",
+       "volatile",
 };
 
 static const char *known_ptr_types[] = {
+       "FARPROC",
+       "WNDPROC",
        "HACCEL",
        "HANDLE",
        "HBITMAP",
@@ -148,9 +152,11 @@ static const char *known_ptr_types[] = {
        "HFONT",
        "HGDIOBJ",
        "HGLOBAL",
+       "HICON",
        "HINSTANCE",
-       "HIMC",
+       //"HIMC", // DWORD
        "HMODULE",
+       "HPALETTE",
        "HRGN",
        "HRSRC",
        "HKEY",
@@ -158,6 +164,7 @@ static const char *known_ptr_types[] = {
        "HWND",
        "PCRITICAL_SECTION",
        "PDWORD",
+       "PFILETIME",
        "PHKEY",
        "PLONG",
        "PMEMORY_BASIC_INFORMATION",
@@ -313,10 +320,6 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
                pp->is_noreturn = 1;
                p = sskip(p + 18);
        }
-       else if (!strncmp(p, "noreturn ", 9)) {
-               pp->is_noreturn = 1;
-               p = sskip(p + 9);
-       }
 
        for (i = 0; i < ARRAY_SIZE(ignored_keywords); i++) {
                l = strlen(ignored_keywords[i]);
@@ -332,6 +335,11 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
        }
        p = sskip(p + ret);
 
+       if (!strncmp(p, "noreturn ", 9)) {
+               pp->is_noreturn = 1;
+               p = sskip(p + 9);
+       }
+
        if (!strchr(p, ')')) {
                p = next_idt(buf, sizeof(buf), p);
                p = sskip(p);
@@ -368,8 +376,10 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
                pp->is_stdcall = 0;
        else if (IS(cconv, "__stdcall"))
                pp->is_stdcall = 1;
-       else if (IS(cconv, "__fastcall"))
-               pp->is_stdcall = 1;
+       else if (IS(cconv, "__fastcall")) {
+               pp->is_fastcall = 1;
+               pp->is_stdcall = 1; // sort of..
+       }
        else if (IS(cconv, "__thiscall"))
                pp->is_stdcall = 1;
        else if (IS(cconv, "__userpurge"))
@@ -526,6 +536,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;
@@ -555,11 +575,6 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
                pp->arg[1].reg = strdup("edx");
        }
 
-       if (pp->is_vararg && pp->is_stdcall) {
-               printf("%s:%d: vararg stdcall?\n", hdrfn, hdrfline);
-               return -1;
-       }
-
        pp->argc = xarg;
 
        for (i = 0; i < pp->argc; i++) {
@@ -569,6 +584,23 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
                        pp->argc_reg++;
        }
 
+       if (pp->argc == 1 && pp->arg[0].reg != NULL
+           && IS(pp->arg[0].reg, "ecx"))
+       {
+               pp->is_fastcall = 1;
+       }
+       else if (pp->argc_reg == 2
+         && pp->arg[0].reg != NULL && IS(pp->arg[0].reg, "ecx")
+         && pp->arg[1].reg != NULL && IS(pp->arg[1].reg, "edx"))
+       {
+               pp->is_fastcall = 1;
+       }
+
+       if (pp->is_vararg && (pp->is_stdcall || pp->is_fastcall)) {
+               printf("%s:%d: vararg %s?\n", hdrfn, hdrfline, cconv);
+               return -1;
+       }
+
        return p - protostr;
 }
 
@@ -606,8 +638,10 @@ static int b_pp_c_handler(char *proto, const char *fname)
 
 static void build_pp_cache(FILE *fhdr)
 {
+       long pos;
        int ret;
 
+       pos = ftell(fhdr);
        rewind(fhdr);
 
        ret = do_protostrs(fhdr, hdrfn);
@@ -615,6 +649,7 @@ static void build_pp_cache(FILE *fhdr)
                exit(1);
 
        qsort(pp_cache, pp_cache_size, sizeof(pp_cache[0]), pp_name_cmp);
+       fseek(fhdr, pos, SEEK_SET);
 }
 
 static const struct parsed_proto *proto_parse(FILE *fhdr, const char *sym,
@@ -676,6 +711,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;