Skip to content

Commit 11c9ae4

Browse files
trufaetrufae
authored
Rename RBinDbgItem into RBinAddrline ##apibreak
1 parent 407287a commit 11c9ae4

File tree

11 files changed

+55
-55
lines changed

11 files changed

+55
-55
lines changed

‎libr/bin/addrline.c

+10-10
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// R2R db/perf/dex
99
// R2R db/cmd/lea_intel
1010

11-
R_API void r_bin_addrline_free(RBinDbgItem *di) {
11+
R_API void r_bin_addrline_free(RBinAddrline *di) {
1212
free (di);
1313
}
1414

@@ -71,7 +71,7 @@ R_API bool r_bin_addrline_foreach(RBin *bin, RBinDbgInfoCallback cb, void *user)
7171
return false;
7272
}
7373

74-
R_API RBinDbgItem *r_bin_dbgitem_at(RBin *bin, ut64 addr) {
74+
R_API RBinAddrline *r_bin_dbgitem_at(RBin *bin, ut64 addr) {
7575
if (bin->cur && bin->cur->addrline.used) {
7676
RBinAddrLineStore *als = &bin->cur->addrline;
7777
if (als) {
@@ -84,7 +84,7 @@ R_API RBinDbgItem *r_bin_dbgitem_at(RBin *bin, ut64 addr) {
8484
r_strf_var (key, 64, "0x%"PFMT64x, addr); // TODO: use sdb_itoa because its faster
8585
char *data = sdb_get (bin->cur->sdb_addrinfo, key, 0);
8686
if (data) {
87-
RBinDbgItem *di = R_NEW0 (RBinDbgItem);
87+
RBinAddrline *di = R_NEW0 (RBinAddrline);
8888
di->addr = addr;
8989
// 0xaddr=file.c|line:column
9090
char *token = strchr (data, '|');
@@ -115,7 +115,7 @@ static bool addr2line_from_sdb(RBin *bin, ut64 addr, char *file, int len, int *l
115115
if (!bin->cur || !bin->cur->sdb_addrinfo) {
116116
return false;
117117
}
118-
RBinDbgItem *di = r_bin_dbgitem_at (bin, addr);
118+
RBinAddrline *di = r_bin_dbgitem_at (bin, addr);
119119
if (di) {
120120
if (line) {
121121
*line = di->line;
@@ -136,7 +136,7 @@ R_API bool r_bin_addr2line(RBin *bin, ut64 addr, char *file, int len, int *line,
136136

137137
if (bin->cur && bin->cur->addrline.used) {
138138
RBinAddrLineStore *als = &bin->cur->addrline;
139-
RBinDbgItem *item = als->al_get (als, addr);
139+
RBinAddrline *item = als->al_get (als, addr);
140140
if (item) {
141141
// TODO: honor path
142142
r_str_ncpy (file, item->file, len);
@@ -168,7 +168,7 @@ R_API bool r_bin_addr2line(RBin *bin, ut64 addr, char *file, int len, int *line,
168168
return false;
169169
}
170170

171-
static RBinDbgItem *r_bin_addrline_api(RBin *bin, ut64 addr) {
171+
static RBinAddrline *r_bin_addrline_api(RBin *bin, ut64 addr) {
172172
R_RETURN_VAL_IF_FAIL (bin, false);
173173
RBinFile *binfile = r_bin_cur (bin);
174174
RBinObject *o = r_bin_cur_object (bin);
@@ -184,7 +184,7 @@ static RBinDbgItem *r_bin_addrline_api(RBin *bin, ut64 addr) {
184184
int len = sizeof (file);
185185
if (cp && cp->dbginfo && cp->dbginfo->get_line) {
186186
if (cp->dbginfo->get_line (bin->cur, addr, file, len, &line, &column)) {
187-
RBinDbgItem *di = R_NEW0 (RBinDbgItem);
187+
RBinAddrline *di = R_NEW0 (RBinAddrline);
188188
di->file = strdup (file);
189189
di->addr = addr;
190190
di->line = line;
@@ -223,7 +223,7 @@ R_API R_NULLABLE char *r_bin_addrline_tostring(RBin *bin, ut64 addr, int origin)
223223
if (!bin->cur) {
224224
return NULL;
225225
}
226-
RBinDbgItem *di = r_bin_dbgitem_at (bin, addr);
226+
RBinAddrline *di = r_bin_dbgitem_at (bin, addr);
227227
if (!di) {
228228
di = r_bin_addrline_api (bin, addr);
229229
if (!di) {
@@ -293,12 +293,12 @@ R_API R_NULLABLE char *r_bin_addrline_tostring(RBin *bin, ut64 addr, int origin)
293293
return res;
294294
}
295295

296-
R_API void r_bin_addr2line_add(RBin *bin, ut64 addr, RBinDbgItem item) {
296+
R_API void r_bin_addr2line_add(RBin *bin, ut64 addr, RBinAddrline item) {
297297
eprintf ("ADD LINE\n");
298298
// const char *file, int line, int column) {
299299
}
300300

301-
R_API RBinDbgItem *r_bin_addr2line_get(RBin *bin, ut64 addr) {
301+
R_API RBinAddrline *r_bin_addr2line_get(RBin *bin, ut64 addr) {
302302
eprintf ("GET LINE\n");
303303
// const char *file, int line, int column) {
304304
return NULL;

‎libr/bin/bfile.c

+13-13
Original file line numberDiff line numberDiff line change
@@ -537,10 +537,10 @@ typedef struct {
537537
HtUP *ht;
538538
} AddrLineStore;
539539

540-
static bool al_add(RBinAddrLineStore *als, RBinDbgItem item) {
540+
static bool al_add(RBinAddrLineStore *als, RBinAddrline item) {
541541
AddrLineStore *store = als->storage;
542542
als->used = true;
543-
RBinDbgItemInternal *di;
543+
RBinAddrlineInternal *di;
544544
#if 0
545545
RListIter *iter;
546546
if (r_bloom_check (store->bloomGet, &item.addr, sizeof (item.addr))) {
@@ -559,12 +559,12 @@ static bool al_add(RBinAddrLineStore *als, RBinDbgItem item) {
559559
}
560560
// R_LOG_WARN ("ADD %llx %s %d %d", item.addr, item.file, item.line, item.column);
561561
#else
562-
RBinDbgItemInternal *hitem = ht_up_find (store->ht, item.addr, NULL);
562+
RBinAddrlineInternal *hitem = ht_up_find (store->ht, item.addr, NULL);
563563
if (hitem && hitem->line == item.line) {
564564
return false;
565565
}
566566
#endif
567-
di = R_NEW0 (RBinDbgItemInternal);
567+
di = R_NEW0 (RBinAddrlineInternal);
568568
di->addr = item.addr;
569569
di->line = item.line;
570570
di->colu = item.column;
@@ -579,7 +579,7 @@ static bool al_add(RBinAddrLineStore *als, RBinDbgItem item) {
579579
return true;
580580
}
581581

582-
static bool al_add_cu(RBinAddrLineStore *als, RBinDbgItem item) {
582+
static bool al_add_cu(RBinAddrLineStore *als, RBinAddrline item) {
583583
AddrLineStore *store = als->storage;
584584
// TODO: add storage for the compilation units here
585585
// we are just storing the filename in the stringpool for `idx` purposes
@@ -604,9 +604,9 @@ static void al_reset(RBinAddrLineStore *als) {
604604
#endif
605605
}
606606

607-
static RBinDbgItem* dbgitem_from_internal(RBinAddrLineStore *als, RBinDbgItemInternal *item) {
607+
static RBinAddrline* dbgitem_from_internal(RBinAddrLineStore *als, RBinAddrlineInternal *item) {
608608
AddrLineStore *store = als->storage;
609-
RBinDbgItem *di = R_NEW0 (RBinDbgItem);
609+
RBinAddrline *di = R_NEW0 (RBinAddrline);
610610
di->addr = item->addr;
611611
di->line = item->line;
612612
di->column = item->colu;
@@ -639,9 +639,9 @@ static void al_foreach(RBinAddrLineStore *als, RBinDbgInfoCallback cb, void *use
639639
AddrLineStore *store = als->storage;
640640

641641
RListIter *iter;
642-
RBinDbgItemInternal *item;
642+
RBinAddrlineInternal *item;
643643
r_list_foreach (store->list, iter, item) {
644-
RBinDbgItem *di = dbgitem_from_internal (als, item);
644+
RBinAddrline *di = dbgitem_from_internal (als, item);
645645
bool go_on = cb (user, di);
646646
r_bin_addrline_free (di);
647647
if (!go_on) {
@@ -654,7 +654,7 @@ static void al_del(RBinAddrLineStore *als, ut64 addr) {
654654
AddrLineStore *store = als->storage;
655655

656656
RListIter *iter;
657-
RBinDbgItemInternal *item;
657+
RBinAddrlineInternal *item;
658658
r_list_foreach (store->list, iter, item) {
659659
if (item->addr == addr) {
660660
r_list_delete (store->list, iter);
@@ -663,21 +663,21 @@ static void al_del(RBinAddrLineStore *als, ut64 addr) {
663663
}
664664
}
665665

666-
static RBinDbgItem* al_get(RBinAddrLineStore *als, ut64 addr) {
666+
static RBinAddrline* al_get(RBinAddrLineStore *als, ut64 addr) {
667667
AddrLineStore *store = als->storage;
668668
#if 0
669669
if (!r_bloom_check (store->bloomGet, &addr, sizeof (addr))) {
670670
return NULL;
671671
}
672672
#endif
673673
#if 1
674-
RBinDbgItemInternal *item = ht_up_find (store->ht, addr, NULL);
674+
RBinAddrlineInternal *item = ht_up_find (store->ht, addr, NULL);
675675
if (item) {
676676
return dbgitem_from_internal (als, item);
677677
}
678678
#else
679679
RListIter *iter;
680-
RBinDbgItemInternal *item;
680+
RBinAddrlineInternal *item;
681681
R_LOG_DEBUG ("ITEMS %d / %d", store->pool->count, r_list_length (store->list));
682682
r_list_foreach (store->list, iter, item) {
683683
if (item->addr == addr) {

‎libr/bin/dwarf.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -1246,7 +1246,7 @@ static inline void add_sdb_addrline(RBinFile *bf, ut64 addr, const char *file, u
12461246
sdb_add (s, fileline, offset_ptr, 0);
12471247
free (fileline);
12481248
#else
1249-
RBinDbgItem item = {
1249+
RBinAddrline item = {
12501250
.addr = addr,
12511251
.file = file,
12521252
.line = line,
@@ -2818,7 +2818,7 @@ R_API RBinDwarfDebugInfo *r_bin_dwarf_parse_info(RBin *bin, RBinDwarfDebugAbbrev
28182818
if (path && name) {
28192819
// printf ("0x%08"PFMT64x" %s %s\n", low, path, name);
28202820
char *abspath = (*name != '/')? r_str_newf ("%s/%s", path, name): strdup (name);
2821-
RBinDbgItem item = {
2821+
RBinAddrline item = {
28222822
.addr = low + 1, // XXX this low is wrong, we must add compilation units not addrline
28232823
.file = abspath,
28242824
.line = 0,
@@ -2851,9 +2851,9 @@ R_API RBinDwarfDebugInfo *r_bin_dwarf_parse_info(RBin *bin, RBinDwarfDebugAbbrev
28512851
return NULL;
28522852
}
28532853

2854-
static RBinDbgItem *row_new(ut64 addr, const char *file, int line, int col) {
2854+
static RBinAddrline *row_new(ut64 addr, const char *file, int line, int col) {
28552855
R_RETURN_VAL_IF_FAIL (file, NULL);
2856-
RBinDbgItem *row = R_NEW0 (RBinDbgItem);
2856+
RBinAddrline *row = R_NEW0 (RBinAddrline);
28572857
row->file = strdup (file);
28582858
row->addr = addr;
28592859
row->line = line;
@@ -2863,14 +2863,14 @@ static RBinDbgItem *row_new(ut64 addr, const char *file, int line, int col) {
28632863

28642864
static void row_free(void *p) {
28652865
if (p) {
2866-
RBinDbgItem *row = (RBinDbgItem *)p;
2866+
RBinAddrline *row = (RBinAddrline *)p;
28672867
r_bin_addrline_free (row);
28682868
}
28692869
}
28702870

2871-
static bool cb(void *user, RBinDbgItem *item) {
2871+
static bool cb(void *user, RBinAddrline *item) {
28722872
RList *list = (RList *)user;
2873-
RBinDbgItem *row = row_new (item->addr, item->file, item->line, item->column);
2873+
RBinAddrline *row = row_new (item->addr, item->file, item->line, item->column);
28742874
if (row) {
28752875
r_list_append (list, row);
28762876
}

‎libr/bin/format/mach0/coresymbolication.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ ut64 r_coresym_cache_element_pa2va(RCoreSymCacheElement *element, ut64 pa) {
117117
static void meta_add_fileline(RBinFile *bf, ut64 vaddr, ut32 size, RCoreSymCacheElementFLC *flc) {
118118
ut64 cursor = vaddr;
119119
ut64 end = cursor + R_MAX (size, 1);
120-
RBinDbgItem item = {
120+
RBinAddrline item = {
121121
.addr = vaddr,
122122
.file = flc->file,
123123
.line = flc->line

‎libr/bin/p/bin_dex.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ static void dex_parse_debug_item(RBinFile *bf, RBinDexClass *c, int MI, int MA,
613613
position->line = line;
614614
r_list_append (debug_positions, position);
615615
}
616-
RBinDbgItem item = {
616+
RBinAddrline item = {
617617
.addr = address + paddr,
618618
.file = getstr (dex, source_file_idx),
619619
.line = line,

‎libr/bin/p/bin_p9.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ static int apply_history(RBinFile *bf, ut64 pc, ut64 line, Sym *base, Sym **ret)
367367
line = line - delta + 1;
368368
}
369369

370-
RBinDbgItem item = {
370+
RBinAddrline item = {
371371
.addr = pc,
372372
.file = name,
373373
.line = line,

‎libr/core/cbin.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1122,7 +1122,7 @@ static void file_lines_free_kv(HtPPKv *kv) {
11221122
}
11231123

11241124
static bool bin_addrline(RCore *core, PJ *pj, int mode) {
1125-
RBinDbgItem *row;
1125+
RBinAddrline *row;
11261126
RListIter *iter;
11271127
if (IS_MODE_JSON (mode)) {
11281128
pj_a (pj);

‎libr/core/cmd_meta.inc.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ static bool print_addrinfo_json(void *user, const char *k, const char *v) {
259259
return true;
260260
}
261261

262-
static bool print_addrinfo2_json(void *user, RBinDbgItem *item) {
262+
static bool print_addrinfo2_json(void *user, RBinAddrline *item) {
263263
FilterStruct *fs = (FilterStruct *)user;
264264
ut64 offset = item->addr;
265265
if (!offset || offset == UT64_MAX) {
@@ -309,7 +309,7 @@ static bool print_addrinfo2_json(void *user, RBinDbgItem *item) {
309309
return true;
310310
}
311311

312-
static bool print_addrinfo2(void *user, RBinDbgItem *item) {
312+
static bool print_addrinfo2(void *user, RBinAddrline *item) {
313313
FilterStruct *fs = (FilterStruct*)user;
314314
ut64 offset = item->addr;
315315
if (!offset || offset == UT64_MAX) {
@@ -374,7 +374,7 @@ static int cmd_meta_add_fileline(RBinFile *bf, const char *fileline, ut64 offset
374374
if (line) {
375375
*line++ = 0;
376376
}
377-
RBinDbgItem item = {
377+
RBinAddrline item = {
378378
.addr = offset,
379379
.file = file,
380380
.line = line? atoi (line): 0,

‎libr/include/r_bin.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -393,12 +393,12 @@ typedef struct r_bin_file_options_t {
393393

394394
// typedef void (*r_bin_addr2line_add)(RBin *bin, ut64 addr, const char *file, int line, int column);
395395
typedef struct r_bin_addrline_store_t RBinAddrLineStore;
396-
typedef bool (*RBinAddrLineAdd)(RBinAddrLineStore *bin, RBinDbgItem item); // ut64 addr, const char *file, int line, int column);
397-
typedef RBinDbgItem* (*RBinAddrLineGet)(RBinAddrLineStore *bin, ut64 addr);
396+
typedef bool (*RBinAddrLineAdd)(RBinAddrLineStore *bin, RBinAddrline item); // ut64 addr, const char *file, int line, int column);
397+
typedef RBinAddrline* (*RBinAddrLineGet)(RBinAddrLineStore *bin, ut64 addr);
398398
typedef void (*RBinAddrLineReset)(RBinAddrLineStore *bin);
399399
typedef void (*RBinAddrLineResetAt)(RBinAddrLineStore *bin, ut64 addr);
400400
typedef void (*RBinAddrLineDel)(RBinAddrLineStore *bin, ut64 addr);
401-
typedef bool (*RBinDbgInfoCallback)(void *user, RBinDbgItem *item);
401+
typedef bool (*RBinDbgInfoCallback)(void *user, RBinAddrline *item);
402402
typedef RList *(*RBinAddrLineFiles)(RBinAddrLineStore *bin);
403403
typedef void (*RBinAddrLineForeach)(RBinAddrLineStore *bin, RBinDbgInfoCallback cb, void *user);
404404

@@ -919,13 +919,13 @@ R_API void r_bin_addrline_reset(RBin *bin);
919919
R_API void r_bin_addrline_reset_at(RBin *bin, ut64 addr);
920920
R_API bool r_bin_addrline_foreach(RBin *bin, RBinDbgInfoCallback item, void *user);
921921
R_API RList *r_bin_addrline_files(RBin *bin);
922-
R_API RBinDbgItem *r_bin_addrline_at(RBin *bin, ut64 addr);
923-
R_API void r_bin_addrline_free(RBinDbgItem *di);
922+
R_API RBinAddrline *r_bin_addrline_at(RBin *bin, ut64 addr);
923+
R_API void r_bin_addrline_free(RBinAddrline *di);
924924
R_API bool r_bin_addr2line(RBin *bin, ut64 addr, char *file, int len, int *line, int *column); // R2_600 - must be deprecated
925925
R_API char *r_bin_addrline_tostring(RBin *bin, ut64 addr, int origin);
926926

927-
R_API void r_bin_addr2line_add(RBin *bin, ut64 addr, RBinDbgItem item);
928-
R_API RBinDbgItem *r_bin_addr2line_get(RBin *bin, ut64 addr);
927+
R_API void r_bin_addr2line_add(RBin *bin, ut64 addr, RBinAddrline item);
928+
R_API RBinAddrline *r_bin_addr2line_get(RBin *bin, ut64 addr);
929929

930930
/* bin_write.c */
931931
R_API bool r_bin_wr_addlib(RBin *bin, const char *lib);

‎libr/include/r_bin_dwarf.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -695,15 +695,15 @@ typedef struct {
695695
const char *path;
696696
ut32 line;
697697
ut32 column;
698-
} RBinDbgItem;
698+
} RBinAddrline;
699699

700700
typedef struct {
701701
ut64 addr;
702702
ut32 path;
703703
ut32 file;
704704
ut32 line;
705705
ut32 colu;
706-
} RBinDbgItemInternal;
706+
} RBinAddrlineInternal;
707707

708708
#define DWARF_INIT_LEN_64 0xffffffff
709709
typedef union {

0 commit comments

Comments
 (0)