X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tools%2Fprotoparse.h;h=2647bba5093f65f97e21abf97879ee34be3ba653;hb=ebc4dc43be160d5774458512cfcd7f918aa89ffb;hp=27752cf946643bf2fef15ccc22cfbdbf2c08e4d6;hpb=179b79a987ed0f464f47f724032aff6c90bc50c0;p=ia32rtools.git

diff --git a/tools/protoparse.h b/tools/protoparse.h
index 27752cf..2647bba 100644
--- a/tools/protoparse.h
+++ b/tools/protoparse.h
@@ -13,7 +13,8 @@ struct parsed_type {
 	unsigned int is_array:1;
 	unsigned int is_ptr:1;
 	unsigned int is_struct:1; // split for args
-	unsigned int is_retreg:1; // register to return
+	unsigned int is_retreg:1; // register to return to caller
+	unsigned int is_va_list:1;
 };
 
 struct parsed_proto_arg {
@@ -41,7 +42,9 @@ struct parsed_proto {
 	unsigned int is_noreturn:1;
 	unsigned int is_unresolved:1;
 	unsigned int is_userstack:1;
-	unsigned int is_oslib:1;      // OS/system library func
+	unsigned int is_include:1;    // not from top-level header
+	unsigned int is_osinc:1;      // OS/system library func
+	unsigned int is_cinc:1;       // crt library func
 	unsigned int is_arg:1;        // declared in some func arg
 	unsigned int has_structarg:1;
 	unsigned int has_retreg:1;
@@ -53,16 +56,18 @@ static int hdrfline = 0;
 static void pp_copy_arg(struct parsed_proto_arg *d,
 	const struct parsed_proto_arg *s);
 
-static int b_pp_c_handler(char *proto, const char *fname, int is_oslib);
+static int b_pp_c_handler(char *proto, const char *fname,
+	int is_include, int is_osinc, int is_cinc);
 
-static int do_protostrs(FILE *fhdr, const char *fname)
+static int do_protostrs(FILE *fhdr, const char *fname, int is_include)
 {
 	const char *finc_name;
 	const char *hdrfn_saved;
 	char protostr[256];
 	char path[256];
 	char fname_inc[256];
-	int is_oslib;
+	int is_osinc;
+	int is_cinc;
 	FILE *finc;
 	int line = 0;
 	int ret;
@@ -71,8 +76,8 @@ static int do_protostrs(FILE *fhdr, const char *fname)
 	hdrfn_saved = hdrfn;
 	hdrfn = fname;
 
-	is_oslib = strstr(fname, "stdc.hlist")
-		 || strstr(fname, "win32.hlist");
+	is_cinc = strstr(fname, "stdc.hlist") != NULL;
+	is_osinc = is_cinc || strstr(fname, "stdc.hlist") != NULL;
 
 	while (fgets(protostr, sizeof(protostr), fhdr))
 	{
@@ -98,7 +103,7 @@ static int do_protostrs(FILE *fhdr, const char *fname)
 					fname_inc, line, finc_name);
 				continue;
 			}
-			ret = do_protostrs(finc, finc_name);
+			ret = do_protostrs(finc, finc_name, 1);
 			fclose(finc);
 			if (ret < 0)
 				break;
@@ -115,7 +120,8 @@ static int do_protostrs(FILE *fhdr, const char *fname)
 
 		hdrfline = line;
 
-		ret = b_pp_c_handler(protostr, hdrfn, is_oslib);
+		ret = b_pp_c_handler(protostr, hdrfn, is_include,
+			is_osinc, is_cinc);
 		if (ret < 0)
 			break;
 	}
@@ -292,6 +298,8 @@ static int check_type(const char *name, struct parsed_type *type)
 
 	ret = n1 - name;
 	type->name = strndup(name, ret);
+	if (IS(type->name, "__VALIST") || IS(type->name, "va_list"))
+		type->is_va_list = 1;
 	if (IS(type->name, "VOID"))
 		memcpy(type->name, "void", 4);
 
@@ -658,7 +666,8 @@ static struct parsed_proto *pp_cache;
 static int pp_cache_size;
 static int pp_cache_alloc;
 
-static int b_pp_c_handler(char *proto, const char *fname, int is_oslib)
+static int b_pp_c_handler(char *proto, const char *fname,
+	int is_include, int is_osinc, int is_cinc)
 {
 	int ret;
 
@@ -676,7 +685,9 @@ static int b_pp_c_handler(char *proto, const char *fname, int is_oslib)
 	if (ret < 0)
 		return -1;
 
-	pp_cache[pp_cache_size].is_oslib = is_oslib;
+	pp_cache[pp_cache_size].is_include = is_include;
+	pp_cache[pp_cache_size].is_osinc = is_osinc;
+	pp_cache[pp_cache_size].is_cinc = is_cinc;
 	pp_cache_size++;
 	return 0;
 }
@@ -689,7 +700,7 @@ static void build_pp_cache(FILE *fhdr)
 	pos = ftell(fhdr);
 	rewind(fhdr);
 
-	ret = do_protostrs(fhdr, hdrfn);
+	ret = do_protostrs(fhdr, hdrfn, 0);
 	if (ret < 0)
 		exit(1);