You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
71 lines
2.4 KiB
71 lines
2.4 KiB
13 years ago
|
diff -NrU5 elfsh-0.51b3.original/modules/modgraph.c elfsh-0.51b3/modules/modgraph.c
|
||
|
--- elfsh-0.51b3.original/modules/modgraph.c 2009-07-22 23:17:51.000000000 -0600
|
||
|
+++ elfsh-0.51b3/modules/modgraph.c 2009-07-22 23:33:28.000000000 -0600
|
||
|
@@ -181,11 +181,11 @@
|
||
|
}
|
||
|
}
|
||
|
else
|
||
|
{
|
||
|
name = elfsh_reverse_metasym(world.current, blk->vaddr, &off);
|
||
|
- dprintf(fd, "%s_%08x", name, off);
|
||
|
+ d_printf(fd, "%s_%08x", name, off);
|
||
|
|
||
|
}
|
||
|
free(buffer);
|
||
|
world.state.vm_quiet = vm_quiet;
|
||
|
}
|
||
|
diff -NrU5 elfsh-0.51b3.original/vm/disasm.c elfsh-0.51b3/vm/disasm.c
|
||
|
--- elfsh-0.51b3.original/vm/disasm.c 2009-07-22 23:17:51.000000000 -0600
|
||
|
+++ elfsh-0.51b3/vm/disasm.c 2009-07-22 23:33:53.000000000 -0600
|
||
|
@@ -80,30 +80,30 @@
|
||
|
|
||
|
/* Are we in quiet mode ? */
|
||
|
if (world.state.vm_quiet)
|
||
|
{
|
||
|
snprintf(buf, sizeof(buf), " %08X %s + %u", vaddr + index, name, nindex);
|
||
|
- dprintf(fd, "%-40s %-30s ", buf, s);
|
||
|
+ d_printf(fd, "%-40s %-30s ", buf, s);
|
||
|
}
|
||
|
else
|
||
|
{
|
||
|
snprintf(buf, sizeof(buf), " %08X [foff: %u] %s + %u",
|
||
|
vaddr + index, foffset + index, name, nindex);
|
||
|
- dprintf(fd, "%-60s %-50s ", buf, s);
|
||
|
+ d_printf(fd, "%-60s %-50s ", buf, s);
|
||
|
}
|
||
|
|
||
|
/* Print bytes in hexa for this instruction */
|
||
|
ret = asm_instr_len(&ptr);
|
||
|
if (!ret)
|
||
|
ret++;
|
||
|
|
||
|
if (!world.state.vm_quiet)
|
||
|
for (idx_bytes = 0; idx_bytes < ret; idx_bytes++)
|
||
|
- dprintf(fd, "%c%c ",
|
||
|
+ d_printf(fd, "%c%c ",
|
||
|
base[(buff[index + idx_bytes] >> 4) & 0x0F],
|
||
|
base[buff[index + idx_bytes] & 0x0F]);
|
||
|
- dprintf(fd, "\n");
|
||
|
+ d_printf(fd, "\n");
|
||
|
return (ret);
|
||
|
}
|
||
|
#endif /* USE_LIBASM */
|
||
|
|
||
|
|
||
|
diff -NrU5 elfsh-0.51b3.original/vm/include/elfsh.h elfsh-0.51b3/vm/include/elfsh.h
|
||
|
--- elfsh-0.51b3.original/vm/include/elfsh.h 2009-07-22 23:17:51.000000000 -0600
|
||
|
+++ elfsh-0.51b3/vm/include/elfsh.h 2009-07-22 23:22:30.000000000 -0600
|
||
|
@@ -469,11 +469,11 @@
|
||
|
int vm_getsort(u_int index, u_int argc, char **argv);
|
||
|
int vm_getdisasm(u_int index, u_int argc, char **argv);
|
||
|
int vm_gethexa(u_int index, u_int argc, char **argv);
|
||
|
int vm_getvarparams(u_int index, u_int argc, char **argv);
|
||
|
|
||
|
-int dprintf(int fd, char *format, ...);
|
||
|
+int d_printf(int fd, char *format, ...);
|
||
|
|
||
|
/* Libasm resolve handler */
|
||
|
void do_resolve(void *data, u_int vaddr, char *, u_int);
|
||
|
u_int display_instr(int, u_int, u_int, u_int, u_int,
|
||
|
char *, u_int, char *);
|