Makefile.target: Remove out of date comment

[qemu.git] / disas.h

diff --git a/disas.h b/disas.h
index 06abab21ebc6032763747b1d06c62aa24fde7cd2..f9287f73e107a6fd85f223cd78ddee2753657da7 100644 (file)
--- a/disas.h
+++ b/disas.h
@@ -8,11 +8,8 @@
 void disas(FILE *out, void *code, unsigned long size);
 void target_disas(FILE *out, target_ulong code, target_ulong size, int flags);
 
 void disas(FILE *out, void *code, unsigned long size);
 void target_disas(FILE *out, target_ulong code, target_ulong size, int flags);
 

-/* The usual mess... FIXME: Remove this condition once dyngen-exec.h is gone */
-#ifndef __DYNGEN_EXEC_H__

 void monitor_disas(Monitor *mon, CPUState *env,
                    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);

-#endif

 
 /* Look up symbol for debugging purpose.  Returns "" if unknown. */
 const char *lookup_symbol(target_ulong orig_addr);
 
 /* Look up symbol for debugging purpose.  Returns "" if unknown. */
 const char *lookup_symbol(target_ulong orig_addr);


@@ -22,7 +19,11 @@ struct syminfo;
 struct elf32_sym;
 struct elf64_sym;
 
 struct elf32_sym;
 struct elf64_sym;
 

+#if defined(CONFIG_USER_ONLY)
+typedef const char *(*lookup_symbol_t)(struct syminfo *s, target_ulong orig_addr);
+#else

 typedef const char *(*lookup_symbol_t)(struct syminfo *s, target_phys_addr_t orig_addr);
 typedef const char *(*lookup_symbol_t)(struct syminfo *s, target_phys_addr_t orig_addr);

+#endif

 
 struct syminfo {
     lookup_symbol_t lookup_symbol;
 
 struct syminfo {
     lookup_symbol_t lookup_symbol;