forked from Imagelibrary/binutils-gdb
2002-11-21 Andrew Cagney <ac131313@redhat.com>
* filter.c: Re-indent. * filter.h, filter_host.h, gen-engine.c, gen-engine.h: Ditto. * gen-icache.c, gen-icache.h, gen-idecode.c: Ditto. * gen-idecode.h, gen-itable.c, gen-itable.h: Ditto. * gen-model.c, gen-model.h, gen-semantics.c: Ditto. * gen-semantics.h, gen-support.c, gen-support.h: Ditto. * gen.c, gen.h, igen.c, igen.h, ld-cache.c, ld-cache.h: Ditto. * ld-decode.c, ld-decode.h, ld-insn.c, ld-insn.h, lf.c: Ditto. * lf.h, misc.c, misc.h, table.c, table.h: Ditto.
This commit is contained in:
Andrew Cagney
@@ -38,15 +38,15 @@
|
||||
#include "lf.h"
|
||||
#include "filter.h"
|
||||
|
||||
struct _filter {
|
||||
struct _filter
|
||||
{
|
||||
char *member;
|
||||
filter *next;
|
||||
};
|
||||
|
||||
|
||||
void
|
||||
filter_parse (filter **filters,
|
||||
const char *filt)
|
||||
filter_parse (filter **filters, const char *filt)
|
||||
{
|
||||
while (strlen (filt) > 0)
|
||||
{
|
||||
@@ -54,7 +54,7 @@ filter_parse (filter **filters,
|
||||
filter **last;
|
||||
/* break out a member of the filter list */
|
||||
const char *flag = filt;
|
||||
unsigned /*size_t*/ len;
|
||||
unsigned /*size_t */ len;
|
||||
filt = strchr (filt, ',');
|
||||
if (filt == NULL)
|
||||
{
|
||||
@@ -68,13 +68,12 @@ filter_parse (filter **filters,
|
||||
}
|
||||
/* find an insertion point - sorted order */
|
||||
last = filters;
|
||||
while (*last != NULL
|
||||
&& strncmp (flag, (*last)->member, len) > 0)
|
||||
while (*last != NULL && strncmp (flag, (*last)->member, len) > 0)
|
||||
last = &(*last)->next;
|
||||
if (*last != NULL
|
||||
&& strncmp (flag, (*last)->member, len) == 0
|
||||
&& strlen ((*last)->member) == len)
|
||||
continue; /* duplicate */
|
||||
continue; /* duplicate */
|
||||
/* create an entry for that member */
|
||||
new_filter = ZALLOC (filter);
|
||||
new_filter->member = NZALLOC (char, len + 1);
|
||||
@@ -87,14 +86,13 @@ filter_parse (filter **filters,
|
||||
|
||||
|
||||
void
|
||||
filter_add (filter **set,
|
||||
filter *add)
|
||||
filter_add (filter **set, filter *add)
|
||||
{
|
||||
while (add != NULL)
|
||||
{
|
||||
int cmp;
|
||||
if (*set == NULL)
|
||||
cmp = 1; /* set->member > add->member */
|
||||
cmp = 1; /* set->member > add->member */
|
||||
else
|
||||
cmp = strcmp ((*set)->member, add->member);
|
||||
if (cmp > 0)
|
||||
@@ -112,7 +110,7 @@ filter_add (filter **set,
|
||||
/* already in set */
|
||||
add = add->next;
|
||||
}
|
||||
else /* cmp < 0 */
|
||||
else /* cmp < 0 */
|
||||
{
|
||||
/* not reached insertion point */
|
||||
set = &(*set)->next;
|
||||
@@ -122,8 +120,7 @@ filter_add (filter **set,
|
||||
|
||||
|
||||
int
|
||||
filter_is_subset (filter *superset,
|
||||
filter *subset)
|
||||
filter_is_subset (filter *superset, filter *subset)
|
||||
{
|
||||
while (1)
|
||||
{
|
||||
@@ -131,21 +128,20 @@ filter_is_subset (filter *superset,
|
||||
if (subset == NULL)
|
||||
return 1;
|
||||
if (superset == NULL)
|
||||
return 0; /* subset isn't finished */
|
||||
return 0; /* subset isn't finished */
|
||||
cmp = strcmp (subset->member, superset->member);
|
||||
if (cmp < 0)
|
||||
return 0; /* not found */
|
||||
return 0; /* not found */
|
||||
else if (cmp == 0)
|
||||
subset = subset->next; /* found */
|
||||
subset = subset->next; /* found */
|
||||
else if (cmp > 0)
|
||||
superset = superset->next; /* later in list? */
|
||||
superset = superset->next; /* later in list? */
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
filter_is_common (filter *l,
|
||||
filter *r)
|
||||
filter_is_common (filter *l, filter *r)
|
||||
{
|
||||
while (1)
|
||||
{
|
||||
@@ -158,7 +154,7 @@ filter_is_common (filter *l,
|
||||
if (cmp < 0)
|
||||
l = l->next;
|
||||
else if (cmp == 0)
|
||||
return 1; /* common member */
|
||||
return 1; /* common member */
|
||||
else if (cmp > 0)
|
||||
r = r->next;
|
||||
}
|
||||
@@ -166,8 +162,7 @@ filter_is_common (filter *l,
|
||||
|
||||
|
||||
int
|
||||
filter_is_member (filter *filt,
|
||||
const char *flag)
|
||||
filter_is_member (filter *filt, const char *flag)
|
||||
{
|
||||
int index = 1;
|
||||
while (filt != NULL)
|
||||
@@ -182,68 +177,72 @@ filter_is_member (filter *filt,
|
||||
|
||||
|
||||
int
|
||||
is_filtered_out (filter *filters,
|
||||
const char *flags)
|
||||
is_filtered_out (filter *filters, const char *flags)
|
||||
{
|
||||
while (strlen(flags) > 0) {
|
||||
int present;
|
||||
filter *filt = filters;
|
||||
/* break the string up */
|
||||
char *end = strchr(flags, ',');
|
||||
char *next;
|
||||
unsigned /*size_t*/ len;
|
||||
if (end == NULL) {
|
||||
end = strchr(flags, '\0');
|
||||
next = end;
|
||||
while (strlen (flags) > 0)
|
||||
{
|
||||
int present;
|
||||
filter *filt = filters;
|
||||
/* break the string up */
|
||||
char *end = strchr (flags, ',');
|
||||
char *next;
|
||||
unsigned /*size_t */ len;
|
||||
if (end == NULL)
|
||||
{
|
||||
end = strchr (flags, '\0');
|
||||
next = end;
|
||||
}
|
||||
else
|
||||
{
|
||||
next = end + 1;
|
||||
}
|
||||
len = end - flags;
|
||||
/* check that it is present */
|
||||
present = 0;
|
||||
filt = filters;
|
||||
while (filt != NULL)
|
||||
{
|
||||
if (strncmp (flags, filt->member, len) == 0
|
||||
&& strlen (filt->member) == len)
|
||||
{
|
||||
present = 1;
|
||||
break;
|
||||
}
|
||||
filt = filt->next;
|
||||
}
|
||||
if (!present)
|
||||
return 1;
|
||||
flags = next;
|
||||
}
|
||||
else {
|
||||
next = end + 1;
|
||||
}
|
||||
len = end - flags;
|
||||
/* check that it is present */
|
||||
present = 0;
|
||||
filt = filters;
|
||||
while (filt != NULL) {
|
||||
if (strncmp(flags, filt->member, len) == 0
|
||||
&& strlen(filt->member) == len) {
|
||||
present = 1;
|
||||
break;
|
||||
}
|
||||
filt = filt->next;
|
||||
}
|
||||
if (!present)
|
||||
return 1;
|
||||
flags = next;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
#if 0
|
||||
int
|
||||
it_is (const char *flag,
|
||||
const char *flags)
|
||||
it_is (const char *flag, const char *flags)
|
||||
{
|
||||
int flag_len = strlen(flag);
|
||||
while (*flags != '\0') {
|
||||
if (!strncmp(flags, flag, flag_len)
|
||||
&& (flags[flag_len] == ',' || flags[flag_len] == '\0'))
|
||||
return 1;
|
||||
while (*flags != ',') {
|
||||
if (*flags == '\0')
|
||||
return 0;
|
||||
int flag_len = strlen (flag);
|
||||
while (*flags != '\0')
|
||||
{
|
||||
if (!strncmp (flags, flag, flag_len)
|
||||
&& (flags[flag_len] == ',' || flags[flag_len] == '\0'))
|
||||
return 1;
|
||||
while (*flags != ',')
|
||||
{
|
||||
if (*flags == '\0')
|
||||
return 0;
|
||||
flags++;
|
||||
}
|
||||
flags++;
|
||||
}
|
||||
flags++;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
char *
|
||||
filter_next (filter *set,
|
||||
char *member)
|
||||
filter_next (filter *set, char *member)
|
||||
{
|
||||
while (set != NULL)
|
||||
{
|
||||
@@ -256,10 +255,7 @@ filter_next (filter *set,
|
||||
|
||||
|
||||
void
|
||||
dump_filter (lf *file,
|
||||
char *prefix,
|
||||
filter *set,
|
||||
char *suffix)
|
||||
dump_filter (lf *file, char *prefix, filter *set, char *suffix)
|
||||
{
|
||||
char *member;
|
||||
lf_printf (file, "%s", prefix);
|
||||
@@ -281,20 +277,21 @@ dump_filter (lf *file,
|
||||
|
||||
#ifdef MAIN
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
filter *subset = NULL;
|
||||
filter *superset = NULL;
|
||||
lf *l;
|
||||
int i;
|
||||
if (argc < 2) {
|
||||
printf("Usage: filter <subset> <filter> ...\n");
|
||||
exit (1);
|
||||
}
|
||||
if (argc < 2)
|
||||
{
|
||||
printf ("Usage: filter <subset> <filter> ...\n");
|
||||
exit (1);
|
||||
}
|
||||
|
||||
/* load the filter up */
|
||||
filter_parse (&subset, argv[1]);
|
||||
for (i = 2; i < argc; i++)
|
||||
for (i = 2; i < argc; i++)
|
||||
filter_parse (&superset, argv[i]);
|
||||
|
||||
/* dump various info */
|
||||
@@ -352,7 +349,7 @@ main(int argc, char **argv)
|
||||
dump_filter (l, "{", superset, " }");
|
||||
lf_printf (l, "\n");
|
||||
}
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user