fix aligned issue with S=

This commit is contained in:
Álvaro Felipe Melchor 2015-10-15 21:56:17 +02:00
parent 3c4354ccef
commit 11ce2c5031

View File

@ -144,7 +144,7 @@ static void list_section_visual_vaddr (RIO *io, ut64 seek, ut64 len, int use_col
RListIter *iter;
RIOSection *s;
int j, i = 0;
int width = r_cons_get_size (NULL) - 52;
int width = r_cons_get_size (NULL) - 60;
if (width < 1) width = 30;
r_list_foreach (io->sections, iter, s) {
if (min == -1 || s->vaddr < min)
@ -173,10 +173,10 @@ static void list_section_visual_vaddr (RIO *io, ut64 seek, ut64 len, int use_col
color = "";
color_end = "";
}
io->cb_printf ("%02d%c %04s %s0x%08"PFMT64x"%s |", i,
io->cb_printf ("%02d%c %s0x%08"PFMT64x"%s |", i,
(seek >= s->vaddr && seek < s->vaddr + s->size) ? '*' : ' ',
//(seek>=s->vaddr && seek<s->vaddr+s->size)?'*':' ',
buf, color, s->vaddr, color_end);
color, s->vaddr, color_end);
for (j = 0; j < width; j++) {
ut64 pos = min + (j * mul);
ut64 npos = min + ((j + 1) * mul);
@ -184,9 +184,9 @@ static void list_section_visual_vaddr (RIO *io, ut64 seek, ut64 len, int use_col
io->cb_printf ("#");
else io->cb_printf ("-");
}
io->cb_printf ("| %s0x%08"PFMT64x"%s %s %s\n",
io->cb_printf ("| %s0x%08"PFMT64x"%s %s %s %04s\n",
color, s->vaddr + s->size, color_end,
r_str_rwx_i (s->rwx), s->name);
r_str_rwx_i (s->rwx), s->name, buf);
i++;
}
PRINT_CURRENT_SEEK;
@ -198,7 +198,7 @@ static void list_section_visual_paddr (RIO *io, ut64 seek, ut64 len, int use_col
RListIter *iter;
RIOSection *s;
int j, i = 0;
int width = r_cons_get_size (NULL) - 52;
int width = r_cons_get_size (NULL) - 60;
if (width < 1) width = 30;
seek = r_io_section_vaddr_to_maddr_try (io, seek);
r_list_foreach (io->sections, iter, s) {
@ -228,9 +228,9 @@ static void list_section_visual_paddr (RIO *io, ut64 seek, ut64 len, int use_col
color = "";
color_end = "";
}
io->cb_printf ("%02d%c %04s %s0x%08"PFMT64x"%s |", i,
io->cb_printf ("%02d%c %s0x%08"PFMT64x"%s |", i,
(seek >= s->offset && seek < s->offset + s->size) ? '*' : ' ',
buf, color, s->offset, color_end);
color, s->offset, color_end);
for (j = 0; j < width; j++) {
ut64 pos = min + (j * mul);
ut64 npos = min + ((j + 1) * mul);
@ -238,9 +238,9 @@ static void list_section_visual_paddr (RIO *io, ut64 seek, ut64 len, int use_col
io->cb_printf ("#");
else io->cb_printf ("-");
}
io->cb_printf ("| %s0x%08"PFMT64x"%s %s %s\n",
io->cb_printf ("| %s0x%08"PFMT64x"%s %s %s %04s\n",
color, s->offset+s->size, color_end,
r_str_rwx_i (s->rwx), s->name);
r_str_rwx_i (s->rwx), s->name, buf);
i++;
}