Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-01 00:51:19 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix pdfj fixes

Browse Source
This commit is contained in:
pancake 2017-02-05 01:24:50 +01:00
parent 71d36d3dd6
commit 54b8fe1bb3
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libr/core/canal.c
View File

@ -1005,7 +1005,7 @@ static int core_anal_graph_nodes(RCore *core, RAnalFunction *fcn, int opts) {
"d}",
t->count, t->times);
}
r_cons_printf (",\"ops\":");
r_cons_printf (",\"ops\":[");
if (buf) {
r_io_read_at (core->io, bbi->addr, buf, bbi->size);
r_core_print_disasm_json (core, bbi->addr, buf, bbi->size, 0);
@ -1013,7 +1013,7 @@ static int core_anal_graph_nodes(RCore *core, RAnalFunction *fcn, int opts) {
} else {
eprintf ("cannot allocate %d bytes\n", bbi->size);
}
r_cons_printf ("}");
r_cons_printf ("]}");
continue;
}
if (bbi->jump != UT64_MAX) {

16
libr/core/cmd_print.c
View File

@ -241,7 +241,10 @@ R_API void r_core_set_asm_configs(RCore *core, char *arch, ut32 bits, int segoff
static void cmd_pDj (RCore *core, const char *arg) {
int bsize = r_num_math (core->num, arg);
if (bsize < 0) bsize = -bsize;
if (bsize < 0) {
bsize = -bsize;
}
r_cons_print ("[");
if (bsize <= core->blocksize) {
r_core_print_disasm_json (core, core->offset, core->block,
bsize, 0);
@ -255,12 +258,14 @@ static void cmd_pDj (RCore *core, const char *arg) {
eprintf ("cannot allocate %d bytes\n", bsize);
}
}
r_cons_print ("]\n");
}
static void cmd_pdj (RCore *core, const char *arg) {
int nblines = r_num_math (core->num, arg);
r_cons_print ("[");
r_core_print_disasm_json (core, core->offset, core->block, core->blocksize, nblines);
r_cons_newline ();
r_cons_print ("]\n");
}
static int process_input(RCore *core, const char *input, ut64* blocksize, char **asm_arch, ut32 *bits) {
@ -3133,7 +3138,7 @@ static int cmd_print(void *data, const char *input) {
r_cons_printf ("\"name\":\"%s\"", f->name);
r_cons_printf (",\"size\":%d", fcn_size);
r_cons_printf (",\"addr\":%"PFMT64d, f->addr);
r_cons_printf (",\"ops\":");
r_cons_printf (",\"ops\":[");
// instructions are all outputted as a json list
func_buf = calloc (cont_size, 1);
bool first = true;
@ -3147,7 +3152,6 @@ static int cmd_print(void *data, const char *input) {
loc_buf = calloc (cont_size, 1);;
r_io_read_at (core->io, tmp_func->addr, loc_buf, cont_size);
if (!first) {
r_cons_drop (1);
r_cons_print (",");
}
r_core_print_disasm_json (core, tmp_func->addr, loc_buf, cont_size, 0);
@ -3157,7 +3161,6 @@ static int cmd_print(void *data, const char *input) {
cont_size = tmp_get_contsize (f);
r_io_read_at (core->io, f->addr, func_buf, cont_size);
if (!first) {
r_cons_drop (1);
r_cons_print (",");
}
r_core_print_disasm_json (core, f->addr, func_buf, cont_size, 0);
@ -3168,7 +3171,6 @@ static int cmd_print(void *data, const char *input) {
loc_buf = calloc (cont_size, 1);;
r_io_read_at (core->io, tmp_func->addr, loc_buf, cont_size);
if (!first) {
r_cons_drop (1);
r_cons_print (",");
}
r_core_print_disasm_json (core, tmp_func->addr, loc_buf, cont_size, 0);
@ -3178,7 +3180,7 @@ static int cmd_print(void *data, const char *input) {
} else {
eprintf ("cannot allocate %d bytes\n", fcn_size);
}
r_cons_printf ("}\n");
r_cons_printf ("]}\n");
pd_result = 0;
} else if (f) {
for (; locs_it && (tmp_func = locs_it->data); locs_it = locs_it->n) {

4
libr/core/disasm.c
View File

@ -3875,7 +3875,7 @@ R_API int r_core_print_disasm_json(RCore *core, ut64 addr, ut8 *buf, int nb_byte
ut64 old_offset = core->offset;
ut64 at;
int dis_opcodes = 0;
r_cons_printf ("[");
//r_cons_printf ("[");
int limit_by = 'b';
if (nb_opcodes != 0) {
@ -4113,7 +4113,7 @@ R_API int r_core_print_disasm_json(RCore *core, ut64 addr, ut8 *buf, int nb_byte
break;
}
}
r_cons_printf ("]");
// r_cons_printf ("]");
core->offset = old_offset;
r_anal_op_fini (&ds->analop);
return true;