Revision 47b01cf3

b/cris-dis.c
18 18
   You should have received a copy of the GNU General Public License
19 19
   along with this program; if not, see <http://www.gnu.org/licenses/>. */
20 20

  
21
#include "qemu-common.h"
21 22
#include "dis-asm.h"
22 23
//#include "sysdep.h"
23 24
#include "target-cris/opcode-cris.h"
24 25
//#include "libiberty.h"
25

26

  
27
void *qemu_malloc(size_t len); /* can't include qemu-common.h here */
28 26

  
29 27
#define CONST_STRNEQ(STR1,STR2) (strncmp ((STR1), (STR2), sizeof (STR2) - 1) == 0)
30 28

  
b/disas.h
8 8
void disas(FILE *out, void *code, unsigned long size);
9 9
void target_disas(FILE *out, target_ulong code, target_ulong size, int flags);
10 10

  
11
/* The usual mess... FIXME: Remove this condition once dyngen-exec.h is gone */
12
#ifndef __DYNGEN_EXEC_H__
13 11
void monitor_disas(Monitor *mon, CPUState *env,
14 12
                   target_ulong pc, int nb_insn, int is_physical, int flags);
15
#endif
16 13

  
17 14
/* Look up symbol for debugging purpose.  Returns "" if unknown. */
18 15
const char *lookup_symbol(target_ulong orig_addr);
b/dyngen-exec.h
19 19
#if !defined(__DYNGEN_EXEC_H__)
20 20
#define __DYNGEN_EXEC_H__
21 21

  
22
/* prevent Solaris from trying to typedef FILE in gcc's
23
   include/floatingpoint.h which will conflict with the
24
   definition down below */
25
#ifdef __sun__
26
#define _FILEDEFED
27
#endif
28

  
29
/* NOTE: standard headers should be used with special care at this
30
   point because host CPU registers are used as global variables. Some
31
   host headers do not allow that. */
32
#include <stddef.h>
33
#include <stdint.h>
34
#include <stdbool.h>
22
#include "qemu-common.h"
35 23

  
36 24
#ifdef __OpenBSD__
37 25
#include <sys/types.h>
......
40 28
/* XXX: This may be wrong for 64-bit ILP32 hosts.  */
41 29
typedef void * host_reg_t;
42 30

  
43
#ifdef CONFIG_BSD
44
typedef struct __sFILE FILE;
45
#else
46
typedef struct FILE FILE;
47
#endif
48
extern int fprintf(FILE *, const char *, ...);
49
extern int fputs(const char *, FILE *);
50
extern int printf(const char *, ...);
51

  
52 31
#if defined(__i386__)
53 32
#define AREG0 "ebp"
54 33
#elif defined(__x86_64__)
b/qemu-common.h
18 18
typedef struct QEMUBH QEMUBH;
19 19
typedef struct DeviceState DeviceState;
20 20

  
21
/* Hack around the mess dyngen-exec.h causes: We need QEMU_NORETURN in files that
22
   cannot include the following headers without conflicts. This condition has
23
   to be removed once dyngen is gone. */
24
#ifndef __DYNGEN_EXEC_H__
25

  
26 21
/* we put basic includes here to avoid repeating them in device drivers */
27 22
#include <stdlib.h>
28 23
#include <stdio.h>
......
318 313

  
319 314
#include "module.h"
320 315

  
321
#endif /* dyngen-exec.h hack */
322

  
323 316
#endif

Also available in: Unified diff