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

Dont call RCore.seek() and read a new buffer in disasm ##thready

Browse Source
This commit is contained in:
pancake 2022-09-23 22:39:51 +02:00 committed by GitHub
parent 16cb83a19c
commit 98f94efb8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libr/core/disasm.c
View File

@ -6652,7 +6652,6 @@ R_API int r_core_print_disasm_json(RCore *core, ut64 addr, ut8 *buf, int nb_byte
break; break;
} }
} }
core->offset = old_offset;
r_anal_op_fini (&ds->analop); r_anal_op_fini (&ds->analop);
ds_free (ds); ds_free (ds);
if (!result) { if (!result) {
@ -6809,7 +6808,7 @@ R_API int r_core_disasm_pdi_with_buf(RCore *core, ut64 address, ut8 *buf, ut32 n
int flags = r_config_get_i (core->config, "asm.flags"); int flags = r_config_get_i (core->config, "asm.flags");
bool asm_immtrim = r_config_get_i (core->config, "asm.imm.trim"); bool asm_immtrim = r_config_get_i (core->config, "asm.imm.trim");
int i = 0, j, ret, err = 0; int i = 0, j, ret, err = 0;
ut64 old_offset = core->offset; ut64 addr = core->offset;
const char *color_reg = R_CONS_COLOR_DEF (reg, Color_YELLOW); const char *color_reg = R_CONS_COLOR_DEF (reg, Color_YELLOW);
const char *color_num = R_CONS_COLOR_DEF (num, Color_CYAN); const char *color_num = R_CONS_COLOR_DEF (num, Color_CYAN);
const size_t addrbytes = buf ? 1 : core->io->addrbytes; const size_t addrbytes = buf ? 1 : core->io->addrbytes;
@ -6822,14 +6821,16 @@ R_API int r_core_disasm_pdi_with_buf(RCore *core, ut64 address, ut8 *buf, ut32 n
if (nb_opcodes < 1 && nb_bytes < 1) { if (nb_opcodes < 1 && nb_bytes < 1) {
return 0; return 0;
} }
bool mybuf = false;
if (!buf) { if (!buf) {
r_core_seek (core, address, true); buf = malloc (nb_bytes);
buf = core->block; mybuf = true;
r_io_read_at (core->io, address, buf, nb_bytes);
} }
addr = address;
ut64 addr_end = address + nb_bytes;
r_cons_break_push (NULL, NULL); r_cons_break_push (NULL, NULL);
r_core_seek (core, address, false);
int midflags = r_config_get_i (core->config, "asm.flags.middle"); int midflags = r_config_get_i (core->config, "asm.flags.middle");
int midbb = r_config_get_i (core->config, "asm.bbmiddle"); int midbb = r_config_get_i (core->config, "asm.bbmiddle");
int minopsz = r_anal_archinfo (core->anal, R_ANAL_ARCHINFO_MIN_OP_SIZE); int minopsz = r_anal_archinfo (core->anal, R_ANAL_ARCHINFO_MIN_OP_SIZE);
@ -6850,7 +6851,7 @@ toro:
err = 1; err = 1;
break; break;
} }
ut64 at = core->offset + i; ut64 at = addr + i;
if (flags) { if (flags) {
if (fmt != 'e') { // pie if (fmt != 'e') { // pie
RFlagItem *item = r_flag_get_i (core->flags, at); RFlagItem *item = r_flag_get_i (core->flags, at);
@ -6873,7 +6874,7 @@ toro:
case R_META_TYPE_DATA: case R_META_TYPE_DATA:
i += meta_size; i += meta_size;
{ {
ut64 at = core->offset + i; ut64 at = addr + i;
int hexlen = nb_bytes - i; int hexlen = nb_bytes - i;
int delta = at - meta_start; int delta = at - meta_start;
if (meta_size < hexlen) { if (meta_size < hexlen) {
@ -6910,13 +6911,13 @@ toro:
break; break;
} }
} }
r_asm_set_pc (core->rasm, core->offset + i); r_asm_set_pc (core->rasm, addr + i);
ret = r_asm_disassemble (core->rasm, &asmop, buf + addrbytes * i, ret = r_asm_disassemble (core->rasm, &asmop, buf + addrbytes * i,
nb_bytes - addrbytes * i); nb_bytes - addrbytes * i);
if (midflags || midbb) { if (midflags || midbb) {
RDisasmState ds = { RDisasmState ds = {
.oplen = ret, .oplen = ret,
.at = core->offset + i, .at = addr + i,
.midflags = midflags .midflags = midflags
}; };
int skip_bytes_flag = 0, skip_bytes_bb = 0; int skip_bytes_flag = 0, skip_bytes_bb = 0;
@ -6934,9 +6935,9 @@ toro:
} }
} }
if (fmt == 'C') { if (fmt == 'C') {
const char *comment = r_meta_get_string (core->anal, R_META_TYPE_COMMENT, core->offset + i); const char *comment = r_meta_get_string (core->anal, R_META_TYPE_COMMENT, addr + i);
if (comment) { if (comment) {
r_cons_printf ("0x%08" PFMT64x " %s\n", core->offset + i, comment); r_cons_printf ("0x%08" PFMT64x " %s\n", addr + i, comment);
} }
i += ret; i += ret;
continue; continue;
@ -6966,7 +6967,7 @@ toro:
0 0
}; };
char *tmpopstr, *opstr = NULL; char *tmpopstr, *opstr = NULL;
r_anal_op (core->anal, &analop, core->offset + i, r_anal_op (core->anal, &analop, addr + i,
buf + addrbytes * i, nb_bytes - addrbytes * i, R_ANAL_OP_MASK_ALL); buf + addrbytes * i, nb_bytes - addrbytes * i, R_ANAL_OP_MASK_ALL);
tmpopstr = r_anal_op_to_string (core->anal, &analop); tmpopstr = r_anal_op_to_string (core->anal, &analop);
if (fmt == 'e') { // pie if (fmt == 'e') { // pie
@ -7014,8 +7015,8 @@ toro:
RAnalOp aop = { RAnalOp aop = {
0 0
}; };
RAnalFunction *f = r_anal_get_fcn_in (core->anal, core->offset + i, R_ANAL_FCN_TYPE_NULL); RAnalFunction *f = r_anal_get_fcn_in (core->anal, addr + i, R_ANAL_FCN_TYPE_NULL);
r_anal_op (core->anal, &aop, core->offset + i, r_anal_op (core->anal, &aop, addr + i,
buf + addrbytes * i, nb_bytes - addrbytes * i, R_ANAL_OP_MASK_BASIC); buf + addrbytes * i, nb_bytes - addrbytes * i, R_ANAL_OP_MASK_BASIC);
asm_str = r_print_colorize_opcode (core->print, asm_str, color_reg, color_num, false, f ? f->addr : 0); asm_str = r_print_colorize_opcode (core->print, asm_str, color_reg, color_num, false, f ? f->addr : 0);
r_cons_printf ("%s%s"Color_RESET "\n", r_cons_printf ("%s%s"Color_RESET "\n",
@ -7031,14 +7032,17 @@ toro:
i += ret; i += ret;
r_asm_op_fini (&asmop); r_asm_op_fini (&asmop);
} }
if (buf == core->block && nb_opcodes > 0 && j < nb_opcodes) { if ((nb_opcodes > 0 && j < nb_opcodes) && (addr + i < addr_end)) {
r_core_seek (core, core->offset + i, true); addr += i;
r_io_read_at (core->io, addr, buf, nb_bytes);
i = 0; i = 0;
goto toro; goto toro;
} }
if (mybuf) {
free (buf);
}
r_config_set_b (core->config, "asm.marks", asmmarks); r_config_set_b (core->config, "asm.marks", asmmarks);
r_cons_break_pop (); r_cons_break_pop ();
r_core_seek (core, old_offset, true);
return err; return err;
} }