Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-09 07:42:25 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Small TCC bitfields parsing fix

Browse Source
This commit is contained in:
Anton Kochkov 2019-02-08 15:04:39 +08:00
parent f33db3e48c
commit 54f841a4d3
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
shlr/tcc/tccgen.c
View File

@ -1053,6 +1053,9 @@ do_decl:
}
}
lbit_pos = 0;
// FIXME: Here it handles bitfields only in a way
// of the same endianess as the host system (this code was compiled for)
// It should depend on the endianess of the `asm.arch` instead.
if (bit_size >= 0) {
bt = type1.t & VT_BTYPE;
if (bt != VT_INT8 &&
@ -1115,6 +1118,7 @@ do_decl:
}
}
#if 1
// TODO: Don't use such a small limit?
char b[1024];
char *varstr = get_tok_str (v, NULL);
type_to_str (b, sizeof(b), &type1, NULL);
@ -1130,20 +1134,21 @@ do_decl:
/* compact form */
tcc_appendf ("%s.%s.%s=%s,%d,%d\n",
ctype, name, varstr, b, offset, arraysize);
}
#if 0
printf ("struct.%s.%s.type=%s\n", name, varstr, b);
printf ("struct.%s.%s.offset=%d\n", name, varstr, offset);
printf ("struct.%s.%s.array=%d\n", name, varstr, arraysize);
printf ("struct.%s.%s.type=%s\n", name, varstr, b);
printf ("struct.%s.%s.offset=%d\n", name, varstr, offset);
printf ("struct.%s.%s.array=%d\n", name, varstr, arraysize);
#endif
// (%s) field (%s) offset=%d array=%d", name, b, get_tok_str(v, NULL), offset, arraysize);
arraysize = 0;
if (type1.t & VT_BITFIELD) {
tcc_appendf (" pos=%d size=%d",
(type1.t >> VT_STRUCT_SHIFT) & 0x3f,
(type1.t >> (VT_STRUCT_SHIFT + 6)) & 0x3f);
// (%s) field (%s) offset=%d array=%d", name, b, get_tok_str(v, NULL), offset, arraysize);
arraysize = 0;
if (type1.t & VT_BITFIELD) {
tcc_appendf ("%s.%s.%s.bitfield.pos=%d\n",
ctype, name, varstr, (type1.t >> VT_STRUCT_SHIFT) & 0x3f);
tcc_appendf ("%s.%s.%s.bitfield.size=%d\n",
ctype, name, varstr, (type1.t >> (VT_STRUCT_SHIFT + 6)) & 0x3f);
}
// printf("\n");
}
// printf("\n");
#endif
}
if (v == 0 && (type1.t & VT_BTYPE) == VT_STRUCT) {