Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-23 21:29:49 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Add r_anal_optype_index to make /atl and /at use full listings of optypes ##search

Browse Source
This commit is contained in:
pancake 2022-10-22 15:50:20 +02:00 committed by pancake
parent f564c5ee37
commit a4495c63d1
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libr/anal/op.c
View File

@ -252,10 +252,11 @@ R_API bool r_anal_op_ismemref(int t) {
}
}
#define OPTYPES_COUNT 62
static struct optype {
const int type;
const char *name;
} optypes[] = {
} optypes[OPTYPES_COUNT] = {
{ R_ANAL_OP_TYPE_IO, "io" },
{ R_ANAL_OP_TYPE_ACMP, "acmp" },
{ R_ANAL_OP_TYPE_ADD, "add" },
@ -330,6 +331,13 @@ R_API int r_anal_optype_from_string(const char *type) {
return -1;
}
R_API const char *r_anal_optype_index(int idx) {
if (idx < 0 || idx >= OPTYPES_COUNT) {
return NULL;
}
return optypes[idx].name;
}
R_API const char *r_anal_optype_to_string(int t) {
bool once = true;
repeat:

11
libr/core/cmd_search.c
View File

@ -143,9 +143,10 @@ static const char *help_msg_slash[] = {
};
static const char *help_msg_slash_at[] = {
"Usage:", "/at[mjsf] [arg]", "Search for instructions matching type/family/mnemonic",
"/atf", " [family]", "search for given-family type of instructions",
"Usage:", "/at[flmj] [arg]", "Search for instructions matching type/family/mnemonic",
"/at", " [optype,optype2]", "list instructions matching any of the comma separated optypes",
"/atj", " [optype,optype2]", "same as above but using json as output",
"/atf", " [family]", "search for given-family type of instructions",
"/atl", "", "list all the instruction types (RAnalOp.Type)",
"/atm", "", "search matching only the instruction mnemonic",
NULL
@ -2506,7 +2507,7 @@ static bool do_anal_search(RCore *core, struct search_parameters *param, const c
for (i = 0; i < 64; i++) {
const char *str = type == 'f'
? r_anal_op_family_to_string (i)
: r_anal_optype_to_string (i);
: r_anal_optype_index (i);
if (R_STR_ISEMPTY (str)) {
break;
}
@ -2577,10 +2578,10 @@ static bool do_anal_search(RCore *core, struct search_parameters *param, const c
continue;
}
bool found = false;
for (i = 0; i < 64; i++) {
for (i = 0; i < 1024; i++) {
const char *str = type == 'f'
? r_anal_op_family_to_string (i)
: r_anal_optype_to_string (i);
: r_anal_optype_index (i);
if (R_STR_ISEMPTY (str)) {
break;
}

1
libr/include/r_anal.h
View File

@ -1050,6 +1050,7 @@ R_API bool r_anal_op_nonlinear(int t);
R_API const char *r_anal_op_direction_tostring(RAnalOp *op);
R_API bool r_anal_op_ismemref(int t);
R_API const char *r_anal_optype_to_string(int t);
R_API const char *r_anal_optype_index(int idx);
R_API int r_anal_optype_from_string(const char *type);
R_API const char *r_anal_op_family_to_string(int n);
R_API int r_anal_op_family_from_string(const char *f);