Changeset 36175 in vbox for trunk/src/recompiler/disas.h

Timestamp:

Mar 4, 2011 4:21:09 PM (14 years ago)

Author:

vboxsync

Message:

rem: Synced up to v0.11.1 (35bfc7324e2e6946c4113ada5db30553a1a7c40b) from ​git://git.savannah.nongnu.org/qemu.git.

File:

• trunk/src/recompiler/disas.h (modified) (1 diff)

trunk/src/recompiler/disas.h

@@ -1 +1 @@
 #ifndef _QEMU_DISAS_H
 #define _QEMU_DISAS_H
+
+#include "qemu-common.h"
 
 /* Disassemble this for me please... (debugging). */
 void disas(FILE *out, void *code, unsigned long size);
 void target_disas(FILE *out, target_ulong code, target_ulong size, int flags);
-void monitor_disas(CPUState *env,
+
+#ifndef VBOX
+/* 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);
+#endif
+#endif
 
 /* Look up symbol for debugging purpose.  Returns "" if unknown. */