OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

changed disas() prototype for multi target support 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@233 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2003-06-15 19:44:10 +00:00
parent 5898e81684
commit 95cbfc643d
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
disas.c
View File

@ -92,8 +92,9 @@ bfd_vma bfd_getb32 (const bfd_byte *addr)
return (bfd_vma) v; return (bfd_vma) v;
} }
/* Disassemble this for me please... (debugging). */ /* Disassemble this for me please... (debugging). 'flags' is only used
void disas(FILE *out, void *code, unsigned long size, enum disas_type type) for i386: non zero means 16 bit code */
void disas(FILE *out, void *code, unsigned long size, int is_host, int flags)
{ {
uint8_t *pc; uint8_t *pc;
int count; int count;
@ -106,7 +107,7 @@ void disas(FILE *out, void *code, unsigned long size, enum disas_type type)
disasm_info.buffer_vma = (unsigned long)code; disasm_info.buffer_vma = (unsigned long)code;
disasm_info.buffer_length = size; disasm_info.buffer_length = size;
if (type == DISAS_TARGET) { if (is_host) {
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
disasm_info.endian = BFD_ENDIAN_BIG; disasm_info.endian = BFD_ENDIAN_BIG;
#else #else
@ -128,13 +129,23 @@ void disas(FILE *out, void *code, unsigned long size, enum disas_type type)
return; return;
#endif #endif
} else { } else {
/* Currently only source supported in x86. */ #ifdef TARGET_WORDS_BIGENDIAN
disasm_info.endian = BFD_ENDIAN_BIG;
#else
disasm_info.endian = BFD_ENDIAN_LITTLE; disasm_info.endian = BFD_ENDIAN_LITTLE;
if (type == DISAS_I386_I386) #endif
#if defined(TARGET_I386)
if (!flags)
disasm_info.mach = bfd_mach_i386_i386; disasm_info.mach = bfd_mach_i386_i386;
else else
disasm_info.mach = bfd_mach_i386_i8086; disasm_info.mach = bfd_mach_i386_i8086;
print_insn = print_insn_i386; print_insn = print_insn_i386;
#elif defined(TARGET_ARM)
print_insn = print_insn_arm;
#else
fprintf(out, "Asm output not supported on this arch\n");
return;
#endif
} }
for (pc = code; pc < (uint8_t *)code + size; pc += count) { for (pc = code; pc < (uint8_t *)code + size; pc += count) {
@ -142,7 +153,7 @@ void disas(FILE *out, void *code, unsigned long size, enum disas_type type)
#ifdef __arm__ #ifdef __arm__
/* since data are included in the code, it is better to /* since data are included in the code, it is better to
display code data too */ display code data too */
if (type == DISAS_TARGET) { if (is_host) {
fprintf(out, "%08x ", (int)bfd_getl32((const bfd_byte *)pc)); fprintf(out, "%08x ", (int)bfd_getl32((const bfd_byte *)pc));
} }
#endif #endif

8
disas.h
View File

@ -1,14 +1,8 @@
#ifndef _QEMU_DISAS_H #ifndef _QEMU_DISAS_H
#define _QEMU_DISAS_H #define _QEMU_DISAS_H
enum disas_type {
DISAS_I386_I386,
DISAS_I386_I8086,
DISAS_TARGET, /* whatever host is. */
};
/* Disassemble this for me please... (debugging). */ /* Disassemble this for me please... (debugging). */
void disas(FILE *out, void *code, unsigned long size, enum disas_type type); void disas(FILE *out, void *code, unsigned long size, int is_host, int flags);
/* Look up symbol for debugging purpose. Returns "" if unknown. */ /* Look up symbol for debugging purpose. Returns "" if unknown. */
const char *lookup_symbol(void *orig_addr); const char *lookup_symbol(void *orig_addr);