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

Tls some globals in the esil backend for debug

Browse Source
This commit is contained in:
pancake 2022-08-24 01:42:28 +02:00
parent 5ce3c287db
commit b4ed2e26f0
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libr/debug/desil.c
View File

@ -16,7 +16,6 @@
# expression can be a number or a range (if .. is found) # expression can be a number or a range (if .. is found)
# The <=, >=, ==, <, > comparisons are also supported # The <=, >=, ==, <, > comparisons are also supported
#endif #endif
typedef struct { typedef struct {
@ -26,11 +25,11 @@ typedef struct {
} EsilBreak; } EsilBreak;
// TODO: Kill those globals // TODO: Kill those globals
RDebug *dbg = NULL; static R_TH_LOCAL RDebug *dbg = NULL;
static bool has_match = false; static R_TH_LOCAL bool has_match = false;
static int prestep = 1; // TODO: make it configurable static R_TH_LOCAL int prestep = 1; // TODO: make it configurable
static ut64 opc = 0; static R_TH_LOCAL ut64 opc = 0;
RList *esil_watchpoints = NULL; static R_TH_LOCAL RList *esil_watchpoints = NULL;
#define EWPS esil_watchpoints #define EWPS esil_watchpoints
#define ESIL dbg->anal->esil #define ESIL dbg->anal->esil
@ -210,6 +209,7 @@ static bool esilbreak_reg_write(RAnalEsil *esil, const char *regname, ut64 *num)
} }
R_API void r_debug_esil_prestep(RDebug *d, int p) { R_API void r_debug_esil_prestep(RDebug *d, int p) {
r_return_if_fail (d);
prestep = p; prestep = p;
} }
@ -243,7 +243,7 @@ R_API bool r_debug_esil_stepi(RDebug *d) {
// required when a exxpression is like <= == .. // required when a exxpression is like <= == ..
// otherwise it will stop at the next instruction // otherwise it will stop at the next instruction
if (r_debug_step (dbg, 1)<1) { if (r_debug_step (dbg, 1)<1) {
eprintf ("Step failed\n"); R_LOG_WARN ("Step failed");
return false; return false;
} }
r_debug_reg_sync (dbg, R_REG_TYPE_GPR, false); r_debug_reg_sync (dbg, R_REG_TYPE_GPR, false);
@ -252,7 +252,7 @@ R_API bool r_debug_esil_stepi(RDebug *d) {
if (r_anal_op (dbg->anal, &op, opc, obuf, sizeof (obuf), R_ANAL_OP_MASK_ESIL)) { if (r_anal_op (dbg->anal, &op, opc, obuf, sizeof (obuf), R_ANAL_OP_MASK_ESIL)) {
if (esilbreak_check_pc (dbg, opc)) { if (esilbreak_check_pc (dbg, opc)) {
eprintf ("STOP AT 0x%08"PFMT64x"\n", opc); R_LOG_WARN ("STOP AT 0x%08"PFMT64x, opc);
ret = 0; ret = 0;
} else { } else {
r_anal_esil_set_pc (ESIL, opc); r_anal_esil_set_pc (ESIL, opc);
@ -266,7 +266,7 @@ R_API bool r_debug_esil_stepi(RDebug *d) {
if (!prestep) { if (!prestep) {
if (ret && !has_match) { if (ret && !has_match) {
if (r_debug_step (dbg, 1) < 1) { if (r_debug_step (dbg, 1) < 1) {
eprintf ("Step failed\n"); R_LOG_WARN ("Step has failed");
return 0; return 0;
} }
r_debug_reg_sync (dbg, R_REG_TYPE_GPR, false); r_debug_reg_sync (dbg, R_REG_TYPE_GPR, false);
@ -277,6 +277,7 @@ R_API bool r_debug_esil_stepi(RDebug *d) {
} }
R_API ut64 r_debug_esil_step(RDebug *dbg, ut32 count) { R_API ut64 r_debug_esil_step(RDebug *dbg, ut32 count) {
r_return_val_if_fail (dbg, UT64_MAX);
count++; count++;
has_match = false; has_match = false;
r_cons_break_push (NULL, NULL); r_cons_break_push (NULL, NULL);
@ -285,7 +286,7 @@ R_API ut64 r_debug_esil_step(RDebug *dbg, ut32 count) {
break; break;
} }
if (has_match) { if (has_match) {
eprintf ("EsilBreak match at 0x%08"PFMT64x"\n", opc); R_LOG_INFO ("EsilBreak match at 0x%08"PFMT64x, opc);
break; break;
} }
if (count > 0) { if (count > 0) {