From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L9Rc6-0003jy-6e for qemu-devel@nongnu.org; Sun, 07 Dec 2008 16:56:30 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L9Rc5-0003hh-2Q for qemu-devel@nongnu.org; Sun, 07 Dec 2008 16:56:29 -0500 Received: from [199.232.76.173] (port=55344 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L9Rc4-0003hT-Tx for qemu-devel@nongnu.org; Sun, 07 Dec 2008 16:56:28 -0500 Received: from hall.aurel32.net ([88.191.82.174]:42317) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1L9Rc4-0002lP-Ac for qemu-devel@nongnu.org; Sun, 07 Dec 2008 16:56:28 -0500 Date: Sun, 7 Dec 2008 22:56:25 +0100 From: Aurelien Jarno Subject: Re: [Qemu-devel] [PATCH] Move abi_* typedefs into qemu-types.h Message-ID: <20081207215625.GA21205@volta.aurel32.net> References: <1228303789-25653-1-git-send-email-kirill@shutemov.name> <1228303789-25653-2-git-send-email-kirill@shutemov.name> <1228303789-25653-3-git-send-email-kirill@shutemov.name> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <1228303789-25653-3-git-send-email-kirill@shutemov.name> Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Kirill A. Shutemov" Any rational? On Wed, Dec 03, 2008 at 01:29:38PM +0200, Kirill A. Shutemov wrote: > Signed-off-by: Kirill A. Shutemov > --- > bsd-user/qemu-types.h | 24 ++++++++++++++++++++++++ > bsd-user/qemu.h | 20 +------------------- > linux-user/qemu-types.h | 24 ++++++++++++++++++++++++ > linux-user/qemu.h | 20 +------------------- > 4 files changed, 50 insertions(+), 38 deletions(-) > create mode 100644 bsd-user/qemu-types.h > create mode 100644 linux-user/qemu-types.h > > diff --git a/bsd-user/qemu-types.h b/bsd-user/qemu-types.h > new file mode 100644 > index 0000000..1adda9f > --- /dev/null > +++ b/bsd-user/qemu-types.h > @@ -0,0 +1,24 @@ > +#ifndef QEMU_TYPES_H > +#define QEMU_TYPES_H > +#include "cpu.h" > + > +#ifdef TARGET_ABI32 > +typedef uint32_t abi_ulong; > +typedef int32_t abi_long; > +#define TARGET_ABI_FMT_lx "%08x" > +#define TARGET_ABI_FMT_ld "%d" > +#define TARGET_ABI_FMT_lu "%u" > +#define TARGET_ABI_BITS 32 > +#else > +typedef target_ulong abi_ulong; > +typedef target_long abi_long; > +#define TARGET_ABI_FMT_lx TARGET_FMT_lx > +#define TARGET_ABI_FMT_ld TARGET_FMT_ld > +#define TARGET_ABI_FMT_lu TARGET_FMT_lu > +#define TARGET_ABI_BITS TARGET_LONG_BITS > +/* for consistency, define ABI32 too */ > +#if TARGET_ABI_BITS == 32 > +#define TARGET_ABI32 1 > +#endif > +#endif > +#endif > diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h > index 0a55ac3..3ea0044 100644 > --- a/bsd-user/qemu.h > +++ b/bsd-user/qemu.h > @@ -11,25 +11,7 @@ > #include > #endif /* DEBUG_REMAP */ > > -#ifdef TARGET_ABI32 > -typedef uint32_t abi_ulong; > -typedef int32_t abi_long; > -#define TARGET_ABI_FMT_lx "%08x" > -#define TARGET_ABI_FMT_ld "%d" > -#define TARGET_ABI_FMT_lu "%u" > -#define TARGET_ABI_BITS 32 > -#else > -typedef target_ulong abi_ulong; > -typedef target_long abi_long; > -#define TARGET_ABI_FMT_lx TARGET_FMT_lx > -#define TARGET_ABI_FMT_ld TARGET_FMT_ld > -#define TARGET_ABI_FMT_lu TARGET_FMT_lu > -#define TARGET_ABI_BITS TARGET_LONG_BITS > -/* for consistency, define ABI32 too */ > -#if TARGET_ABI_BITS == 32 > -#define TARGET_ABI32 1 > -#endif > -#endif > +#include "qemu-types.h" > > enum BSDType { > target_freebsd, > diff --git a/linux-user/qemu-types.h b/linux-user/qemu-types.h > new file mode 100644 > index 0000000..1adda9f > --- /dev/null > +++ b/linux-user/qemu-types.h > @@ -0,0 +1,24 @@ > +#ifndef QEMU_TYPES_H > +#define QEMU_TYPES_H > +#include "cpu.h" > + > +#ifdef TARGET_ABI32 > +typedef uint32_t abi_ulong; > +typedef int32_t abi_long; > +#define TARGET_ABI_FMT_lx "%08x" > +#define TARGET_ABI_FMT_ld "%d" > +#define TARGET_ABI_FMT_lu "%u" > +#define TARGET_ABI_BITS 32 > +#else > +typedef target_ulong abi_ulong; > +typedef target_long abi_long; > +#define TARGET_ABI_FMT_lx TARGET_FMT_lx > +#define TARGET_ABI_FMT_ld TARGET_FMT_ld > +#define TARGET_ABI_FMT_lu TARGET_FMT_lu > +#define TARGET_ABI_BITS TARGET_LONG_BITS > +/* for consistency, define ABI32 too */ > +#if TARGET_ABI_BITS == 32 > +#define TARGET_ABI32 1 > +#endif > +#endif > +#endif > diff --git a/linux-user/qemu.h b/linux-user/qemu.h > index 52835ec..b620c97 100644 > --- a/linux-user/qemu.h > +++ b/linux-user/qemu.h > @@ -11,25 +11,7 @@ > #include > #endif /* DEBUG_REMAP */ > > -#ifdef TARGET_ABI32 > -typedef uint32_t abi_ulong; > -typedef int32_t abi_long; > -#define TARGET_ABI_FMT_lx "%08x" > -#define TARGET_ABI_FMT_ld "%d" > -#define TARGET_ABI_FMT_lu "%u" > -#define TARGET_ABI_BITS 32 > -#else > -typedef target_ulong abi_ulong; > -typedef target_long abi_long; > -#define TARGET_ABI_FMT_lx TARGET_FMT_lx > -#define TARGET_ABI_FMT_ld TARGET_FMT_ld > -#define TARGET_ABI_FMT_lu TARGET_FMT_lu > -#define TARGET_ABI_BITS TARGET_LONG_BITS > -/* for consistency, define ABI32 too */ > -#if TARGET_ABI_BITS == 32 > -#define TARGET_ABI32 1 > -#endif > -#endif > +#include "qemu-types.h" > > #include "thunk.h" > #include "syscall_defs.h" > -- > 1.6.0.2.GIT > > > > -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32@debian.org | aurelien@aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net