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;
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"))
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++) {
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;
}
static void build_pp_cache(FILE *fhdr)
{
+ long pos;
int ret;
+ pos = ftell(fhdr);
rewind(fhdr);
ret = do_protostrs(fhdr, hdrfn);
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,
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;