From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L7pu5-0007xS-7N for qemu-devel@nongnu.org; Wed, 03 Dec 2008 06:28:26 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L7pu2-0007t7-20 for qemu-devel@nongnu.org; Wed, 03 Dec 2008 06:28:23 -0500 Received: from [199.232.76.173] (port=33386 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L7pty-0007rg-Jy for qemu-devel@nongnu.org; Wed, 03 Dec 2008 06:28:18 -0500 Received: from ug-out-1314.google.com ([66.249.92.170]:65296) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1L7ptu-0004CG-2c for qemu-devel@nongnu.org; Wed, 03 Dec 2008 06:28:15 -0500 Received: by ug-out-1314.google.com with SMTP id 29so3354850ugc.36 for ; Wed, 03 Dec 2008 03:27:33 -0800 (PST) From: "Kirill A. Shutemov" Date: Wed, 3 Dec 2008 13:29:38 +0200 Message-Id: <1228303789-25653-3-git-send-email-kirill@shutemov.name> In-Reply-To: <1228303789-25653-2-git-send-email-kirill@shutemov.name> References: <1228303789-25653-1-git-send-email-kirill@shutemov.name> <1228303789-25653-2-git-send-email-kirill@shutemov.name> Subject: [Qemu-devel] [PATCH] Move abi_* typedefs into qemu-types.h 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" 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