core: base_type__name() doesn't need a 'cu' arg
Another simplification made possible by using a plain char string instead of string_t, that was only needed in the core as prep work for CTF encoding. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
7569e46d35
commit
caa219dffc
|
@ -632,8 +632,7 @@ static int class__fixup_ctf_bitfields(struct tag *tag, struct cu *cu)
|
||||||
integral_bit_size = base_type__name_to_size(bt, cu);
|
integral_bit_size = base_type__name_to_size(bt, cu);
|
||||||
if (integral_bit_size == 0)
|
if (integral_bit_size == 0)
|
||||||
fprintf(stderr, "%s: unknown base type name \"%s\"!\n",
|
fprintf(stderr, "%s: unknown base type name \"%s\"!\n",
|
||||||
__func__, base_type__name(bt, cu, name,
|
__func__, base_type__name(bt, name, sizeof(name)));
|
||||||
sizeof(name)));
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -222,7 +222,7 @@ size_t base_type__name_to_size(struct base_type *bt, struct cu *cu)
|
||||||
if (bt->name_has_encoding)
|
if (bt->name_has_encoding)
|
||||||
name = bt->name;
|
name = bt->name;
|
||||||
else
|
else
|
||||||
name = base_type__name(bt, cu, bf, sizeof(bf));
|
name = base_type__name(bt, bf, sizeof(bf));
|
||||||
orig_name = name;
|
orig_name = name;
|
||||||
try_again:
|
try_again:
|
||||||
while (base_type_name_to_size_table[i].name != NULL) {
|
while (base_type_name_to_size_table[i].name != NULL) {
|
||||||
|
@ -270,8 +270,7 @@ const char *__base_type__name(const struct base_type *bt)
|
||||||
return bt->name;
|
return bt->name;
|
||||||
}
|
}
|
||||||
|
|
||||||
const char *base_type__name(const struct base_type *bt, const struct cu *cu,
|
const char *base_type__name(const struct base_type *bt, char *bf, size_t len)
|
||||||
char *bf, size_t len)
|
|
||||||
{
|
{
|
||||||
if (bt->name_has_encoding)
|
if (bt->name_has_encoding)
|
||||||
return __base_type__name(bt);
|
return __base_type__name(bt);
|
||||||
|
@ -691,7 +690,7 @@ struct tag *cu__find_base_type_by_name(const struct cu *cu,
|
||||||
|
|
||||||
const struct base_type *bt = tag__base_type(pos);
|
const struct base_type *bt = tag__base_type(pos);
|
||||||
char bf[64];
|
char bf[64];
|
||||||
const char *bname = base_type__name(bt, cu, bf, sizeof(bf));
|
const char *bname = base_type__name(bt, bf, sizeof(bf));
|
||||||
if (!bname || strcmp(bname, name) != 0)
|
if (!bname || strcmp(bname, name) != 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
@ -718,7 +717,7 @@ struct tag *cu__find_base_type_by_name_and_size(const struct cu *cu, const char
|
||||||
char bf[64];
|
char bf[64];
|
||||||
|
|
||||||
if (bt->bit_size == bit_size &&
|
if (bt->bit_size == bit_size &&
|
||||||
strcmp(base_type__name(bt, cu, bf, sizeof(bf)), name) == 0) {
|
strcmp(base_type__name(bt, bf, sizeof(bf)), name) == 0) {
|
||||||
if (idp != NULL)
|
if (idp != NULL)
|
||||||
*idp = id;
|
*idp = id;
|
||||||
return pos;
|
return pos;
|
||||||
|
|
|
@ -1245,8 +1245,7 @@ static inline uint16_t base_type__size(const struct tag *tag)
|
||||||
|
|
||||||
const char *__base_type__name(const struct base_type *bt);
|
const char *__base_type__name(const struct base_type *bt);
|
||||||
|
|
||||||
const char *base_type__name(const struct base_type *btype, const struct cu *cu,
|
const char *base_type__name(const struct base_type *btype, char *bf, size_t len);
|
||||||
char *bf, size_t len);
|
|
||||||
|
|
||||||
size_t base_type__name_to_size(struct base_type *btype, struct cu *cu);
|
size_t base_type__name_to_size(struct base_type *btype, struct cu *cu);
|
||||||
|
|
||||||
|
|
|
@ -486,8 +486,7 @@ static const char *__tag__name(const struct tag *tag, const struct cu *cu,
|
||||||
char bf2[64];
|
char bf2[64];
|
||||||
|
|
||||||
if (bt->name)
|
if (bt->name)
|
||||||
name = base_type__name(tag__base_type(tag), cu,
|
name = base_type__name(tag__base_type(tag), bf2, sizeof(bf2));
|
||||||
bf2, sizeof(bf2));
|
|
||||||
|
|
||||||
strncpy(bf, name, len);
|
strncpy(bf, name, len);
|
||||||
}
|
}
|
||||||
|
|
|
@ -515,9 +515,9 @@ static int class__demote_bitfields(struct class *class, const struct cu *cu,
|
||||||
class_member__name(bitfield_head),
|
class_member__name(bitfield_head),
|
||||||
class_member__name(member),
|
class_member__name(member),
|
||||||
base_type__name(tag__base_type(old_type_tag),
|
base_type__name(tag__base_type(old_type_tag),
|
||||||
cu, old_bf, sizeof(old_bf)),
|
old_bf, sizeof(old_bf)),
|
||||||
base_type__name(tag__base_type(new_type_tag),
|
base_type__name(tag__base_type(new_type_tag),
|
||||||
cu, new_bf, sizeof(new_bf)));
|
new_bf, sizeof(new_bf)));
|
||||||
}
|
}
|
||||||
|
|
||||||
class__demote_bitfield_members(class,
|
class__demote_bitfield_members(class,
|
||||||
|
@ -559,9 +559,9 @@ static int class__demote_bitfields(struct class *class, const struct cu *cu,
|
||||||
"from '%s' to '%s' */\n",
|
"from '%s' to '%s' */\n",
|
||||||
class_member__name(member),
|
class_member__name(member),
|
||||||
base_type__name(tag__base_type(old_type_tag),
|
base_type__name(tag__base_type(old_type_tag),
|
||||||
cu, old_bf, sizeof(old_bf)),
|
old_bf, sizeof(old_bf)),
|
||||||
base_type__name(tag__base_type(new_type_tag),
|
base_type__name(tag__base_type(new_type_tag),
|
||||||
cu, new_bf, sizeof(new_bf)));
|
new_bf, sizeof(new_bf)));
|
||||||
}
|
}
|
||||||
class__demote_bitfield_members(class,
|
class__demote_bitfield_members(class,
|
||||||
member, member,
|
member, member,
|
||||||
|
|
5
pahole.c
5
pahole.c
|
@ -536,8 +536,7 @@ static void class__resize_LP(struct tag *tag, struct cu *cu)
|
||||||
case DW_TAG_base_type: {
|
case DW_TAG_base_type: {
|
||||||
struct base_type *bt = tag__base_type(type);
|
struct base_type *bt = tag__base_type(type);
|
||||||
char bf[64];
|
char bf[64];
|
||||||
const char *name = base_type__name(bt, cu, bf,
|
const char *name = base_type__name(bt, bf, sizeof(bf));
|
||||||
sizeof(bf));
|
|
||||||
if (strcmp(name, "long int") != 0 &&
|
if (strcmp(name, "long int") != 0 &&
|
||||||
strcmp(name, "long unsigned int") != 0)
|
strcmp(name, "long unsigned int") != 0)
|
||||||
break;
|
break;
|
||||||
|
@ -643,7 +642,7 @@ static void tag__fixup_word_size(struct tag *tag, struct cu *cu)
|
||||||
if (!bt->name)
|
if (!bt->name)
|
||||||
return;
|
return;
|
||||||
char bf[64];
|
char bf[64];
|
||||||
const char *name = base_type__name(bt, cu, bf, sizeof(bf));
|
const char *name = base_type__name(bt, bf, sizeof(bf));
|
||||||
|
|
||||||
if (strcmp(name, "long int") == 0 ||
|
if (strcmp(name, "long int") == 0 ||
|
||||||
strcmp(name, "long unsigned int") == 0)
|
strcmp(name, "long unsigned int") == 0)
|
||||||
|
|
|
@ -25,8 +25,7 @@ static void emit_tag(struct tag *tag, uint32_t tag_id, struct cu *cu)
|
||||||
|
|
||||||
if (tag->tag == DW_TAG_base_type) {
|
if (tag->tag == DW_TAG_base_type) {
|
||||||
char bf[64];
|
char bf[64];
|
||||||
const char *name = base_type__name(tag__base_type(tag), cu,
|
const char *name = base_type__name(tag__base_type(tag), bf, sizeof(bf));
|
||||||
bf, sizeof(bf));
|
|
||||||
|
|
||||||
if (name == NULL)
|
if (name == NULL)
|
||||||
printf("anonymous base_type\n");
|
printf("anonymous base_type\n");
|
||||||
|
|
5
syscse.c
5
syscse.c
|
@ -51,7 +51,7 @@ static void zero_extend(const int regparm, const struct base_type *bt,
|
||||||
printf("\t%s\t$a%d, $a%d, 0"
|
printf("\t%s\t$a%d, $a%d, 0"
|
||||||
"\t/* zero extend $a%d(%s %s) from %d to 64-bit */\n",
|
"\t/* zero extend $a%d(%s %s) from %d to 64-bit */\n",
|
||||||
instr, regparm, regparm, regparm,
|
instr, regparm, regparm, regparm,
|
||||||
base_type__name(bt, cu, bf, sizeof(bf)),
|
base_type__name(bt, bf, sizeof(bf)),
|
||||||
parm, bt->bit_size);
|
parm, bt->bit_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -71,8 +71,7 @@ static void emit_wrapper(struct function *f, struct cu *cu)
|
||||||
char bf[64];
|
char bf[64];
|
||||||
|
|
||||||
if (bt->bit_size < 64 &&
|
if (bt->bit_size < 64 &&
|
||||||
strncmp(base_type__name(bt, cu, bf, sizeof(bf)),
|
strncmp(base_type__name(bt, bf, sizeof(bf)), "unsigned", 8) == 0) {
|
||||||
"unsigned", 8) == 0) {
|
|
||||||
if (!needs_wrapper) {
|
if (!needs_wrapper) {
|
||||||
printf("wrap_%s:\n", name);
|
printf("wrap_%s:\n", name);
|
||||||
needs_wrapper = 1;
|
needs_wrapper = 1;
|
||||||
|
|
Loading…
Reference in New Issue