[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/7] include stdio.h freely, remove dyngen-exec.h ha
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 3/7] include stdio.h freely, remove dyngen-exec.h hacks |
Date: |
Fri, 25 Jun 2010 14:52:18 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
disas.h | 5 +----
dyngen-exec.h | 16 ----------------
qemu-common.h | 7 -------
3 files changed, 1 insertions(+), 27 deletions(-)
diff --git a/disas.h b/disas.h
index 6a9332d..1af0511 100644
--- a/disas.h
+++ b/disas.h
@@ -2,17 +2,14 @@
#define _QEMU_DISAS_H
#include "qemu-common.h"
+#include <stdio.h>
#ifdef NEED_CPU_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);
-
-/* 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
/* Look up symbol for debugging purpose. Returns "" if unknown. */
const char *lookup_symbol(target_ulong orig_addr);
diff --git a/dyngen-exec.h b/dyngen-exec.h
index 5bfef3f..d65b618 100644
--- a/dyngen-exec.h
+++ b/dyngen-exec.h
@@ -19,13 +19,6 @@
#if !defined(__DYNGEN_EXEC_H__)
#define __DYNGEN_EXEC_H__
-/* prevent Solaris from trying to typedef FILE in gcc's
- include/floatingpoint.h which will conflict with the
- definition down below */
-#ifdef __sun__
-#define _FILEDEFED
-#endif
-
/* NOTE: standard headers should be used with special care at this
point because host CPU registers are used as global variables. Some
host headers do not allow that. */
@@ -40,15 +33,6 @@
/* XXX: This may be wrong for 64-bit ILP32 hosts. */
typedef void * host_reg_t;
-#ifdef CONFIG_BSD
-typedef struct __sFILE FILE;
-#else
-typedef struct FILE FILE;
-#endif
-extern int fprintf(FILE *, const char *, ...);
-extern int fputs(const char *, FILE *);
-extern int printf(const char *, ...);
-
#if defined(__i386__)
#define AREG0 "ebp"
#elif defined(__x86_64__)
diff --git a/qemu-common.h b/qemu-common.h
index 3fb2f0b..ac839aa 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -18,11 +18,6 @@ typedef struct QEMUFile QEMUFile;
typedef struct QEMUBH QEMUBH;
typedef struct DeviceState DeviceState;
-/* Hack around the mess dyngen-exec.h causes: We need QEMU_NORETURN in files
that
- cannot include the following headers without conflicts. This condition has
- to be removed once dyngen is gone. */
-#ifndef __DYNGEN_EXEC_H__
-
/* we put basic includes here to avoid repeating them in device drivers */
#include <stdlib.h>
#include <stdio.h>
@@ -293,6 +288,4 @@ static inline uint8_t from_bcd(uint8_t val)
#include "module.h"
-#endif /* dyngen-exec.h hack */
-
#endif
--
1.7.0.1
- Re: [Qemu-devel] [PATCH 4/7] provide opaque CPUState to files that are compiled once, (continued)
[Qemu-devel] [PATCH 7/7] poison TARGET_xxx for compile once object, Paolo Bonzini, 2010/06/25
[Qemu-devel] [PATCH 5/7] add qdev property type "cpu", Paolo Bonzini, 2010/06/25
Re: [Qemu-devel] [PATCH 5/7] add qdev property type "cpu", Blue Swirl, 2010/06/27
[Qemu-devel] [PATCH 2/7] include qemu-common.h when needed by the next patches, Paolo Bonzini, 2010/06/25
[Qemu-devel] [PATCH 3/7] include stdio.h freely, remove dyngen-exec.h hacks,
Paolo Bonzini <=
[Qemu-devel] [PATCH 1/7] rtc: Remove TARGET_I386 from qemu-config.c, enables driftfix, Paolo Bonzini, 2010/06/25
Re: [Qemu-devel] [PATCH 0/7] poison TARGET_xxx for compile once object and header file cleanups, Richard Henderson, 2010/06/25
Re: [Qemu-devel] [PATCH 0/7] poison TARGET_xxx for compile once object and header file cleanups, Blue Swirl, 2010/06/27