X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tools%2Fprotoparse.h;h=0aa8ed885a40a84c733e098456135bf05e8b2000;hb=aa1aa2c24c3b224443702c556a5e1c50f6dc9d05;hp=7b6c7b0f246631b198e3d831471abcdbfddff9cc;hpb=840257f63a876b6c74176a460cc96bab844e6a19;p=ia32rtools.git

diff --git a/tools/protoparse.h b/tools/protoparse.h
index 7b6c7b0..0aa8ed8 100644
--- a/tools/protoparse.h
+++ b/tools/protoparse.h
@@ -27,9 +27,11 @@ 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;
+	unsigned int is_unresolved:1;
 	unsigned int has_structarg:1;
 };
 
@@ -46,6 +48,8 @@ static int do_protostrs(FILE *fhdr, const char *fname)
 	const char *finc_name;
 	const char *hdrfn_saved;
 	char protostr[256];
+	char path[256];
+	char fname_inc[256];
 	FILE *finc;
 	int line = 0;
 	int ret;
@@ -63,10 +67,19 @@ static int do_protostrs(FILE *fhdr, const char *fname)
 			if (p != NULL)
 				*p = 0;
 
-			finc = fopen(finc_name, "r");
+			path[0] = 0;
+			p = strrchr(hdrfn_saved, '/');
+			if (p) {
+				memcpy(path, hdrfn_saved,
+					p - hdrfn_saved + 1);
+				path[p - hdrfn_saved + 1] = 0;
+			}
+			snprintf(fname_inc, sizeof(fname_inc), "%s%s", 
+				path, finc_name);
+			finc = fopen(fname_inc, "r");
 			if (finc == NULL) {
 				printf("%s:%d: can't open '%s'\n",
-					fname, line, finc_name);
+					fname_inc, line, finc_name);
 				continue;
 			}
 			ret = do_protostrs(finc, finc_name);
@@ -128,6 +141,7 @@ static const char *known_type_mod[] = {
 };
 
 static const char *known_ptr_types[] = {
+	"FARPROC",
 	"HACCEL",
 	"HANDLE",
 	"HBITMAP",
@@ -136,18 +150,27 @@ static const char *known_ptr_types[] = {
 	"HFONT",
 	"HGDIOBJ",
 	"HGLOBAL",
+	"HICON",
 	"HINSTANCE",
+	//"HIMC", // DWORD
 	"HMODULE",
+	"HPALETTE",
 	"HRGN",
 	"HRSRC",
 	"HKEY",
 	"HMENU",
 	"HWND",
-	"PLONG",
+	"PCRITICAL_SECTION",
 	"PDWORD",
+	"PHKEY",
+	"PLONG",
+	"PMEMORY_BASIC_INFORMATION",
+	"PUINT",
 	"PVOID",
 	"PCVOID",
 	"DLGPROC",
+	"TIMERPROC",
+	"WNDENUMPROC",
 	"va_list",
 	"__VALIST",
 };
@@ -233,6 +256,9 @@ static int check_type(const char *name, struct parsed_type *type)
 
 	ret = n1 - name;
 	type->name = strndup(name, ret);
+	if (IS(type->name, "VOID"))
+		memcpy(type->name, "void", 4);
+
 	return ret;
 }
 
@@ -306,6 +332,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);
@@ -342,8 +373,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"))
@@ -529,11 +562,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++) {
@@ -543,6 +571,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;
 }
 
@@ -580,8 +625,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);
@@ -589,9 +636,11 @@ 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)
+static const struct parsed_proto *proto_parse(FILE *fhdr, const char *sym,
+	int quiet)
 {
 	const struct parsed_proto *pp_ret;
 	struct parsed_proto pp_search;
@@ -605,7 +654,7 @@ static const struct parsed_proto *proto_parse(FILE *fhdr, const char *sym)
 	strcpy(pp_search.name, sym);
 	pp_ret = bsearch(&pp_search, pp_cache, pp_cache_size,
 			sizeof(pp_cache[0]), pp_name_cmp);
-	if (pp_ret == NULL)
+	if (pp_ret == NULL && !quiet)
 		printf("%s: sym '%s' is missing\n", hdrfn, sym);
 
 	return pp_ret;
@@ -649,6 +698,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;