Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-03 20:22:38 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Honor ^C in aae

Browse Source
This commit is contained in:
pancake 2015-09-25 18:38:07 +02:00
parent e8e1aa321b
commit da3264250c
5 changed files with 66 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libr/anal/esil.c
View File

@ -19,6 +19,7 @@ static inline ut64 genmask (int bits) {
}
static bool isnum (RAnalEsil *esil, const char *str, ut64 *num) {
if (!esil || !str) return false;
if (*str >= '0' && *str <= '9') {
if (num) *num = r_num_get (NULL, str);
return true;
@ -409,6 +410,9 @@ R_API int r_anal_esil_reg_write (RAnalEsil *esil, const char *dst, ut64 num) {
R_API int r_anal_esil_reg_read (RAnalEsil *esil, const char *regname, ut64 *num, int *size) {
bool ret = false;
ut64 localnum; // XXX why is this necessary?
if (!esil || !regname) {
return false;
}
if (!strcmp (regname, "$$")) {
if (num) *num = esil->address;
if (size) *size = esil->anal->bits;
@ -1990,7 +1994,7 @@ R_API int r_anal_esil_parse(RAnalEsil *esil, const char *str) {
int dorunword;
char word[64];
const char *ostr = str;
if (!esil)
if (!esil || !str || !*str)
return 0;
esil->trap = 0;
loop:

2
libr/anal/var.c
View File

@ -268,12 +268,10 @@ R_API int r_anal_var_count(RAnal *a, RAnalFunction *fcn, int kind) {
char *next, *ptr = varlist;
if (varlist && *varlist) {
do {
struct VarType vt;
char *word = sdb_anext (ptr, &next);
char *vardef = sdb_get (DB, sdb_fmt (1,
"var.0x%"PFMT64x".%c.%s",
fcn->addr, kind, word), 0);
int delta = atoi (word+2);
if (vardef) {
count ++;
} else {

2
libr/cons/cons.c
View File

@ -145,7 +145,7 @@ R_API void r_cons_break(void (*cb)(void *u), void *user) {
// TODO: add support for w32 ^C
}
R_API int r_cons_is_breaked() {
R_API bool r_cons_is_breaked() {
return I.breaked;
}

103
libr/core/anal.c
View File

@ -2151,9 +2151,17 @@ static int esilbreak_mem_read(RAnalEsil *esil, ut64 addr, ut8 *buf, int len) {
return 0; // fallback
}
static bool esil_anal_stop = false;
static void cccb(void*u) {
esil_anal_stop = true;
eprintf ("^C\n");
sleep (1);
}
R_API void r_core_anal_esil (RCore *core, const char *str) {
RAnalEsil *ESIL = core->anal->esil;
const char *pcname;
RAsmOp asmop;
RAnalOp op;
ut8 *buf = NULL;
int i, iend;
@ -2203,62 +2211,67 @@ R_API void r_core_anal_esil (RCore *core, const char *str) {
//eprintf ("Analyzing ESIL refs from 0x%"PFMT64x" - 0x%"PFMT64x"\n", addr, end);
// TODO: backup/restore register state before/after analysis
pcname = r_reg_get_name (core->anal->reg, R_REG_NAME_PC);
r_cons_break (NULL, NULL);
for (i=0; i<iend; i++) {
if (r_cons_is_breaked ()) {
esil_anal_stop = false;
r_cons_break (cccb, core);
//r_cons_break (NULL, NULL);
for (i=0; i < iend; i++) {
if (esil_anal_stop || r_cons_is_breaked ()) {
break;
}
cur = addr + i;
if (r_anal_op (core->anal, &op, cur, buf+i, iend-i)) {
#if 0
RAsmOp asmop;
r_asm_set_pc (core->assembler, cur);
if (r_asm_disassemble (core->assembler, &asmop, buf+i, iend-i)>0) {
op.mnemonic = strdup (asmop.buf_asm);
eprintf ("0x%08"PFMT64x" %s\n", cur, op.mnemonic); //R_STRBUF_SAFEGET (&op.esil));
if (!r_anal_op (core->anal, &op, cur, buf+i, iend-i)) {
i += minopsize - 1;
}
r_asm_set_pc (core->assembler, cur);
if (r_asm_disassemble (core->assembler, &asmop, buf+i, iend-i)>0) {
op.mnemonic = strdup (asmop.buf_asm);
//eprintf ("0x%08"PFMT64x" %s\n", cur, op.mnemonic);
}
if (op.size<1) {
i++;
continue;
}
if (1) {
const char *esilstr = R_STRBUF_SAFEGET (&op.esil);
r_anal_esil_set_pc (ESIL, cur);
if (!esilstr || !*esilstr) {
continue;
}
#endif
if (op.size<1) {
i++;
} else {
const char *esilstr = R_STRBUF_SAFEGET (&op.esil);
r_anal_esil_set_pc (ESIL, cur);
(void)r_anal_esil_parse (ESIL, esilstr);
//r_anal_esil_dumpstack (ESIL);
r_anal_esil_stack_free (ESIL);
i += op.size -1;
switch (op.type) {
case R_ANAL_OP_TYPE_LOAD:
{
ut64 dst = esilbreak_last_read;
(void)r_anal_esil_parse (ESIL, esilstr);
// looks like ^C is handled by esil_parse !!!!
r_cons_break (cccb, core);
//r_anal_esil_dumpstack (ESIL);
r_anal_esil_stack_free (ESIL);
i += op.size -1;
switch (op.type) {
case R_ANAL_OP_TYPE_LOAD:
{
ut64 dst = esilbreak_last_read;
if (myvalid (dst) && r_io_is_valid_offset (mycore->io, dst, 0)) {
// get pc
eprintf ("0x%08"PFMT64x" DATA 0x%08"PFMT64x"\n", cur, dst);
r_core_cmdf (core, "axd 0x%08"PFMT64x" 0x%"PFMT64x, cur, dst);
} else {
eprintf ("Unknown LOAD at 0x%08"PFMT64x"\n", cur);
}
}
break;
case R_ANAL_OP_TYPE_UJMP:
case R_ANAL_OP_TYPE_UCALL:
{
if (pcname && *pcname) {
ut64 dst = r_reg_getv (core->anal->reg, pcname);
if (myvalid (dst) && r_io_is_valid_offset (mycore->io, dst, 0)) {
// get pc
eprintf ("0x%08"PFMT64x" DATA 0x%08"PFMT64x"\n", cur, dst);
r_core_cmdf (core, "axd 0x%08"PFMT64x" 0x%"PFMT64x, cur, dst);
eprintf ("0x%08"PFMT64x" UCALL 0x%08"PFMT64x"\n", cur, dst);
r_core_cmdf (core, "axc 0x%08"PFMT64x" 0x%"PFMT64x, cur, dst);
} else {
eprintf ("Unknown LOAD at 0x%08"PFMT64x"\n", cur);
eprintf ("Unknown JMP/CALL at 0x%08"PFMT64x"\n", cur);
}
}
break;
case R_ANAL_OP_TYPE_UJMP:
case R_ANAL_OP_TYPE_UCALL:
{
if (pcname && *pcname) {
ut64 dst = r_reg_getv (core->anal->reg, pcname);
if (myvalid (dst) && r_io_is_valid_offset (mycore->io, dst, 0)) {
// get pc
eprintf ("0x%08"PFMT64x" UCALL 0x%08"PFMT64x"\n", cur, dst);
r_core_cmdf (core, "axc 0x%08"PFMT64x" 0x%"PFMT64x, cur, dst);
} else {
eprintf ("Unknown JMP/CALL at 0x%08"PFMT64x"\n", cur);
}
}
}
break;
}
break;
}
} else {
i += minopsize - 1;
}
}
r_cons_break_end ();

4
libr/include/r_cons.h
View File

@ -168,7 +168,7 @@ typedef struct r_cons_t {
int force_columns;
int fix_rows;
int fix_columns;
int breaked;
bool breaked;
int noflush;
FILE *fdin; // FILE? and then int ??
int fdout; // only used in pipe.c :?? remove?
@ -346,7 +346,7 @@ R_API char *r_cons_lastline (void);
typedef void (*RConsBreak)(void *);
R_API void r_cons_break(RConsBreak cb, void *user);
R_API void r_cons_break_end(void);
R_API int r_cons_is_breaked();
R_API bool r_cons_is_breaked();
/* pipe */
R_API int r_cons_pipe_open(const char *file, int fdn, int append);