notaz.gp2x.de
/
ia32rtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
translate: deal with and 0 / or ~0
[ia32rtools.git]
/
tools
/
protoparse.h
diff --git
a/tools/protoparse.h
b/tools/protoparse.h
index
1bc619c
..
2647bba
100644
(file)
--- a/
tools/protoparse.h
+++ b/
tools/protoparse.h
@@
-1,3
+1,10
@@
+/*
+ * ia32rtools
+ * (C) notaz, 2013,2014
+ *
+ * This work is licensed under the terms of 3-clause BSD license.
+ * See COPYING file in the top-level directory.
+ */
struct parsed_proto;
struct parsed_proto;
@@
-6,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_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 {
};
struct parsed_proto_arg {
@@
-34,7
+42,10
@@
struct parsed_proto {
unsigned int is_noreturn:1;
unsigned int is_unresolved:1;
unsigned int is_userstack:1;
unsigned int is_noreturn:1;
unsigned int is_unresolved:1;
unsigned int is_userstack:1;
- unsigned int is_arg:1; // decl in func arg
+ 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;
};
unsigned int has_structarg:1;
unsigned int has_retreg:1;
};
@@
-45,15
+56,18
@@
static int hdrfline = 0;
static void pp_copy_arg(struct parsed_proto_arg *d,
const struct parsed_proto_arg *s);
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);
+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];
{
const char *finc_name;
const char *hdrfn_saved;
char protostr[256];
char path[256];
char fname_inc[256];
+ int is_osinc;
+ int is_cinc;
FILE *finc;
int line = 0;
int ret;
FILE *finc;
int line = 0;
int ret;
@@
-62,6
+76,9
@@
static int do_protostrs(FILE *fhdr, const char *fname)
hdrfn_saved = hdrfn;
hdrfn = fname;
hdrfn_saved = hdrfn;
hdrfn = fname;
+ is_cinc = strstr(fname, "stdc.hlist") != NULL;
+ is_osinc = is_cinc || strstr(fname, "stdc.hlist") != NULL;
+
while (fgets(protostr, sizeof(protostr), fhdr))
{
line++;
while (fgets(protostr, sizeof(protostr), fhdr))
{
line++;
@@
-86,7
+103,7
@@
static int do_protostrs(FILE *fhdr, const char *fname)
fname_inc, line, finc_name);
continue;
}
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;
fclose(finc);
if (ret < 0)
break;
@@
-103,7
+120,8
@@
static int do_protostrs(FILE *fhdr, const char *fname)
hdrfline = line;
hdrfline = line;
- ret = b_pp_c_handler(protostr, hdrfn);
+ ret = b_pp_c_handler(protostr, hdrfn, is_include,
+ is_osinc, is_cinc);
if (ret < 0)
break;
}
if (ret < 0)
break;
}
@@
-280,6
+298,8
@@
static int check_type(const char *name, struct parsed_type *type)
ret = n1 - name;
type->name = strndup(name, ret);
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);
if (IS(type->name, "VOID"))
memcpy(type->name, "void", 4);
@@
-646,7
+666,8
@@
static struct parsed_proto *pp_cache;
static int pp_cache_size;
static int pp_cache_alloc;
static int pp_cache_size;
static int pp_cache_alloc;
-static int b_pp_c_handler(char *proto, const char *fname)
+static int b_pp_c_handler(char *proto, const char *fname,
+ int is_include, int is_osinc, int is_cinc)
{
int ret;
{
int ret;
@@
-664,6
+685,9
@@
static int b_pp_c_handler(char *proto, const char *fname)
if (ret < 0)
return -1;
if (ret < 0)
return -1;
+ 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;
}
pp_cache_size++;
return 0;
}
@@
-676,7
+700,7
@@
static void build_pp_cache(FILE *fhdr)
pos = ftell(fhdr);
rewind(fhdr);
pos = ftell(fhdr);
rewind(fhdr);
- ret = do_protostrs(fhdr, hdrfn);
+ ret = do_protostrs(fhdr, hdrfn
, 0
);
if (ret < 0)
exit(1);
if (ret < 0)
exit(1);