optionrom: remove use of implicit RM variable

[qemu.git] / disas.c

diff --git a/disas.c b/disas.c
index bfab8c3bb76e6c23006232d0f86aa96739b343c6..ce342bc8ee4dd9f1509473a5bb46e05a9e0b41a4 100644 (file)
--- a/disas.c
+++ b/disas.c
@@ -14,11 +14,8 @@ struct syminfo *syminfos = NULL;
 /* Get LENGTH bytes from info's buffer, at target address memaddr.
    Transfer them to myaddr.  */
 int
 /* 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)
 {
     if (memaddr < info->buffer_vma
         || memaddr + length > info->buffer_vma + info->buffer_length)


@@ -28,31 +25,22 @@ buffer_read_memory (memaddr, myaddr, length, info)
     return 0;
 }
 
     return 0;
 }
 

-#if !defined(CONFIG_USER_ONLY)

 /* Get LENGTH bytes from info's buffer, at target address memaddr.
    Transfer them to myaddr.  */
 static int
 /* Get LENGTH bytes from info's buffer, at target address memaddr.
    Transfer them to myaddr.  */
 static int

-target_read_memory (memaddr, myaddr, length, info)
-     bfd_vma memaddr;
-     bfd_byte *myaddr;
-     int length;
-     struct disassemble_info *info;
+target_read_memory (bfd_vma memaddr,
+                    bfd_byte *myaddr,
+                    int length,
+                    struct disassemble_info *info)

 {
 {

-    int i;
-    for(i = 0; i < length; i++) {
-        myaddr[i] = ldub_code((void *)((long)memaddr + i));
-    }
+    cpu_memory_rw_debug(cpu_single_env, memaddr, myaddr, length, 0);

     return 0;
 }
     return 0;
 }

-#endif

 
 /* Print an error message.  We can assume that this is in response to
    an error return from buffer_read_memory.  */
 void
 
 /* 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.  */
 {
   if (status != EIO)
     /* Can't happen.  */


@@ -61,7 +49,7 @@ perror_memory (status, memaddr, info)
     /* Actually, address between memaddr and memaddr + len was
        out of bounds.  */
     (*info->fprintf_func) (info->stream,
     /* 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
 }
 
 /* This could be in a separate file, to save miniscule amounts of space


@@ -72,19 +60,15 @@ perror_memory (status, memaddr, info)
    addresses).  */
 
 void
    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
 }
 
 /* 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;
 }
 {
   return 1;
 }


@@ -111,85 +95,202 @@ bfd_vma bfd_getb32 (const bfd_byte *addr)
   return (bfd_vma) v;
 }
 
   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)
+{
+  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)

 {
 {

-    uint8_t *pc;
+  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);
 
     int count;
     struct disassemble_info disasm_info;
     int (*print_insn)(bfd_vma pc, disassemble_info *info);
 
     INIT_DISASSEMBLE_INFO(disasm_info, out, fprintf);
 

-#if !defined(CONFIG_USER_ONLY)
-    if (!is_host) {
-        disasm_info.read_memory_func = target_read_memory;
+    disasm_info.read_memory_func = target_read_memory;
+    disasm_info.buffer_vma = code;
+    disasm_info.buffer_length = size;
+
+#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)
+    if (flags)
+       print_insn = print_insn_thumb1;
+    else
+       print_insn = print_insn_arm;
+#elif defined(TARGET_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;
+#elif defined(TARGET_MICROBLAZE)
+    disasm_info.mach = bfd_arch_microblaze;
+    print_insn = print_insn_microblaze;
+#else
+    fprintf(out, "0x" TARGET_FMT_lx
+           ": Asm output not supported on this arch\n", code);
+    return;

 #endif
 
 #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 [email protected]\n");
+            break;
+        }
+    }
+}
+
+/* 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;
 
     disasm_info.buffer = code;
     disasm_info.buffer_vma = (unsigned long)code;
     disasm_info.buffer_length = size;
 

-    if (is_host) {
-#ifdef WORDS_BIGENDIAN
-       disasm_info.endian = BFD_ENDIAN_BIG;
+#ifdef HOST_WORDS_BIGENDIAN
+    disasm_info.endian = BFD_ENDIAN_BIG;

 #else
 #else

-       disasm_info.endian = BFD_ENDIAN_LITTLE;
+    disasm_info.endian = BFD_ENDIAN_LITTLE;

 #endif
 #if defined(__i386__)
 #endif
 #if defined(__i386__)

-       disasm_info.mach = bfd_mach_i386_i386;
-       print_insn = print_insn_i386;
+    disasm_info.mach = bfd_mach_i386_i386;
+    print_insn = print_insn_i386;

 #elif defined(__x86_64__)
 #elif defined(__x86_64__)

-       disasm_info.mach = bfd_mach_x86_64;
-       print_insn = print_insn_i386;
-#elif defined(__powerpc__)
-       print_insn = print_insn_ppc;
+    disasm_info.mach = bfd_mach_x86_64;
+    print_insn = print_insn_i386;
+#elif defined(_ARCH_PPC)
+    print_insn = print_insn_ppc;

 #elif defined(__alpha__)
 #elif defined(__alpha__)

-       print_insn = print_insn_alpha;
+    print_insn = print_insn_alpha;

 #elif defined(__sparc__)
 #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;
-#else
-       disasm_info.endian = BFD_ENDIAN_LITTLE;
+    print_insn = print_insn_sparc;
+#if defined(__sparc_v8plus__) || defined(__sparc_v8plusa__) || defined(__sparc_v9__)
+    disasm_info.mach = bfd_mach_sparc_v9b;

 #endif
 #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;
-#elif defined(TARGET_ARM)
-       print_insn = print_insn_arm;
-#elif defined(TARGET_SPARC)
-       print_insn = print_insn_sparc;
-#elif defined(TARGET_PPC)
-       print_insn = print_insn_ppc;
+#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
 #else

-       fprintf(out, "Asm output not supported on this arch\n");
-       return;
+    fprintf(out, "0x%lx: Asm output not supported on this arch\n",
+           (long) code);
+    return;

 #endif
 #endif

-    }
-
-    for (pc = code; pc < (uint8_t *)code + size; pc += count) {
-       fprintf(out, "0x%08lx:  ", (long)pc);
+    for (pc = (unsigned long)code; size > 0; pc += count, size -= count) {
+       fprintf(out, "0x%08lx:  ", pc);

 #ifdef __arm__
 #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 */
            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
 #endif

-       count = print_insn((unsigned long)pc, &disasm_info);
+       count = print_insn(pc, &disasm_info);

        fprintf(out, "\n");
        if (count < 0)
            break;
        fprintf(out, "\n");
        if (count < 0)
            break;


@@ -197,49 +298,36 @@ 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(target_ulong orig_addr)

 {
 {

-    unsigned int i;
-    /* Hack, because we know this is x86. */
-    Elf32_Sym *sym;
+    const char *symbol = "";

     struct syminfo *s;
     struct syminfo *s;

-    
+

     for (s = syminfos; s; s = s->next) {
     for (s = syminfos; s; s = s->next) {

-       sym = s->disas_symtab;
-       for (i = 0; i < s->disas_num_syms; i++) {
-           if (sym[i].st_shndx == SHN_UNDEF
-               || sym[i].st_shndx >= SHN_LORESERVE)
-               continue;
-
-           if (ELF_ST_TYPE(sym[i].st_info) != STT_FUNC)
-               continue;
-
-           if ((long)orig_addr >= sym[i].st_value
-               && (long)orig_addr < sym[i].st_value + sym[i].st_size)
-               return s->disas_strtab + sym[i].st_name;
-       }
+        symbol = s->lookup_symbol(s, orig_addr);
+        if (symbol[0] != '\0') {
+            break;
+        }

     }
     }

-    return "";
+
+    return symbol;

 }
 
 #if !defined(CONFIG_USER_ONLY)
 
 }
 
 #if !defined(CONFIG_USER_ONLY)
 

-void term_vprintf(const char *fmt, va_list ap);
-void term_printf(const char *fmt, ...);
+#include "monitor.h"

 
 static int monitor_disas_is_physical;
 
 static int monitor_disas_is_physical;

+static CPUState *monitor_disas_env;

 
 static int
 
 static int

-monitor_read_memory (memaddr, myaddr, length, info)
-     bfd_vma memaddr;
-     bfd_byte *myaddr;
-     int length;
-     struct disassemble_info *info;
+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 {
 {
     if (monitor_disas_is_physical) {
         cpu_physical_memory_rw(memaddr, myaddr, length, 0);
     } else {

-        cpu_memory_rw_debug(cpu_single_env, memaddr,myaddr, length, 0);
+        cpu_memory_rw_debug(monitor_disas_env, memaddr,myaddr, length, 0);

     }
     return 0;
 }
     }
     return 0;
 }


@@ -248,19 +336,21 @@ static int monitor_fprintf(FILE *stream, const char *fmt, ...)
 {
     va_list ap;
     va_start(ap, fmt);
 {
     va_list ap;
     va_start(ap, fmt);

-    term_vprintf(fmt, ap);
+    monitor_vprintf((Monitor *)stream, fmt, ap);

     va_end(ap);
     return 0;
 }
 
     va_end(ap);
     return 0;
 }
 

-void monitor_disas(target_ulong pc, int nb_insn, int is_physical, int flags)
+void monitor_disas(Monitor *mon, CPUState *env,
+                   target_ulong pc, int nb_insn, int is_physical, int flags)

 {
     int count, i;
     struct disassemble_info disasm_info;
     int (*print_insn)(bfd_vma pc, disassemble_info *info);
 
 {
     int count, i;
     struct disassemble_info disasm_info;
     int (*print_insn)(bfd_vma pc, disassemble_info *info);
 

-    INIT_DISASSEMBLE_INFO(disasm_info, NULL, monitor_fprintf);
+    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;
 
     monitor_disas_is_physical = is_physical;
     disasm_info.read_memory_func = monitor_read_memory;
 


@@ -272,26 +362,47 @@ void monitor_disas(target_ulong pc, int nb_insn, int is_physical, int flags)
     disasm_info.endian = BFD_ENDIAN_LITTLE;
 #endif
 #if defined(TARGET_I386)
     disasm_info.endian = BFD_ENDIAN_LITTLE;
 #endif
 #if defined(TARGET_I386)

-    if (!flags)
-        disasm_info.mach = bfd_mach_i386_i386;
-    else
+    if (flags == 2)
+        disasm_info.mach = bfd_mach_x86_64;
+    else if (flags == 1)

         disasm_info.mach = bfd_mach_i386_i8086;
         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;
     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;
 #elif defined(TARGET_SPARC)
     print_insn = print_insn_sparc;

+#ifdef TARGET_SPARC64
+    disasm_info.mach = bfd_mach_sparc_v9b;
+#endif

 #elif defined(TARGET_PPC)
 #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;
     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
 #else

-    term_printf("Asm output not supported on this arch\n");
+    monitor_printf(mon, "0x" TARGET_FMT_lx
+                   ": Asm output not supported on this arch\n", pc);

     return;
 #endif
 
     for(i = 0; i < nb_insn; i++) {
     return;
 #endif
 
     for(i = 0; i < nb_insn; i++) {

-       term_printf("0x%08lx:  ", (unsigned long)pc);
+       monitor_printf(mon, "0x" TARGET_FMT_lx ":  ", pc);

        count = print_insn(pc, &disasm_info);
        count = print_insn(pc, &disasm_info);

-       term_printf("\n");
+       monitor_printf(mon, "\n");

        if (count < 0)
            break;
         pc += count;
        if (count < 0)
            break;
         pc += count;