Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-23 22:36:27 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

core/bin: print all info in 'iej'

Browse Source 
fix #3249

* core/bin: remove workaround that is not necessary anymore
This commit is contained in:
Riccardo Schirone 2015-09-07 23:49:03 +02:00
parent 82c390cb7a
commit 7f72631389
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libr/core/bin.c
View File

@ -557,11 +557,23 @@ static int bin_entry (RCore *r, int mode, ut64 laddr, int va) {
if (mode & R_CORE_BIN_JSON) {
r_cons_printf ("[");
r_list_foreach (entries, iter, entry) {
ut64 paddr = entry->paddr;
ut64 vaddr = r_bin_get_vaddr (r->bin, paddr, entry->vaddr);
ut64 at = rva (r->bin, entry->paddr, entry->vaddr, va);
r_cons_printf ("%s%"PFMT64d,
iter->p? ",":"", at);
if (at > vaddr) {
vaddr = at;
}
if (!va) {
vaddr = paddr;
}
r_cons_printf ("%s{\"vaddr\":%" PFMT64d ","
"\"paddr\":%" PFMT64d ","
"\"baddr\":%" PFMT64d ","
"\"laddr\":%" PFMT64d "}",
iter->p ? "," : "", vaddr, paddr, baddr, laddr);
}
r_cons_printf ("]");
r_cons_newline ();
} else
if (mode & R_CORE_BIN_SIMPLE) {
r_list_foreach (entries, iter, entry) {
@ -598,10 +610,6 @@ static int bin_entry (RCore *r, int mode, ut64 laddr, int va) {
r_cons_printf ("f entry%i 1 @ 0x%08"PFMT64x"\n", i, vaddr);
r_cons_printf ("s entry%i\n", i);
} else {
/* XXX: just a temporary workaround */
if (!baddr && vaddr > paddr) {
baddr = vaddr - paddr;
}
r_cons_printf (
"vaddr=0x%08"PFMT64x
" paddr=0x%08"PFMT64x