Commit df2542c7 authored by Jocelyn Mayer's avatar Jocelyn Mayer
Browse files

Avoid duplicated definitions: move common definitions from exec-all.h 

  and qemu-common.h to osdep.h.
Include this header in translate-op.c.
Make sure it's included first in darwin-user/qemu.h.
To avoid discarded inlining bug, define inline as always_inline and
always_inline as (( attribute (always_inline) )) __inline__.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3698 c046a42c-6fe2-441c-8c8c-71466251a162
parent 8a0ef219

darwin-user/qemu.h

+2 −2
Original line number Diff line number Diff line 
#ifndef GEMU_H

#define GEMU_H



#include "thunk.h"



#include <signal.h>

#include <string.h>



#include "cpu.h"



#include "thunk.h"



#include "gdbstub.h"



typedef siginfo_t target_siginfo_t;

exec-all.h

+0 −30
Original line number Diff line number Diff line
@@ -21,36 +21,6 @@ 
/* allow to see translation results - the slowdown should be negligible, so we leave it */

#define DEBUG_DISAS



#ifndef glue

#define xglue(x, y) x ## y

#define glue(x, y) xglue(x, y)

#define stringify(s)	tostring(s)

#define tostring(s)	#s

#endif



#ifndef likely

#if __GNUC__ < 3

#define __builtin_expect(x, n) (x)

#endif



#define likely(x)   __builtin_expect(!!(x), 1)

#define unlikely(x)   __builtin_expect(!!(x), 0)

#endif



#ifndef always_inline

#if (__GNUC__ < 3) || defined(__APPLE__)

#define always_inline inline

#else

#define always_inline __attribute__ (( always_inline )) inline

#endif

#endif



#ifdef __i386__

#define REGPARM(n) __attribute((regparm(n)))

#else

#define REGPARM(n)

#endif



/* is_jmp field values */

#define DISAS_NEXT    0 /* next instruction can be analyzed */

#define DISAS_JUMP    1 /* only pc was modified dynamically */

osdep.h

+38 −0
Original line number Diff line number Diff line
@@ -3,6 +3,44 @@ 


#include <stdarg.h>



#ifndef glue

#define xglue(x, y) x ## y

#define glue(x, y) xglue(x, y)

#define stringify(s)	tostring(s)

#define tostring(s)	#s

#endif



#ifndef likely

#if __GNUC__ < 3

#define __builtin_expect(x, n) (x)

#endif



#define likely(x)   __builtin_expect(!!(x), 1)

#define unlikely(x)   __builtin_expect(!!(x), 0)

#endif



#ifndef MIN

#define MIN(a, b) (((a) < (b)) ? (a) : (b))

#endif

#ifndef MAX

#define MAX(a, b) (((a) > (b)) ? (a) : (b))

#endif



#ifndef always_inline

#if (__GNUC__ < 3) || defined(__APPLE__)

#define always_inline inline

#else

#define always_inline __attribute__ (( always_inline )) __inline__

#endif

#endif

#define inline always_inline



#ifdef __i386__

#define REGPARM(n) __attribute((regparm(n)))

#else

#define REGPARM(n)

#endif



#define qemu_printf printf



void *qemu_malloc(size_t size);

qemu-common.h

+0 −31
Original line number Diff line number Diff line
@@ -62,37 +62,6 @@ static inline char *realpath(const char *path, char *resolved_path) 


#endif /* !defined(NEED_CPU_H) */



#ifndef glue

#define xglue(x, y) x ## y

#define glue(x, y) xglue(x, y)

#define stringify(s)	tostring(s)

#define tostring(s)	#s

#endif



#ifndef likely

#if __GNUC__ < 3

#define __builtin_expect(x, n) (x)

#endif



#define likely(x)   __builtin_expect(!!(x), 1)

#define unlikely(x)   __builtin_expect(!!(x), 0)

#endif



#ifndef MIN

#define MIN(a, b) (((a) < (b)) ? (a) : (b))

#endif

#ifndef MAX

#define MAX(a, b) (((a) > (b)) ? (a) : (b))

#endif



#ifndef always_inline

#if (__GNUC__ < 3) || defined(__APPLE__)

#define always_inline inline

#else

#define always_inline __attribute__ (( always_inline )) inline

#endif

#endif



/* bottom halves */

typedef struct QEMUBH QEMUBH;

translate-op.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <inttypes.h>



#include "config.h"

#include "osdep.h"



enum {

#define DEF(s, n, copy_size) INDEX_op_ ## s,