dnrops
/
radare2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement tc* and fix tc glitch ##types

This commit is contained in:
pancake 2020-03-30 01:47:58 +02:00 committed by radare
parent 5881fcd2e1
commit 090450401f
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libr/core/cbin.c
View File

@ -3135,7 +3135,7 @@ static void classdump_c(RCore *r, RBinClass *c) {
free (n);
}
}
r_cons_printf ("} %s;\n\n", c->name);
r_cons_printf ("} %s;\n", c->name);
}
static void classdump_objc(RCore *r, RBinClass *c) {
@ -3260,12 +3260,14 @@ static int bin_classes(RCore *r, int mode) {
r_name_filter (method, -1);
r_flag_set (r->flags, method, sym->vaddr, 1);
}
#if 0
r_list_foreach (c->fields, iter2, f) {
char *fn = r_str_newf ("field.%s.%s", classname, f->name);
ut64 at = f->vaddr; // sym->vaddr + (f->vaddr & 0xffff);
r_flag_set (r->flags, fn, at, 1);
free (fn);
}
#endif
} else if (IS_MODE_SIMPLEST (mode)) {
r_cons_printf ("%s\n", c->name);
} else if (IS_MODE_SIMPLE (mode)) {
@ -3330,12 +3332,18 @@ static int bin_classes(RCore *r, int mode) {
// C struct
r_cons_printf ("\"td struct %s {", c->name);
r_list_foreach (c->fields, iter2, f) {
char *n = objc_name_toc (f->name);
char *t = objc_type_toc (f->type);
r_cons_printf (" %s %s;", t, n);
free (t);
free (n);
if (r_list_empty (c->fields)) {
// XXX workaround because we cant register empty structs yet
// XXX https://github.com/radareorg/radare2/issues/16342
r_cons_printf (" char empty[0];");
} else {
r_list_foreach (c->fields, iter2, f) {
char *n = objc_name_toc (f->name);
char *t = objc_type_toc (f->type);
r_cons_printf (" %s %s;", t, n);
free (t);
free (n);
}
}
r_cons_printf ("};\"\n");
} else if (IS_MODE_JSON (mode)) {

7
libr/core/cmd_type.c
View File

@ -1077,6 +1077,9 @@ static int cmd_type(void *data, const char *input) {
}
break;
}
case '*':
r_core_cmd0 (core, "ts*");
break;
case 0:
r_core_cmd0 (core, "tfc;tuc;tsc;ttc;tec");
break;
@ -1640,7 +1643,9 @@ static int cmd_type(void *data, const char *input) {
print_keys (TDB, core, stdiffunc, printkey_cb, false);
break;
case 'c': // "tfc"
printFunctionTypeC (core, input + 2);
if (input[2] == ' ') {
printFunctionTypeC (core, input + 3);
}
break;
case 'j': // "tfj"
if (input[2] == ' ') {

4
shlr/tcc/libtcc.c
View File

@ -554,9 +554,9 @@ LIBTCCAPI TCCState *tcc_new(const char *arch, int bits, const char *os)
tcc_define_symbol (s, "ut32", "uint32_t");
tcc_define_symbol (s, "ut64", "uint64_t");
if (bits == 64) {
tcc_define_symbol (s, "ut64", "size_t");
tcc_define_symbol (s, "size_t", "uint64_t");
} else {
tcc_define_symbol (s, "ut32", "size_t");
tcc_define_symbol (s, "size_t", "uint32_t");
}
tcc_define_symbol (s, "st8", "int8_t");