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

core: fix @B and add some undocumented commands

Browse Source
This commit is contained in:
Riccardo Schirone 2018-03-02 16:11:07 +01:00 committed by radare
parent 62850d9000
commit cb002bc25c
2 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libr/core/cmd.c
View File

@ -2302,34 +2302,24 @@ repeat_arroba:
case 'B': // "@B:#" // seek to the last instruction in current bb
{
int index = (int)r_num_math (core->num, ptr + 2);
// XXX this is slow, can be optimized to just retreive the bb we want
RListIter *iter;
RAnalBlock *bb;
RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, core->offset, 0);
if (fcn) {
r_list_foreach (fcn->bbs, iter, bb) {
if ((core->offset >= bb->addr) && (core->offset < (bb->addr + bb->size))) {
int count = bb->op_pos_size / sizeof (bb->op_pos[0]);
int pos = (index < 0) ? count + index + 1: index;
if (pos < 0) {
pos = 0;
}
if (pos > count) {
pos = count;
}
int lastOp = bb->op_pos[pos];
for (i = 0; i < count; i++) {
eprintf ("%d 0x%llx %d\n", pos, core->offset + bb->op_pos[i], i);
}
r_core_seek (core, core->offset + lastOp, 1);
core->tmpseek = true;
goto fuji;
break;
}
RAnalBlock *bb = r_anal_bb_from_offset (core->anal, core->offset);
if (bb) {
// handle negative indices
if (index < 0) {
index = bb->ninstr + index;
}
if (index >= 0 && index < bb->ninstr) {
ut16 inst_off = r_anal_bb_offset_inst (bb, index);
r_core_seek (core, bb->addr + inst_off, 1);
core->tmpseek = true;
} else {
eprintf("The current basic block has %d instructions\n", bb->ninstr);
}
} else {
eprintf ("Cant find a function for 0x%08"PFMT64x"\n", core->offset);
eprintf ("Can't find a basic block for 0x%08"PFMT64x"\n", core->offset);
}
break;
}
break;
case 'f': // "@f:" // slurp file in block

7
libr/core/cmd_print.c
View File

@ -57,11 +57,14 @@ static const char *help_msg_at[] = {
"@(", "from to)", "temporary set from and to for commands supporting ranges",
"@a:", "arch[:bits]", "temporary set arch and bits",
"@b:", "bits", "temporary set asm.bits",
"@B:", "nth", "temporary seek to nth instruction of current bb (negative numbers too)",
"@e:", "k=v,k=v", "temporary change eval vars",
"@r:", "reg", "tmp seek to reg value (f.ex pd@r:PC)",
"@i:", "nth.op", "temporary seek to the Nth relative instruction",
"@f:", "file", "temporary replace block with file contents",
"@F:", "flagspace", "temporary change flag space",
"@i:", "nth.op", "temporary seek to the Nth relative instruction",
"@k:", "k", "temporary seek at value of sdb key `k`",
"@o:", "fd", "temporary switch to another fd",
"@r:", "reg", "tmp seek to reg value (f.ex pd@r:PC)",
"@s:", "string", "same as above but from a string",
"@x:", "909192", "from hex pairs string",
"@@=", "1 2 3", "run the previous command at offsets 1, 2 and 3",