Fix iorap bug, disasm glitch, and comments are red now

This commit is contained in:
pancake 2015-06-12 02:11:07 +02:00
parent 01a8256a2f
commit f8b1f8e807
5 changed files with 9 additions and 8 deletions

View File

@ -4,6 +4,7 @@
#include <r_util.h>
#include <r_list.h>
#define FCN_DEPTH 16
#define JMP_IS_EOB 0

View File

@ -24,7 +24,7 @@ R_API void r_cons_pal_init(const char *foo) {
cons->pal.call = Color_BGREEN;
cons->pal.cjmp = Color_GREEN;
cons->pal.cmp = Color_CYAN;
cons->pal.comment = Color_CYAN; // blue
cons->pal.comment = Color_RED;
cons->pal.creg = Color_CYAN;
cons->pal.flag = Color_CYAN;
cons->pal.fline = Color_CYAN;

View File

@ -5,7 +5,8 @@
#include <r_flags.h>
#include <r_core.h>
#define ANALBS 4096
//#define ANALBS 4096
#define ANALBS 1024
static void loganal(ut64 from, ut64 to) {
r_cons_clear_line (1);
@ -800,7 +801,10 @@ if (0) {
goto error;
#else
// this is unnecessary if its contiguous
r_io_read_at (core->io, at+delta, buf, ANALBS);
buflen = r_io_read_at (core->io, at+delta, buf, ANALBS);
//if (ret != 1024) { }
// check if read error (fffff ?)
// 1024 was chosed for r2pipe
#endif
#if 1
if (core->io->va && !core->io->raw) {
@ -809,7 +813,6 @@ if (0) {
}
}
#endif
buflen = ANALBS;
if (r_cons_singleton ()->breaked)
break;
fcnlen = r_anal_fcn (core->anal, fcn, at+delta, buf, buflen, reftype);

View File

@ -1713,7 +1713,7 @@ static void handle_print_cc_update (RCore *core, RDisasmState *ds) {
else r_cons_printf (" ;%s%s", ccstr, tmp);
} else {
if (ds->show_color)
r_cons_printf ("\n%s%s%s"Color_RESET"%s%s"Color_RESET" ^- %s%s"Color_RESET,
r_cons_printf ("\n%s%s%s%s%s"Color_RESET" ^- %s%s"Color_RESET,
ds->color_fline, ds->pre, ds->color_flow, sn, ds->refline, ccstr, tmp);
else r_cons_printf ("\n%s%s%s ^- %s%s", ds->pre, ds->refline, sn, ccstr, tmp);
}

View File

@ -73,9 +73,6 @@ static int rap__read(struct r_io_t *io, RIODesc *fd, ut8 *buf, int count) {
return -1;
}
r_socket_read_block (s, buf, i);
if (count>0 && count<RMT_MAX) {
//eprintf ("READ %d\n" ,i);
} else count = 0;
return count;
}