X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=disas.c;h=6ed31e3b79fe4e3b3eb366a15fc954810bcb5a6e;hb=0928a95ffe91862938cee997c9e30602fa7884ab;hp=81ba50a964846eba026756e82543fcd45426c79a;hpb=93ac68bca5a3332ffacd7bf10e7b9c4cfdab6374;p=qemu diff --git a/disas.c b/disas.c index 81ba50a..6ed31e3 100644 --- a/disas.c +++ b/disas.c @@ -1,39 +1,46 @@ /* General "disassemble this chunk" code. Used for debugging. */ #include "config.h" #include "dis-asm.h" -#include "disas.h" #include "elf.h" #include +#include "cpu.h" +#include "exec-all.h" +#include "disas.h" + /* Filled in by elfload.c. Simplistic, but will do for now. */ -unsigned int disas_num_syms; -void *disas_symtab; -const char *disas_strtab; +struct syminfo *syminfos = NULL; /* Get LENGTH bytes from info's buffer, at target address memaddr. Transfer them to myaddr. */ int -buffer_read_memory (memaddr, myaddr, length, info) - bfd_vma memaddr; - bfd_byte *myaddr; - int length; - struct disassemble_info *info; +buffer_read_memory(bfd_vma memaddr, bfd_byte *myaddr, int length, + struct disassemble_info *info) +{ + if (memaddr < info->buffer_vma + || memaddr + length > info->buffer_vma + info->buffer_length) + /* Out of bounds. Use EIO because GDB uses it. */ + return EIO; + memcpy (myaddr, info->buffer + (memaddr - info->buffer_vma), length); + return 0; +} + +/* Get LENGTH bytes from info's buffer, at target address memaddr. + Transfer them to myaddr. */ +static int +target_read_memory (bfd_vma memaddr, + bfd_byte *myaddr, + int length, + struct disassemble_info *info) { - if (memaddr < info->buffer_vma - || memaddr + length > info->buffer_vma + info->buffer_length) - /* Out of bounds. Use EIO because GDB uses it. */ - return EIO; - memcpy (myaddr, info->buffer + (memaddr - info->buffer_vma), length); - return 0; + cpu_memory_rw_debug(cpu_single_env, memaddr, myaddr, length, 0); + return 0; } /* Print an error message. We can assume that this is in response to an error return from buffer_read_memory. */ void -perror_memory (status, memaddr, info) - int status; - bfd_vma memaddr; - struct disassemble_info *info; +perror_memory (int status, bfd_vma memaddr, struct disassemble_info *info) { if (status != EIO) /* Can't happen. */ @@ -42,7 +49,7 @@ perror_memory (status, memaddr, info) /* Actually, address between memaddr and memaddr + len was out of bounds. */ (*info->fprintf_func) (info->stream, - "Address 0x%llx is out of bounds.\n", memaddr); + "Address 0x%" PRIx64 " is out of bounds.\n", memaddr); } /* This could be in a separate file, to save miniscule amounts of space @@ -53,19 +60,15 @@ perror_memory (status, memaddr, info) addresses). */ void -generic_print_address (addr, info) - bfd_vma addr; - struct disassemble_info *info; +generic_print_address (bfd_vma addr, struct disassemble_info *info) { - (*info->fprintf_func) (info->stream, "0x%llx", addr); + (*info->fprintf_func) (info->stream, "0x%" PRIx64, addr); } /* Just return the given address. */ int -generic_symbol_at_address (addr, info) - bfd_vma addr; - struct disassemble_info * info; +generic_symbol_at_address (bfd_vma addr, struct disassemble_info *info) { return 1; } @@ -92,74 +95,199 @@ bfd_vma bfd_getb32 (const bfd_byte *addr) return (bfd_vma) v; } -/* Disassemble this for me please... (debugging). 'flags' is only used - for i386: non zero means 16 bit code */ -void disas(FILE *out, void *code, unsigned long size, int is_host, int flags) +bfd_vma bfd_getl16 (const bfd_byte *addr) { - uint8_t *pc; + unsigned long v; + + v = (unsigned long) addr[0]; + v |= (unsigned long) addr[1] << 8; + return (bfd_vma) v; +} + +bfd_vma bfd_getb16 (const bfd_byte *addr) +{ + unsigned long v; + + v = (unsigned long) addr[0] << 24; + v |= (unsigned long) addr[1] << 16; + return (bfd_vma) v; +} + +#ifdef TARGET_ARM +static int +print_insn_thumb1(bfd_vma pc, disassemble_info *info) +{ + return print_insn_arm(pc | 1, info); +} +#endif + +/* Disassemble this for me please... (debugging). 'flags' has the following + values: + i386 - nonzero means 16 bit code + arm - nonzero means thumb code + ppc - nonzero means little endian + other targets - unused + */ +void target_disas(FILE *out, target_ulong code, target_ulong size, int flags) +{ + target_ulong pc; int count; struct disassemble_info disasm_info; int (*print_insn)(bfd_vma pc, disassemble_info *info); INIT_DISASSEMBLE_INFO(disasm_info, out, fprintf); - disasm_info.buffer = code; - disasm_info.buffer_vma = (unsigned long)code; + disasm_info.read_memory_func = target_read_memory; + disasm_info.buffer_vma = code; disasm_info.buffer_length = size; - if (is_host) { -#ifdef WORDS_BIGENDIAN - disasm_info.endian = BFD_ENDIAN_BIG; -#else - disasm_info.endian = BFD_ENDIAN_LITTLE; -#endif -#ifdef __i386__ - disasm_info.mach = bfd_mach_i386_i386; - print_insn = print_insn_i386; -#elif defined(__powerpc__) - print_insn = print_insn_ppc; -#elif defined(__alpha__) - print_insn = print_insn_alpha; -#elif defined(__sparc__) - print_insn = print_insn_sparc; -#elif defined(__arm__) - print_insn = print_insn_arm; -#else - fprintf(out, "Asm output not supported on this arch\n"); - return; -#endif - } else { #ifdef TARGET_WORDS_BIGENDIAN - disasm_info.endian = BFD_ENDIAN_BIG; + disasm_info.endian = BFD_ENDIAN_BIG; #else - disasm_info.endian = BFD_ENDIAN_LITTLE; + disasm_info.endian = BFD_ENDIAN_LITTLE; #endif #if defined(TARGET_I386) - if (!flags) - disasm_info.mach = bfd_mach_i386_i386; - else - disasm_info.mach = bfd_mach_i386_i8086; - print_insn = print_insn_i386; + if (flags == 2) + disasm_info.mach = bfd_mach_x86_64; + else if (flags == 1) + disasm_info.mach = bfd_mach_i386_i8086; + else + disasm_info.mach = bfd_mach_i386_i386; + print_insn = print_insn_i386; #elif defined(TARGET_ARM) + if (flags) + print_insn = print_insn_thumb1; + else print_insn = print_insn_arm; #elif defined(TARGET_SPARC) - print_insn = print_insn_sparc; + print_insn = print_insn_sparc; +#ifdef TARGET_SPARC64 + disasm_info.mach = bfd_mach_sparc_v9b; +#endif +#elif defined(TARGET_PPC) + if (flags >> 16) + disasm_info.endian = BFD_ENDIAN_LITTLE; + if (flags & 0xFFFF) { + /* If we have a precise definitions of the instructions set, use it */ + disasm_info.mach = flags & 0xFFFF; + } else { +#ifdef TARGET_PPC64 + disasm_info.mach = bfd_mach_ppc64; +#else + disasm_info.mach = bfd_mach_ppc; +#endif + } + print_insn = print_insn_ppc; +#elif defined(TARGET_M68K) + print_insn = print_insn_m68k; +#elif defined(TARGET_MIPS) +#ifdef TARGET_WORDS_BIGENDIAN + print_insn = print_insn_big_mips; +#else + print_insn = print_insn_little_mips; +#endif +#elif defined(TARGET_SH4) + disasm_info.mach = bfd_mach_sh4; + print_insn = print_insn_sh; +#elif defined(TARGET_ALPHA) + disasm_info.mach = bfd_mach_alpha; + print_insn = print_insn_alpha; +#elif defined(TARGET_CRIS) + disasm_info.mach = bfd_mach_cris_v32; + print_insn = print_insn_crisv32; #else - fprintf(out, "Asm output not supported on this arch\n"); - return; + fprintf(out, "0x" TARGET_FMT_lx + ": Asm output not supported on this arch\n", code); + return; #endif + + for (pc = code; size > 0; pc += count, size -= count) { + fprintf(out, "0x" TARGET_FMT_lx ": ", pc); + count = print_insn(pc, &disasm_info); +#if 0 + { + int i; + uint8_t b; + fprintf(out, " {"); + for(i = 0; i < count; i++) { + target_read_memory(pc + i, &b, 1, &disasm_info); + fprintf(out, " %02x", b); + } + fprintf(out, " }"); + } +#endif + fprintf(out, "\n"); + if (count < 0) + break; + if (size < count) { + fprintf(out, + "Disassembler disagrees with translator over instruction " + "decoding\n" + "Please report this to qemu-devel@nongnu.org\n"); + break; + } } +} - for (pc = code; pc < (uint8_t *)code + size; pc += count) { - fprintf(out, "0x%08lx: ", (long)pc); +/* Disassemble this for me please... (debugging). */ +void disas(FILE *out, void *code, unsigned long size) +{ + unsigned long pc; + int count; + struct disassemble_info disasm_info; + int (*print_insn)(bfd_vma pc, disassemble_info *info); + + INIT_DISASSEMBLE_INFO(disasm_info, out, fprintf); + + disasm_info.buffer = code; + disasm_info.buffer_vma = (unsigned long)code; + disasm_info.buffer_length = size; + +#ifdef WORDS_BIGENDIAN + disasm_info.endian = BFD_ENDIAN_BIG; +#else + disasm_info.endian = BFD_ENDIAN_LITTLE; +#endif +#if defined(__i386__) + disasm_info.mach = bfd_mach_i386_i386; + print_insn = print_insn_i386; +#elif defined(__x86_64__) + disasm_info.mach = bfd_mach_x86_64; + print_insn = print_insn_i386; +#elif defined(_ARCH_PPC) + print_insn = print_insn_ppc; +#elif defined(__alpha__) + print_insn = print_insn_alpha; +#elif defined(__sparc__) + print_insn = print_insn_sparc; +#if defined(__sparc_v8plus__) || defined(__sparc_v8plusa__) || defined(__sparc_v9__) + disasm_info.mach = bfd_mach_sparc_v9b; +#endif +#elif defined(__arm__) + print_insn = print_insn_arm; +#elif defined(__MIPSEB__) + print_insn = print_insn_big_mips; +#elif defined(__MIPSEL__) + print_insn = print_insn_little_mips; +#elif defined(__m68k__) + print_insn = print_insn_m68k; +#elif defined(__s390__) + print_insn = print_insn_s390; +#elif defined(__hppa__) + print_insn = print_insn_hppa; +#else + fprintf(out, "0x%lx: Asm output not supported on this arch\n", + (long) code); + return; +#endif + for (pc = (unsigned long)code; size > 0; pc += count, size -= count) { + fprintf(out, "0x%08lx: ", pc); #ifdef __arm__ - /* since data are included in the code, it is better to + /* since data is included in the code, it is better to display code data too */ - if (is_host) { - fprintf(out, "%08x ", (int)bfd_getl32((const bfd_byte *)pc)); - } + fprintf(out, "%08x ", (int)bfd_getl32((const bfd_byte *)pc)); #endif - count = print_insn((unsigned long)pc, &disasm_info); + count = print_insn(pc, &disasm_info); fprintf(out, "\n"); if (count < 0) break; @@ -167,23 +295,114 @@ void disas(FILE *out, void *code, unsigned long size, int is_host, int flags) } /* Look up symbol for debugging purpose. Returns "" if unknown. */ -const char *lookup_symbol(void *orig_addr) +const char *lookup_symbol(target_ulong orig_addr) +{ + const char *symbol = ""; + struct syminfo *s; + + for (s = syminfos; s; s = s->next) { + symbol = s->lookup_symbol(s, orig_addr); + if (symbol[0] != '\0') { + break; + } + } + + return symbol; +} + +#if !defined(CONFIG_USER_ONLY) + +#include "monitor.h" + +static int monitor_disas_is_physical; +static CPUState *monitor_disas_env; + +static int +monitor_read_memory (bfd_vma memaddr, bfd_byte *myaddr, int length, + struct disassemble_info *info) +{ + if (monitor_disas_is_physical) { + cpu_physical_memory_rw(memaddr, myaddr, length, 0); + } else { + cpu_memory_rw_debug(monitor_disas_env, memaddr,myaddr, length, 0); + } + return 0; +} + +static int monitor_fprintf(FILE *stream, const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + monitor_vprintf((Monitor *)stream, fmt, ap); + va_end(ap); + return 0; +} + +void monitor_disas(Monitor *mon, CPUState *env, + target_ulong pc, int nb_insn, int is_physical, int flags) { - unsigned int i; - /* Hack, because we know this is x86. */ - Elf32_Sym *sym = disas_symtab; + int count, i; + struct disassemble_info disasm_info; + int (*print_insn)(bfd_vma pc, disassemble_info *info); + + INIT_DISASSEMBLE_INFO(disasm_info, (FILE *)mon, monitor_fprintf); + + monitor_disas_env = env; + monitor_disas_is_physical = is_physical; + disasm_info.read_memory_func = monitor_read_memory; - for (i = 0; i < disas_num_syms; i++) { - if (sym[i].st_shndx == SHN_UNDEF - || sym[i].st_shndx >= SHN_LORESERVE) - continue; + disasm_info.buffer_vma = pc; - if (ELF_ST_TYPE(sym[i].st_info) != STT_FUNC) - continue; +#ifdef TARGET_WORDS_BIGENDIAN + disasm_info.endian = BFD_ENDIAN_BIG; +#else + disasm_info.endian = BFD_ENDIAN_LITTLE; +#endif +#if defined(TARGET_I386) + if (flags == 2) + disasm_info.mach = bfd_mach_x86_64; + else if (flags == 1) + disasm_info.mach = bfd_mach_i386_i8086; + else + disasm_info.mach = bfd_mach_i386_i386; + print_insn = print_insn_i386; +#elif defined(TARGET_ARM) + print_insn = print_insn_arm; +#elif defined(TARGET_ALPHA) + print_insn = print_insn_alpha; +#elif defined(TARGET_SPARC) + print_insn = print_insn_sparc; +#ifdef TARGET_SPARC64 + disasm_info.mach = bfd_mach_sparc_v9b; +#endif +#elif defined(TARGET_PPC) +#ifdef TARGET_PPC64 + disasm_info.mach = bfd_mach_ppc64; +#else + disasm_info.mach = bfd_mach_ppc; +#endif + print_insn = print_insn_ppc; +#elif defined(TARGET_M68K) + print_insn = print_insn_m68k; +#elif defined(TARGET_MIPS) +#ifdef TARGET_WORDS_BIGENDIAN + print_insn = print_insn_big_mips; +#else + print_insn = print_insn_little_mips; +#endif +#else + monitor_printf(mon, "0x" TARGET_FMT_lx + ": Asm output not supported on this arch\n", pc); + return; +#endif - if ((long)orig_addr >= sym[i].st_value - && (long)orig_addr < sym[i].st_value + sym[i].st_size) - return disas_strtab + sym[i].st_name; + for(i = 0; i < nb_insn; i++) { + monitor_printf(mon, "0x" TARGET_FMT_lx ": ", pc); + count = print_insn(pc, &disasm_info); + monitor_printf(mon, "\n"); + if (count < 0) + break; + pc += count; } - return ""; } +#endif