summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2023-05-03 08:23:29 +0100
committerRichard Henderson <richard.henderson@linaro.org>2023-05-11 09:49:55 +0100
commit45dfbd4320cc29a06b4921fe21a145e9a4f87323 (patch)
tree151c387477c9e6cbd400036170df65c0535e167d
parentb6235a759a4552d21c5b68d16c894aa5b96d4b96 (diff)
downloadfocaccia-qemu-45dfbd4320cc29a06b4921fe21a145e9a4f87323.tar.gz
focaccia-qemu-45dfbd4320cc29a06b4921fe21a145e9a4f87323.zip
disas: Remove target-specific headers
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230503072331.1747057-83-richard.henderson@linaro.org>
-rw-r--r--disas/disas.c3
-rw-r--r--include/disas/disas.h6
2 files changed, 2 insertions, 7 deletions
diff --git a/disas/disas.c b/disas/disas.c
index aac7cf3b03..a06954254b 100644
--- a/disas/disas.c
+++ b/disas/disas.c
@@ -3,9 +3,10 @@
 #include "disas/dis-asm.h"
 #include "elf.h"
 #include "qemu/qemu-print.h"
-
 #include "disas/disas.h"
 #include "disas/capstone.h"
+#include "hw/core/cpu.h"
+#include "exec/memory.h"
 
 typedef struct CPUDebug {
     struct disassemble_info info;
diff --git a/include/disas/disas.h b/include/disas/disas.h
index 6c394e0b09..176775eff7 100644
--- a/include/disas/disas.h
+++ b/include/disas/disas.h
@@ -1,11 +1,6 @@
 #ifndef QEMU_DISAS_H
 #define QEMU_DISAS_H
 
-#include "exec/hwaddr.h"
-
-#ifdef NEED_CPU_H
-#include "cpu.h"
-
 /* Disassemble this for me please... (debugging). */
 void disas(FILE *out, const void *code, size_t size);
 void target_disas(FILE *out, CPUState *cpu, uint64_t code, size_t size);
@@ -17,7 +12,6 @@ char *plugin_disas(CPUState *cpu, uint64_t addr, size_t size);
 
 /* Look up symbol for debugging purpose.  Returns "" if unknown. */
 const char *lookup_symbol(uint64_t orig_addr);
-#endif
 
 struct syminfo;
 struct elf32_sym;