X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tools%2Fprotoparse.h;h=39bbd2c6921ffeab58ef4d57cd6cc075a35af72b;hb=e56ab892c4ff9eef34f85fab010d7084b9c59e81;hp=4a1b0a0ce0ac57b48c19ec2b6c7681517d91724b;hpb=7ba45c344765db59116cae21972f2ea5facf3815;p=ia32rtools.git

diff --git a/tools/protoparse.h b/tools/protoparse.h
index 4a1b0a0..39bbd2c 100644
--- a/tools/protoparse.h
+++ b/tools/protoparse.h
@@ -1,16 +1,25 @@
 
 struct parsed_proto;
 
+struct parsed_type {
+	char *name;
+	unsigned int is_array:1;
+	unsigned int is_ptr:1;
+};
+
 struct parsed_proto_arg {
 	char *reg;
-	char *type;
+	struct parsed_type type;
 	struct parsed_proto *fptr;
 	void *datap;
 };
 
 struct parsed_proto {
 	char name[256];
-	char *ret_type;
+	union {
+		struct parsed_type ret_type;
+		struct parsed_type type;
+	};
 	struct parsed_proto_arg arg[16];
 	int argc;
 	int argc_stack;
@@ -19,7 +28,7 @@ struct parsed_proto {
 	unsigned int is_stdcall:1;
 	unsigned int is_vararg:1;
 	unsigned int is_fptr:1;
-	unsigned int is_array:1;
+	unsigned int is_noreturn:1;
 };
 
 static const char *hdrfn;
@@ -108,37 +117,44 @@ static const char *known_type_mod[] = {
 	"const",
 	"signed",
 	"unsigned",
+	"struct",
+	"enum",
 };
 
-static const char *known_types[] = {
-	"void *",
-	"char *",
-	"FILE *",
-	"int *",
-	"__int8 *",
-	"__int16 *",
-	"char",
-	"__int8",
-	"__int16",
-	"__int32",
-	"int",
-	"bool",
-	"void",
-	"BYTE",
-	"WORD",
-	"BOOL",
-	"DWORD",
-	"_DWORD",
-	"HMODULE",
+static const char *known_ptr_types[] = {
+	"HACCEL",
 	"HANDLE",
+	"HBITMAP",
+	"HCURSOR",
+	"HDC",
+	"HGDIOBJ",
+	"HGLOBAL",
+	"HINSTANCE",
+	"HMODULE",
+	"HRGN",
+	"HRSRC",
+	"HKEY",
+	"HMENU",
 	"HWND",
-	"LANGID",
-	"LPCSTR",
-	"size_t",
+	"PLONG",
+	"PDWORD",
+	"PVOID",
+	"PCVOID",
+	"DLGPROC",
+	"va_list",
+	"__VALIST",
+};
+
+static const char *ignored_keywords[] = {
+	"extern",
+	"WINBASEAPI",
+	"WINUSERAPI",
+	"WINGDIAPI",
+	"WINADVAPI",
 };
 
 // returns ptr to char after type ends
-static const char *typecmp(const char *n, const char *t)
+static int typecmp(const char *n, const char *t)
 {
 	for (; *t != 0; n++, t++) {
 		while (n[0] == ' ' && (n[1] == ' ' || n[1] == '*'))
@@ -146,20 +162,17 @@ static const char *typecmp(const char *n, const char *t)
 		while (t[0] == ' ' && (t[1] == ' ' || t[1] == '*'))
 			t++;
 		if (*n != *t)
-			return NULL;
+			return *n - *t;
 	}
 
-	return n;
+	return 0;
 }
 
-static char *check_type(const char *name, int *len_out)
+static const char *skip_type_mod(const char *n)
 {
-	const char *n = name, *n1;
 	int len;
 	int i;
 
-	*len_out = 0;
-
 	for (i = 0; i < ARRAY_SIZE(known_type_mod); i++) {
 		len = strlen(known_type_mod[i]);
 		if (strncmp(n, known_type_mod[i], len) != 0)
@@ -171,16 +184,47 @@ static char *check_type(const char *name, int *len_out)
 		i = 0;
 	}
 
-	for (i = 0; i < ARRAY_SIZE(known_types); i++) {
-		n1 = typecmp(n, known_types[i]);
-		if (n1 == NULL)
+	return n;
+}
+
+static int check_type(const char *name, struct parsed_type *type)
+{
+	const char *n, *n1;
+	int ret = -1;
+	int i;
+
+	n = skip_type_mod(name);
+
+	for (i = 0; i < ARRAY_SIZE(known_ptr_types); i++) {
+		if (typecmp(n, known_ptr_types[i]))
 			continue;
 
-		*len_out = n1 - name;
-		return strndup(name, *len_out);
+		type->is_ptr = 1;
+		break;
+	}
+
+	if (n[0] == 'L' && n[1] == 'P')
+		type->is_ptr = 1;
+
+	// assume single word
+	while (!my_isblank(*n) && !my_issep(*n))
+		n++;
+
+	while (1) {
+		n1 = n;
+		while (my_isblank(*n))
+			n++;
+		if (*n == '*') {
+			type->is_ptr = 1;
+			n++;
+			continue;
+		}
+		break;
 	}
 
-	return NULL;
+	ret = n1 - name;
+	type->name = strndup(name, ret);
+	return ret;
 }
 
 /* args are always expanded to 32bit */
@@ -208,11 +252,10 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
 	char regparm[16];
 	char buf[256];
 	char cconv[32];
-	char *kt;
 	int xarg = 0;
 	char *p, *p1;
+	int i, l;
 	int ret;
-	int i;
 
 	p = sskip(protostr);
 	if (p[0] == '/' && p[1] == '/') {
@@ -227,25 +270,30 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
 			p1[0] = p1[1] = ' ';
 	}
 
-	if (strncmp(p, "extern ", 7) == 0)
-		p = sskip(p + 7);
-	if (strncmp(p, "WINBASEAPI ", 11) == 0)
-		p = sskip(p + 11);
+	if (!strncmp(p, "DECLSPEC_NORETURN ", 18)) {
+		pp->is_noreturn = 1;
+		p = sskip(p + 18);
+	}
+
+	for (i = 0; i < ARRAY_SIZE(ignored_keywords); i++) {
+		l = strlen(ignored_keywords[i]);
+		if (!strncmp(p, ignored_keywords[i], l) && my_isblank(p[l]))
+			p = sskip(p + l + 1);
+	}
 
-	kt = check_type(p, &ret);
-	if (kt == NULL) {
-		printf("%s:%d:%ld: unhandled return in '%s'\n",
+	ret = check_type(p, &pp->ret_type);
+	if (ret <= 0) {
+		printf("%s:%d:%zd: unhandled return in '%s'\n",
 			hdrfn, hdrfline, (p - protostr) + 1, protostr);
 		return -1;
 	}
-	pp->ret_type = kt;
 	p = sskip(p + ret);
 
 	if (!strchr(p, ')')) {
 		p = next_idt(buf, sizeof(buf), p);
 		p = sskip(p);
 		if (buf[0] == 0) {
-			printf("%s:%d:%ld: var name missing\n",
+			printf("%s:%d:%zd: var name missing\n",
 				hdrfn, hdrfline, (p - protostr) + 1);
 			return -1;
 		}
@@ -254,7 +302,7 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
 		p1 = strchr(p, ']');
 		if (p1 != NULL) {
 			p = p1 + 1;
-			pp->is_array = 1;
+			pp->ret_type.is_array = 1;
 		}
 		return p - protostr;
 	}
@@ -269,7 +317,7 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
 	p = next_word(cconv, sizeof(cconv), p);
 	p = sskip(p);
 	if (cconv[0] == 0) {
-		printf("%s:%d:%ld: cconv missing\n",
+		printf("%s:%d:%zd: cconv missing\n",
 			hdrfn, hdrfline, (p - protostr) + 1);
 		return -1;
 	}
@@ -288,14 +336,14 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
 	else if (IS(cconv, "WINAPI"))
 		pp->is_stdcall = 1;
 	else {
-		printf("%s:%d:%ld: unhandled cconv: '%s'\n",
+		printf("%s:%d:%zd: unhandled cconv: '%s'\n",
 			hdrfn, hdrfline, (p - protostr) + 1, cconv);
 		return -1;
 	}
 
 	if (pp->is_fptr) {
 		if (*p != '*') {
-			printf("%s:%d:%ld: '*' expected\n",
+			printf("%s:%d:%zd: '*' expected\n",
 				hdrfn, hdrfline, (p - protostr) + 1);
 			return -1;
 		}
@@ -305,7 +353,7 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
 	p = next_idt(buf, sizeof(buf), p);
 	p = sskip(p);
 	if (buf[0] == 0) {
-		printf("%s:%d:%ld: func name missing\n",
+		printf("%s:%d:%zd: func name missing\n",
 			hdrfn, hdrfline, (p - protostr) + 1);
 		return -1;
 	}
@@ -316,7 +364,7 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
 		if (!IS(regparm, "eax") && !IS(regparm, "ax")
 		 && !IS(regparm, "al"))
 		{
-			printf("%s:%d:%ld: bad regparm: %s\n",
+			printf("%s:%d:%zd: bad regparm: %s\n",
 				hdrfn, hdrfline, (p - protostr) + 1, regparm);
 			return -1;
 		}
@@ -326,7 +374,7 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
 
 	if (pp->is_fptr) {
 		if (*p != ')') {
-			printf("%s:%d:%ld: ')' expected\n",
+			printf("%s:%d:%zd: ')' expected\n",
 				hdrfn, hdrfline, (p - protostr) + 1);
 			return -1;
 		}
@@ -334,7 +382,7 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
 	}
 
 	if (*p != '(') {
-		printf("%s:%d:%ld: '(' expected, got '%c'\n",
+		printf("%s:%d:%zd: '(' expected, got '%c'\n",
 				hdrfn, hdrfline, (p - protostr) + 1, *p);
 		return -1;
 	}
@@ -362,7 +410,7 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
 				p++;
 				break;
 			}
-			printf("%s:%d:%ld: ')' expected\n",
+			printf("%s:%d:%zd: ')' expected\n",
 				hdrfn, hdrfline, (p - protostr) + 1);
 			return -1;
 		}
@@ -371,13 +419,12 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
 		xarg++;
 
 		p1 = p;
-		kt = check_type(p, &ret);
-		if (kt == NULL) {
-			printf("%s:%d:%ld: unhandled type for arg%d\n",
+		ret = check_type(p, &arg->type);
+		if (ret <= 0) {
+			printf("%s:%d:%zd: unhandled type for arg%d\n",
 				hdrfn, hdrfline, (p - protostr) + 1, xarg);
 			return -1;
 		}
-		arg->type = kt;
 		p = sskip(p + ret);
 
 		if (*p == '(') {
@@ -385,12 +432,13 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
 			arg->fptr = calloc(1, sizeof(*arg->fptr));
 			ret = parse_protostr(p1, arg->fptr);
 			if (ret < 0) {
-				printf("%s:%d:%ld: funcarg parse failed\n",
+				printf("%s:%d:%zd: funcarg parse failed\n",
 					hdrfn, hdrfline, p1 - protostr);
 				return -1;
 			}
 			// we'll treat it as void * for non-calls
-			arg->type = "void *";
+			arg->type.name = "void *";
+			arg->type.is_ptr = 1;
 
 			p = p1 + ret;
 		}
@@ -399,7 +447,7 @@ static int parse_protostr(char *protostr, struct parsed_proto *pp)
 		p = sskip(p);
 #if 0
 		if (buf[0] == 0) {
-			printf("%s:%d:%ld: idt missing for arg%d\n",
+			printf("%s:%d:%zd: idt missing for arg%d\n",
 				hdrfn, hdrfline, (p - protostr) + 1, xarg);
 			return -1;
 		}
@@ -471,11 +519,11 @@ static void proto_release(struct parsed_proto *pp)
 	for (i = 0; i < pp->argc; i++) {
 		if (pp->arg[i].reg != NULL)
 			free(pp->arg[i].reg);
-		if (pp->arg[i].type != NULL)
-			free(pp->arg[i].type);
+		if (pp->arg[i].type.name != NULL)
+			free(pp->arg[i].type.name);
 		if (pp->arg[i].fptr != NULL)
 			free(pp->arg[i].fptr);
 	}
-	if (pp->ret_type != NULL)
-		free(pp->ret_type);
+	if (pp->ret_type.name != NULL)
+		free(pp->ret_type.name);
 }