From 3a1797831285329c82fc1cbd1360846b3832b680 Mon Sep 17 00:00:00 2001 From: Juho Kuisma Date: Tue, 28 Jan 2025 19:06:42 +0200 Subject: [PATCH] Rename RDebugTracepoint -> RDebugTracepointItem --- libr/core/agraph.c | 2 +- libr/core/canal.c | 6 +++--- libr/core/cmd_anal.inc.c | 2 +- libr/core/cmd_debug.inc.c | 8 ++++---- libr/core/disasm.c | 4 ++-- libr/debug/trace.c | 22 +++++++++++----------- libr/include/r_debug.h | 11 +++++------ 7 files changed, 27 insertions(+), 28 deletions(-) diff --git a/libr/core/agraph.c b/libr/core/agraph.c index 1ebc345f0fee4..87873aba28c2c 100644 --- a/libr/core/agraph.c +++ b/libr/core/agraph.c @@ -2409,7 +2409,7 @@ static void fold_asm_trace(RCore *core, RAGraph *g) { continue; } ut64 addr = r_num_get (NULL, n->title); - RDebugTracepoint *tp = r_debug_trace_get (core->dbg, addr); + RDebugTracepointItem *tp = r_debug_trace_get (core->dbg, addr); n->is_mini = (tp == NULL); } g->need_update_dim = 1; diff --git a/libr/core/canal.c b/libr/core/canal.c index a24f10e381cc4..fe98e1f262ee9 100644 --- a/libr/core/canal.c +++ b/libr/core/canal.c @@ -1829,7 +1829,7 @@ static int core_anal_graph_construct_nodes(RCore *core, RAnalFunction *fcn, int snprintf (key, sizeof (key), "bb.0x%08"PFMT64x".size", bbi->addr); sdb_num_set (DB, key, bbi->size, 0); // bb..size= } else if (is_json) { - RDebugTracepoint *t = r_debug_trace_get (core->dbg, bbi->addr); + RDebugTracepointItem *t = r_debug_trace_get (core->dbg, bbi->addr); pj_o (pj); pj_kn (pj, "offset", bbi->addr); pj_kn (pj, "size", bbi->size); @@ -3416,11 +3416,11 @@ static int fcn_print_detail(RCore *core, RAnalFunction *fcn) { return 0; } -R_VEC_TYPE(RVecDebugTracepoint, RDebugTracepoint); +R_VEC_TYPE(RVecDebugTracepoint, RDebugTracepointItem); static bool is_fcn_traced(RDebugTrace *traced, RAnalFunction *fcn) { int tag = traced->tag; - RDebugTracepoint *trace; + RDebugTracepointItem *trace; R_VEC_FOREACH (traced->traces, trace) { if (!trace->tag || (tag & trace->tag)) { if (r_anal_function_contains (fcn, trace->addr)) { diff --git a/libr/core/cmd_anal.inc.c b/libr/core/cmd_anal.inc.c index 1d68d767b2cd4..6071fbd4b0b49 100644 --- a/libr/core/cmd_anal.inc.c +++ b/libr/core/cmd_anal.inc.c @@ -3316,7 +3316,7 @@ static void print_bb(PJ *pj, const RAnalBlock *b, const RAnalFunction *fcn, cons } static bool anal_fcn_list_bb(RCore *core, const char *input, bool one) { - RDebugTracepoint *tp = NULL; + RDebugTracepointItem *tp = NULL; RListIter *iter; RAnalBlock *b; int mode = 0; diff --git a/libr/core/cmd_debug.inc.c b/libr/core/cmd_debug.inc.c index d569e59c6d132..0c9f9e65d90ab 100644 --- a/libr/core/cmd_debug.inc.c +++ b/libr/core/cmd_debug.inc.c @@ -5415,11 +5415,11 @@ static ut8 *getFileData(RCore *core, const char *arg, int *sz) { return out; } -R_VEC_TYPE(RVecDebugTracepoint, RDebugTracepoint); +R_VEC_TYPE(RVecDebugTracepoint, RDebugTracepointItem); static int cmd_debug(void *data, const char *input) { RCore *core = (RCore *)data; - RDebugTracepoint *t; + RDebugTracepointItem *t; bool do_follow = false; const char *ptr; ut64 addr; @@ -5427,7 +5427,7 @@ static int cmd_debug(void *data, const char *input) { RListIter *iter; RList *list; RDebugPid *p; - RDebugTracepoint *trace; + RDebugTracepointItem *trace; RAnalOp *op; int ret = 0; ut64 old_seek = core->offset; @@ -5580,7 +5580,7 @@ static int cmd_debug(void *data, const char *input) { } RAnalOp *op = r_core_op_anal (core, addr, R_ARCH_OP_MASK_HINT); if (op) { - RDebugTracepoint *tp = r_debug_trace_add (core->dbg, addr, op->size); + RDebugTracepointItem *tp = r_debug_trace_add (core->dbg, addr, op->size); if (tp) { tp->count = count; r_anal_trace_bb (core->anal, addr); diff --git a/libr/core/disasm.c b/libr/core/disasm.c index fa060240d8494..790698e676c8e 100644 --- a/libr/core/disasm.c +++ b/libr/core/disasm.c @@ -3424,7 +3424,7 @@ static void ds_print_offset(RDisasmState *ds) { // label = r_core_get_reloff (ds->core, ds->show_reloff_to, at, &delta); } if (ds->show_trace) { - RDebugTracepoint *tp = r_debug_trace_get (ds->core->dbg, ds->at); + RDebugTracepointItem *tp = r_debug_trace_get (ds->core->dbg, ds->at); show_trace = (tp? !!tp->count: false); } if (ds->hint && ds->hint->high) { @@ -3478,7 +3478,7 @@ static void ds_print_op_size(RDisasmState *ds) { } static void ds_print_trace(RDisasmState *ds) { - RDebugTracepoint *tp = NULL; + RDebugTracepointItem *tp = NULL; if (ds->show_trace && ds->show_trace_stats) { tp = r_debug_trace_get (ds->core->dbg, ds->at); r_cons_printf ("%02x:%04x ", tp?tp->times:0, tp?tp->count:0); diff --git a/libr/debug/trace.c b/libr/debug/trace.c index fa58f7919c938..02219168063a7 100644 --- a/libr/debug/trace.c +++ b/libr/debug/trace.c @@ -4,7 +4,7 @@ #include #include -R_VEC_TYPE(RVecDebugTracepoint, RDebugTracepoint); +R_VEC_TYPE(RVecDebugTracepoint, RDebugTracepointItem); R_API RDebugTrace *r_debug_trace_new(void) { RDebugTrace *t = R_NEW0 (RDebugTrace); @@ -203,7 +203,7 @@ R_API void r_debug_trace_at(RDebug *dbg, const char *str) { dbg->trace->addresses = R_STR_ISNOTEMPTY (str)? strdup (str): NULL; } -R_API RDebugTracepoint *r_debug_trace_get(RDebug *dbg, ut64 addr) { +R_API RDebugTracepointItem *r_debug_trace_get(RDebug *dbg, ut64 addr) { R_RETURN_VAL_IF_FAIL (dbg && dbg->trace, NULL); const int tag = dbg->trace->tag; r_strf_var (key, 64, "%d.%"PFMT64x, tag, addr); @@ -229,7 +229,7 @@ static void r_debug_trace_list_json(RDebug *dbg) { pj_kn (pj, "tag", tag); pj_ka (pj, "traces"); - RDebugTracepoint *trace; + RDebugTracepointItem *trace; R_VEC_FOREACH (dbg->trace->traces, trace) { if (!trace->tag || (tag & trace->tag)) { pj_o (pj); @@ -251,7 +251,7 @@ static void r_debug_trace_list_json(RDebug *dbg) { static void r_debug_trace_list_quiet(RDebug *dbg) { int tag = dbg->trace->tag; - RDebugTracepoint *trace; + RDebugTracepointItem *trace; R_VEC_FOREACH (dbg->trace->traces, trace) { if (!trace->tag || (tag & trace->tag)) { dbg->cb_printf ("0x%"PFMT64x"\n", trace->addr); @@ -274,7 +274,7 @@ static void r_debug_trace_list_table(RDebug *dbg, ut64 offset, RTable *t) { bool flag = false; int tag = dbg->trace->tag; - RDebugTracepoint *trace; + RDebugTracepointItem *trace; R_VEC_FOREACH (dbg->trace->traces, trace) { if (!trace->tag || (tag & trace->tag)) { RListInfo *info = RVecListInfo_emplace_back (&info_vec); @@ -308,7 +308,7 @@ static void r_debug_trace_list_table(RDebug *dbg, ut64 offset, RTable *t) { static void r_debug_trace_list_make(RDebug *dbg) { int tag = dbg->trace->tag; - RDebugTracepoint *trace; + RDebugTracepointItem *trace; R_VEC_FOREACH (dbg->trace->traces, trace) { if (!trace->tag || (tag & trace->tag)) { dbg->cb_printf ("dt+ 0x%"PFMT64x" %d\n", trace->addr, trace->times); @@ -318,7 +318,7 @@ static void r_debug_trace_list_make(RDebug *dbg) { static void r_debug_trace_list_default(RDebug *dbg) { int tag = dbg->trace->tag; - RDebugTracepoint *trace; + RDebugTracepointItem *trace; R_VEC_FOREACH (dbg->trace->traces, trace) { if (!trace->tag || (tag & trace->tag)) { dbg->cb_printf ("0x%08"PFMT64x" size=%d count=%d times=%d tag=%d\n", @@ -360,7 +360,7 @@ static bool r_debug_trace_is_traceable(RDebug *dbg, ut64 addr) { return true; } -R_API RDebugTracepoint *r_debug_trace_add(RDebug *dbg, ut64 addr, int size) { +R_API RDebugTracepointItem *r_debug_trace_add(RDebug *dbg, ut64 addr, int size) { R_RETURN_VAL_IF_FAIL (dbg, NULL); const int tag = dbg->trace->tag; if (!r_debug_trace_is_traceable (dbg, addr)) { @@ -368,9 +368,9 @@ R_API RDebugTracepoint *r_debug_trace_add(RDebug *dbg, ut64 addr, int size) { } r_anal_trace_bb (dbg->anal, addr); int last_times = 1; - RDebugTracepoint *last = r_debug_trace_get (dbg, addr); + RDebugTracepointItem *last = r_debug_trace_get (dbg, addr); if (last) { - RDebugTracepoint *endtp = RVecDebugTracepoint_last (dbg->trace->traces); + RDebugTracepointItem *endtp = RVecDebugTracepoint_last (dbg->trace->traces); if (last == endtp) { // avoid tracing the same instruction twice return NULL; @@ -379,7 +379,7 @@ R_API RDebugTracepoint *r_debug_trace_add(RDebug *dbg, ut64 addr, int size) { } int pos = RVecDebugTracepoint_length (dbg->trace->traces) + 1; // emplacedback pointers are not constant, so we may rely on the index instead of ptr - RDebugTracepoint *tp = RVecDebugTracepoint_emplace_back (dbg->trace->traces); + RDebugTracepointItem *tp = RVecDebugTracepoint_emplace_back (dbg->trace->traces); if (R_LIKELY (tp)) { tp->stamp = r_time_now (); tp->addr = addr; diff --git a/libr/include/r_debug.h b/libr/include/r_debug.h index 3dc3875919270..350d5ae9d404d 100644 --- a/libr/include/r_debug.h +++ b/libr/include/r_debug.h @@ -237,9 +237,8 @@ typedef struct r_debug_trace_t { HtPP *ht; // use rbtree like the iocache? } RDebugTrace; -// R2_590 rename to traceitem for consistency? -#define r_debug_tracepoint_free(x) free((x)) -typedef struct r_debug_tracepoint_t { +#define r_debug_tracepoint_item_free(x) free((x)) +typedef struct r_debug_tracepoint_item_t { ut64 addr; ut64 tags; // XXX int tag; // XXX @@ -253,7 +252,7 @@ typedef struct r_debug_tracepoint_t { ut64 refaddr; int direction #endif -} RDebugTracepoint; +} RDebugTracepointItem; typedef struct r_debug_t RDebug; @@ -588,9 +587,9 @@ R_API void r_debug_trace_reset(RDebug *dbg); R_API bool r_debug_trace_pc(RDebug *dbg, ut64 pc); R_API void r_debug_trace_op(RDebug *dbg, RAnalOp *op); R_API void r_debug_trace_at(RDebug *dbg, const char *str); -R_API RDebugTracepoint *r_debug_trace_get(RDebug *dbg, ut64 addr); +R_API RDebugTracepointItem *r_debug_trace_get(RDebug *dbg, ut64 addr); R_API void r_debug_trace_list(RDebug *dbg, int mode, ut64 offset, RTable *t); -R_API RDebugTracepoint *r_debug_trace_add(RDebug *dbg, ut64 addr, int size); +R_API RDebugTracepointItem *r_debug_trace_add(RDebug *dbg, ut64 addr, int size); R_API RDebugTrace *r_debug_trace_new(void); R_API void r_debug_trace_free(RDebugTrace *dbg); R_API int r_debug_trace_tag(RDebug *dbg, int tag);