OpenE2K
/
dwarves
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dwarves_fprintf: Properly support pointers to const 

I.e.:

[acme@doppio pahole]$ cat tests/jengelh@medozas.de/const_const.c
struct x {
	const char *const s;
} y;

int main(void)
{
	return !y.s;
}
[acme@doppio pahole]$ pahole tests/jengelh@medozas.de/const_const
struct x {
	char const  * const        s;                    /*     0     8 */

	/* size: 8, cachelines: 1, members: 1 */
	/* last cacheline: 8 bytes */
};
[acme@doppio pahole]$

One more reason to devote some time to RTT, i.e. Round Trip Testing, where
pahole will be used to regenerate the source code, then feed the result to
gcc -g, run again, use codiff, that should produce no diff.

Reported-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2009-09-10 16:43:00 -03:00
parent fc1269af2f
commit 846927a3f8
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dwarves_fprintf.c
View File

@ -357,8 +357,9 @@ static const char *tag__ptr_name(const struct tag *self, const struct cu *cu,
return bf;
}
const char *tag__name(const struct tag *self, const struct cu *cu,
char *bf, size_t len, const struct conf_fprintf *conf)
static const char *__tag__name(const struct tag *self, const struct cu *cu,
char *bf, size_t len, bool starts_with_const,
const struct conf_fprintf *conf)
{
struct tag *type;
const struct conf_fprintf *pconf = conf ?: &conf_fprintf__defaults;
@ -409,10 +410,16 @@ const char *tag__name(const struct tag *self, const struct cu *cu,
tag__id_not_found_snprintf(bf, len, self->type);
else {
char tmpbf[128];
snprintf(bf, len, "%s %s ",
self->tag == DW_TAG_volatile_type ?
"volatile" : "const",
tag__name(type, cu, tmpbf, sizeof(tmpbf), pconf));
const char *const_str = self->tag == DW_TAG_const_type ?
"const": "volatile",
*type_str = __tag__name(type, cu, tmpbf,
sizeof(tmpbf),
!starts_with_const,
pconf);
if (starts_with_const)
snprintf(bf, len, "%s %s ", type_str, const_str);
else
snprintf(bf, len, "%s %s ", const_str, type_str);
}
break;
case DW_TAG_array_type:
@ -420,7 +427,8 @@ const char *tag__name(const struct tag *self, const struct cu *cu,
if (type == NULL)
tag__id_not_found_snprintf(bf, len, self->type);
else
return tag__name(type, cu, bf, len, pconf);
return __tag__name(type, cu, bf, len,
starts_with_const, pconf);
break;
case DW_TAG_subroutine_type: {
FILE *bfp = fmemopen(bf, len, "w");
@ -449,6 +457,13 @@ const char *tag__name(const struct tag *self, const struct cu *cu,
return bf;
}
const char *tag__name(const struct tag *self, const struct cu *cu,
char *bf, size_t len, const struct conf_fprintf *conf)
{
return __tag__name(self, cu, bf, len,
self->tag == DW_TAG_const_type, conf);
}
static const char *variable__prefix(const struct variable *var)
{
switch (var->location) {