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

* Speed up 'k' in visual

Browse Source 
- Use cache instead of bwdisasm
This commit is contained in:
Nibble 2011-02-15 16:19:18 +01:00
parent 6aea3ed907
commit 8cf6516d0d
3 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libr/core/core.c
View File

@ -272,6 +272,7 @@ R_API int r_core_init(RCore *core) {
//core->num->callback = &num_callback;
//core->num->userptr = core;
core->cons = r_cons_singleton ();
core->curasmstep = 0;
/* initialize libraries */
if (singleton) {

32
libr/core/visual.c
View File

@ -837,7 +837,7 @@ R_API int r_core_visual_cmd(RCore *core, int ch) {
break;
case 'j':
if (curset) {
if (printidx == 1)
if (printidx == 1 || printidx == 2)
cols = r_asm_disassemble (core->assembler, &aop, core->block, 32);
cursor += cols;
ocursor = -1;
@ -849,8 +849,14 @@ R_API int r_core_visual_cmd(RCore *core, int ch) {
}
}
} else {
if (printidx == 1)
if (printidx == 1 || printidx == 2) {
cols = core->inc;
core->asmsteps[core->curasmstep].offset = core->offset+cols;
core->asmsteps[core->curasmstep].cols = cols;
if (core->curasmstep < R_CORE_ASMSTEPS-1)
core->curasmstep++;
else core->curasmstep = 0;
}
r_core_seek (core, core->offset+cols, 1);
}
break;
@ -870,7 +876,7 @@ R_API int r_core_visual_cmd(RCore *core, int ch) {
break;
case 'k':
if (curset) {
if (printidx == 1)
if (printidx == 1 || printidx == 2)
cols = r_asm_disassemble (core->assembler, &aop, core->block, 32);
cursor -= cols;
ocursor = -1;
@ -880,18 +886,16 @@ R_API int r_core_visual_cmd(RCore *core, int ch) {
cursor += cols;
}
} else {
ut64 addr = core->offset - 8;
if (printidx == 1) {
RList *bwdhits;
RCoreAsmHit *hit;
bwdhits = r_core_asm_bwdisassemble (core, core->offset, 1, core->blocksize);
if (bwdhits) {
if ((hit = r_list_get_n (bwdhits, 0)) != NULL)
addr = hit->addr;
r_list_free (bwdhits);
}
if (printidx == 1 || printidx == 2) {
int i;
cols = core->inc;
for (i = 0; i < R_CORE_ASMSTEPS; i++)
if (core->offset == core->asmsteps[i].offset)
cols = core->asmsteps[i].cols;
}
r_core_seek (core, addr, 1);
if (core->offset >= cols)
r_core_seek (core, core->offset-cols, 1);
else r_core_seek (core, 0, 1);
}
break;
case 'K':

8
libr/include/r_core.h
View File

@ -62,6 +62,12 @@ typedef struct r_core_file_t {
RBinObj *obj;
} RCoreFile;
#define R_CORE_ASMSTEPS 128
typedef struct r_core_asmsteps_t {
ut64 offset;
int cols;
} RCoreAsmsteps;
typedef struct r_core_t {
ut64 offset;
ut32 blocksize;
@ -101,6 +107,8 @@ typedef struct r_core_t {
ut64 inc;
int rtr_n;
RCoreRtrHost rtr_host[RTR_MAX_HOSTS];
int curasmstep;
RCoreAsmsteps asmsteps[R_CORE_ASMSTEPS];
} RCore;
typedef int (*RCoreSearchCallback)(RCore *core, ut64 from, ut8 *buf, int len);