Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor types: extract API for ttc and tt ##refactor #659

Merged
merged 12 commits into from Feb 23, 2021
Merged

Refactor types: extract API for ttc and tt ##refactor #659

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
04b8272
Refactor types: extract API for `ttc` and `tt` ##refactor
officialcjunior Feb 19, 2021
0d3d4f4
Pass a predifined variable on `tc`
officialcjunior Feb 19, 2021
d3eacb7
Add tests for `tfc` and `tsc`
officialcjunior Feb 20, 2021
8498ff5
Add a test for `tc` displaying an enum after loading with `td`
officialcjunior Feb 21, 2021
d0ea56e
Add a test for `tuc`
officialcjunior Feb 21, 2021
4cc1efd
Use a predefined variable to pass in the case of typedefs too on `tc`
officialcjunior Feb 22, 2021
b4a8552
Merge branch 'dev' into types-api
XVilka Feb 22, 2021
7f98812
Use RzOutputMode `rz_core_list_loaded_typedefs()` and change its defi…
officialcjunior Feb 22, 2021
fdae0ce
Refactor `rz_core_list_loaded_typedefs()` and address changes
officialcjunior Feb 22, 2021
0c11e0f
Update librz/core/cmd_type.c
ret2libc Feb 22, 2021
c94fff0
Revert how `tt` was handled and called to the old case
officialcjunior Feb 23, 2021
3e8aee7
Merge branch 'dev' into types-api
ret2libc Feb 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion librz/core/cmd.c
View file
Open in desktop
Expand Up @@ -380,7 +380,8 @@ static bool lastcmd_repeat(RzCore *core, int next) {
case '$':
if (!strncmp(core->lastcmd, "pd", 2)) {
if (core->lastcmd[2] == ' ') {
rz_core_cmdf(core, "so %s", core->lastcmd + 3);
ut64 addr = rz_num_math(core->num, core->lastcmd + 3);
ret2libc marked this conversation as resolved.
Show resolved Hide resolved
rz_core_seek_opcode(core, addr, false);
} else {
rz_core_cmd0(core, "so `pi~?`");
}
Expand Down
166 changes: 85 additions & 81 deletions librz/core/cmd_type.c
View file
Open in desktop
Expand Up @@ -176,10 +176,6 @@ static const char *help_msg_tu[] = {
NULL
};

static void show_help(RzCore *core) {
rz_core_cmd_help(core, help_msg_t);
}

static void __core_cmd_tcc(RzCore *core, const char *input) {
switch (*input) {
case '?':
Expand Down Expand Up @@ -235,7 +231,7 @@ static void __core_cmd_tcc(RzCore *core, const char *input) {
rz_list_free(list);
} break;
case 'k':
rz_core_cmd0(core, "afck");
rz_core_kuery_print(core, "analysis/cc/*");
break;
case ' ':
if (strchr(input, '(')) {
Expand Down Expand Up @@ -729,6 +725,76 @@ static void set_offset_hint(RzCore *core, RzAnalysisOp *op, const char *type, ut
}
}

RZ_API void rz_core_list_loaded_typedefs(RzCore *core, const char *input, Sdb *TDB) {
PJ *pj = NULL;
if (input[1] == 'j') {
pj = pj_new();
pj_o(pj);
}
char *name = NULL;
SdbKv *kv;
SdbListIter *iter;
SdbList *l = sdb_foreach_list(TDB, true);
ls_foreach (l, iter, kv) {
if (!strcmp(sdbkv_value(kv), "typedef")) {
if (!name || strcmp(sdbkv_value(kv), name)) {
free(name);
name = strdup(sdbkv_key(kv));
if (!input[1]) {
officialcjunior marked this conversation as resolved.
Show resolved Hide resolved
rz_cons_println(name);
} else {
const char *q = sdb_fmt("typedef.%s", name);
const char *res = sdb_const_get(TDB, q, 0);
pj_ks(pj, name, res);
}
}
}
}
if (input[1] == 'j') {
pj_end(pj);
}
if (pj) {
officialcjunior marked this conversation as resolved.
Show resolved Hide resolved
rz_cons_printf("%s\n", pj_string(pj));
pj_free(pj);
}
free(name);
ls_free(l);
}

RZ_API void rz_core_list_typename_alias_c(RzCore *core, const char *input, Sdb *TDB) {
XVilka marked this conversation as resolved.
Show resolved Hide resolved
officialcjunior marked this conversation as resolved.
Show resolved Hide resolved
char *name = NULL;
SdbKv *kv;
SdbListIter *iter;
SdbList *l = sdb_foreach_list(TDB, true);
const char *arg = rz_str_trim_head_ro(input + 2);
bool match = false;
ls_foreach (l, iter, kv) {
if (!strcmp(sdbkv_value(kv), "typedef")) {
if (!name || strcmp(sdbkv_value(kv), name)) {
free(name);
name = strdup(sdbkv_key(kv));
if (name && (arg && *arg)) {
if (!strcmp(arg, name)) {
match = true;
} else {
continue;
}
}
const char *q = sdb_fmt("typedef.%s", name);
const char *res = sdb_const_get(TDB, q, 0);
if (res) {
rz_cons_printf("%s %s %s;\n", sdbkv_value(kv), res, name);
}
if (match) {
break;
}
}
}
}
free(name);
ls_free(l);
}

RZ_API int rz_core_get_stacksz(RzCore *core, ut64 from, ut64 to) {
int stack = 0, maxstack = 0;
ut64 at = from;
Expand Down Expand Up @@ -973,13 +1039,13 @@ RZ_IPI int rz_cmd_type(void *data, const char *input) {
print_struct_union_list_json(TDB, stdifunion);
}
break;
case 'c':
case 'c': // "tuc"
print_struct_union_in_c_format(TDB, stdifunion, rz_str_trim_head_ro(input + 2), true);
break;
case 'd':
case 'd': // "tud"
print_struct_union_in_c_format(TDB, stdifunion, rz_str_trim_head_ro(input + 2), false);
break;
case ' ':
case ' ': // "tu "
showFormat(core, rz_str_trim_head_ro(input + 1), 0);
break;
case 0:
Expand Down Expand Up @@ -1010,15 +1076,15 @@ RZ_IPI int rz_cmd_type(void *data, const char *input) {
if (name && type) {
name++; // skip the '.'
if (rz_str_startswith(type, "struct")) {
rz_core_cmdf(core, "tsc %s", name);
print_struct_union_in_c_format(TDB, stdifstruct, name, true);
} else if (rz_str_startswith(type, "union")) {
rz_core_cmdf(core, "tuc %s", name);
print_struct_union_in_c_format(TDB, stdifunion, name, true);
} else if (rz_str_startswith(type, "enum")) {
rz_core_cmdf(core, "tec %s", name);
print_enum_in_c_format(TDB, name, true);
} else if (rz_str_startswith(type, "typedef")) {
rz_core_cmdf(core, "ttc %s", name);
rz_core_list_typename_alias_c(core, name, TDB);
} else if (rz_str_startswith(type, "func")) {
rz_core_cmdf(core, "tfc %s", name);
printFunctionTypeC(core, name);
}
}
break;
Expand Down Expand Up @@ -1627,78 +1693,16 @@ RZ_IPI int rz_cmd_type(void *data, const char *input) {
break;
}
break;
case 't': {
case 't': { // "tt"
if (!input[1] || input[1] == 'j') {
PJ *pj = NULL;
if (input[1] == 'j') {
pj = pj_new();
pj_o(pj);
}
char *name = NULL;
SdbKv *kv;
SdbListIter *iter;
SdbList *l = sdb_foreach_list(TDB, true);
ls_foreach (l, iter, kv) {
if (!strcmp(sdbkv_value(kv), "typedef")) {
if (!name || strcmp(sdbkv_value(kv), name)) {
free(name);
name = strdup(sdbkv_key(kv));
if (!input[1]) {
rz_cons_println(name);
} else {
const char *q = sdb_fmt("typedef.%s", name);
const char *res = sdb_const_get(TDB, q, 0);
pj_ks(pj, name, res);
}
}
}
}
if (input[1] == 'j') {
pj_end(pj);
}
if (pj) {
rz_cons_printf("%s\n", pj_string(pj));
pj_free(pj);
}
free(name);
ls_free(l);
rz_core_list_loaded_typedefs(core, input, TDB);
XVilka marked this conversation as resolved.
Show resolved Hide resolved
break;
}
if (input[1] == 'c') {
char *name = NULL;
SdbKv *kv;
SdbListIter *iter;
SdbList *l = sdb_foreach_list(TDB, true);
const char *arg = rz_str_trim_head_ro(input + 2);
bool match = false;
ls_foreach (l, iter, kv) {
if (!strcmp(sdbkv_value(kv), "typedef")) {
if (!name || strcmp(sdbkv_value(kv), name)) {
free(name);
name = strdup(sdbkv_key(kv));
if (name && (arg && *arg)) {
if (!strcmp(arg, name)) {
match = true;
} else {
continue;
}
}
const char *q = sdb_fmt("typedef.%s", name);
const char *res = sdb_const_get(TDB, q, 0);
if (res) {
rz_cons_printf("%s %s %s;\n", sdbkv_value(kv), res, name);
}
if (match) {
break;
}
}
}
}
free(name);
ls_free(l);
if (input[1] == 'c') { // "ttc"
rz_core_list_typename_alias_c(core, input, TDB);
break;
}
if (input[1] == '?') {
if (input[1] == '?') { // "tt?"
rz_core_cmd_help(core, help_msg_tt);
break;
}
Expand All @@ -1717,7 +1721,7 @@ RZ_IPI int rz_cmd_type(void *data, const char *input) {
free(s);
} break;
case '?':
show_help(core);
rz_core_cmd_help(core, help_msg_t);
break;
}
return true;
Expand Down
3 changes: 3 additions & 0 deletions librz/include/rz_core.h
View file
Open in desktop
Expand Up @@ -840,6 +840,9 @@ typedef struct {
RzCoreAnalStatsItem *block;
} RzCoreAnalStats;

RZ_API void rz_core_list_typename_alias_c(RzCore *core, const char *input, Sdb *TDB);
RZ_API void rz_core_list_loaded_typedefs(RzCore *core, const char *input, Sdb *TDB);

RZ_API char *rz_core_analysis_hasrefs(RzCore *core, ut64 value, int mode);
RZ_API char *rz_core_analysis_get_comments(RzCore *core, ut64 addr);
RZ_API RzCoreAnalStats *rz_core_analysis_get_stats(RzCore *a, ut64 from, ut64 to, ut64 step);
Expand Down
61 changes: 61 additions & 0 deletions test/db/cmd/cmd_tc
View file
Open in desktop
Expand Up @@ -252,3 +252,64 @@ EXPECT=<<EOF
typedef char * string;
EOF
RUN

NAME=test cmd tsc
FILE=bins/mach0/objc-employee
CMDS=<<EOF
.ic*
tsc Employee
EOF
EXPECT=<<EOF
struct Employee {
struct objc_class *isa;
int16_t _shortWord;
struct NSString *_username;
struct NSString *_firstName;
uint64_t _wideWord;
void *username;
void *firstName;
void *shortWord;
void *wideWord;
};
EOF
RUN

NAME=test cmd tfc
FILE=bins/mach0/objc-employee
CMDS=<<EOF
tfc main
tfc entry0
EOF
EXPECT=<<EOF
int main (int argc, char ** argv, char ** envp);
void entry0 ();
EOF
RUN

NAME=test cmd tec
FILE=-
CMDS=<<EOF
"td enum foo {bar = 1, cow = 3};"
tec
EOF
EXPECT=<<EOF
enum foo {
bar = 1,
cow = 3
};
EOF
RUN

NAME=test cmd tuc
FILE=-
CMDS=<<EOF
"td union Data {int i,j;};"
tuc
EOF
EXPECT=<<EOF
union Data {
int32_t i;
int32_t j;
};
EOF
RUN