DeforaOS/Asm
DeforaOS/Asm
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improving the output

Browse Source
This commit is contained in:
Pierre Pronchery 2011-04-23 17:48:37 +00:00
parent 383ca51178
commit 940b858a84
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/arch.c
View File

@ -436,28 +436,30 @@ ArchRegister * arch_get_register_by_name_size(Arch * arch, char const * name,
/* useful */ /* useful */
/* arch_decode */ /* arch_decode */
static void _decode_print(ArchInstructionCall * call); static void _decode_print(off_t offset, ArchInstructionCall * call);
int arch_decode(Arch * arch) int arch_decode(Arch * arch)
{ {
ArchInstructionCall call; ArchInstructionCall call;
off_t offset;
if(arch->plugin->decode == NULL) if(arch->plugin->decode == NULL)
return -error_set_code(1, "%s: %s", arch->plugin->name, return -error_set_code(1, "%s: %s", arch->plugin->name,
"Disassembly not supported"); "Disassembly not supported");
while(arch->plugin->decode(arch->plugin, &call) == 0) for(offset = 0; arch->plugin->decode(arch->plugin, &call) == 0;
_decode_print(&call); offset = arch->buffer_pos)
_decode_print(offset, &call);
return 0; return 0;
} }
static void _decode_print(ArchInstructionCall * call) static void _decode_print(off_t offset, ArchInstructionCall * call)
{ {
char const * sep = "\t"; char const * sep = "\t";
size_t i; size_t i;
ArchOperand * ao; ArchOperand * ao;
char const * name; char const * name;
printf("\t%s", call->name); printf("%08x: %s", offset, call->name);
for(i = 0; i < call->operands_cnt; i++) for(i = 0; i < call->operands_cnt; i++)
{ {
ao = &call->operands[i]; ao = &call->operands[i];
@ -532,6 +534,7 @@ int arch_init(Arch * arch, char const * filename, FILE * fp)
#endif #endif
arch->filename = filename; arch->filename = filename;
arch->fp = fp; arch->fp = fp;
arch->buffer_pos = 0; /* XXX used as offset */
arch->helper.arch = arch; arch->helper.arch = arch;
arch->helper.get_filename = _arch_get_filename; arch->helper.get_filename = _arch_get_filename;
arch->helper.get_instruction_by_opcode = arch_get_instruction_by_opcode; arch->helper.get_instruction_by_opcode = arch_get_instruction_by_opcode;
@ -590,7 +593,10 @@ static char const * _arch_get_filename(Arch * arch)
static ssize_t _arch_read(Arch * arch, void * buf, size_t size) static ssize_t _arch_read(Arch * arch, void * buf, size_t size)
{ {
if(fread(buf, size, 1, arch->fp) == 1) if(fread(buf, size, 1, arch->fp) == 1)
{
arch->buffer_pos += size;
return size; return size;
}
if(ferror(arch->fp)) if(ferror(arch->fp))
return -error_set_code(1, "%s: %s", arch->filename, return -error_set_code(1, "%s: %s", arch->filename,
strerror(errno)); strerror(errno));

2
src/code.c
View File

@ -161,7 +161,7 @@ static int _decode_file_callback(void * priv, char const * section,
Code * code = priv; Code * code = priv;
if(section != NULL) if(section != NULL)
printf("%s%s:\n", "\nDisassembly of section ", section); printf("%s%s:\n\n", "\nDisassembly of section ", section);
return arch_decode_at(code->arch, offset, size, base); return arch_decode_at(code->arch, offset, size, base);
} }