* Swap file-offset order in visual prompt

* Fix build
This commit is contained in:
pancake 2010-08-23 12:39:00 +02:00
parent b07bf785be
commit 3abfbe418d
5 changed files with 7 additions and 7 deletions

View File

@ -1,6 +1,6 @@
BIN=radiff2
DEPS=r_diff r_config r_parse r_lib r_cons r_search r_anal r_reg
DEPS+=r_bin r_flags r_debug r_util r_core r_bp r_io r_cmd r_socket
DEPS+=r_sign r_print r_lang r_asm r_syscall r_hash r_line
DEPS+=r_bin r_flags r_debug r_util r_vm r_core r_bp r_io r_cmd
DEPS+=r_sign r_print r_lang r_asm r_syscall r_hash r_line r_socket
include ../binr.mk

View File

@ -9,7 +9,7 @@ test_anal${EXT_EXE}: test_anal.o
${CC} -lr_anal ${CFLAGS} ${LDFLAGS} test_anal.o -o test_anal${EXT_EXE}
test_meta${EXT_EXE}: test_meta.o
${CC} -lr_meta ${CFLAGS} ${LDFLAGS} test_meta.o -o test_meta${EXT_EXE}
${CC} -lr_anal ${CFLAGS} ${LDFLAGS} test_meta.o -o test_meta${EXT_EXE}
test_x86im${EXT_EXE}: test_x86im.o ../arch/x86/x86im/x86im.o
${CC} ${CFLAGS} ${LDFLAGS} -o test_x86im${EXT_EXE} \

View File

@ -2,7 +2,7 @@ NAME=r_core
DEPS=r_config r_cons r_line r_io r_cmd r_util r_print r_flags r_asm r_lib
DEPS+=r_debug r_hash r_bin r_lang r_io r_anal r_parse r_print r_bp
DEPS+=r_reg r_meta r_search r_syscall r_sign r_diff r_vm
DEPS+=r_reg r_search r_syscall r_sign r_diff r_vm
OBJ=core.o cmd.o file.o config.o visual.o io.o yank.o libs.o anal.o project.o gdiff.o asm.o

View File

@ -975,9 +975,9 @@ R_API int r_core_visual_cmd(RCore *core, int ch) {
R_API void r_core_visual_prompt(RCore *core, int color) {
if (cursor<0) cursor = 0;
if (color) r_cons_strcat (Color_YELLOW);
if (curset) r_cons_printf ("[%s 0x%08"PFMT64x"(%d:%d=%d)]> %s\n", core->file->filename, core->offset,
if (curset) r_cons_printf ("[0x%08"PFMT64x" %s(%d:%d=%d)]> %s\n", core->offset, core->file->filename,
cursor, ocursor, ocursor==-1?1:R_ABS (cursor-ocursor)+1, printfmt[R_ABS (printidx%NPF)]);
else r_cons_printf ("[%s 0x%08"PFMT64x"]> %s\n", core->file->filename, core->offset, printfmt[R_ABS (printidx%NPF)]);
else r_cons_printf ("[0x%08"PFMT64x" %s]> %s\n", core->offset, core->file->filename, printfmt[R_ABS (printidx%NPF)]);
if (color) r_cons_strcat (Color_RESET);
}

View File

@ -164,7 +164,7 @@ R_API int r_vm_import(struct r_vm_t *vm, int in_vm) {
if (in_vm) {
r->value = r_num_get (NULL, name); // XXX doesnt work for eflags and so
} else r->value = r_num_get (NULL, r->name); // XXX doesnt work for eflags and so
vm->printf ("f %s @ 0x%08llx\n", name, r->value);
printf ("f %s @ 0x%08llx\n", name, r->value);
}
return 0;
}