From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L9kaW-0001lP-85 for qemu-devel@nongnu.org; Mon, 08 Dec 2008 13:12:08 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L9kaU-0001lB-1W for qemu-devel@nongnu.org; Mon, 08 Dec 2008 13:12:06 -0500 Received: from [199.232.76.173] (port=41571 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L9kaT-0001l6-SN for qemu-devel@nongnu.org; Mon, 08 Dec 2008 13:12:05 -0500 Received: from savannah.gnu.org ([199.232.41.3]:38503 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1L9kaT-0003Yd-Ig for qemu-devel@nongnu.org; Mon, 08 Dec 2008 13:12:05 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1L9kaT-0001Vy-6B for qemu-devel@nongnu.org; Mon, 08 Dec 2008 18:12:05 +0000 Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1L9kaS-0001Vs-U2 for qemu-devel@nongnu.org; Mon, 08 Dec 2008 18:12:05 +0000 MIME-Version: 1.0 Errors-To: aurel32 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Aurelien Jarno Message-Id: Date: Mon, 08 Dec 2008 18:12:04 +0000 Subject: [Qemu-devel] [5954] linux-user: 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 Revision: 5954 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5954 Author: aurel32 Date: 2008-12-08 18:12:04 +0000 (Mon, 08 Dec 2008) Log Message: ----------- linux-user: Move abi_* typedefs into qemu-types.h Signed-off-by: Kirill A. Shutemov Signed-off-by: Aurelien Jarno Modified Paths: -------------- trunk/bsd-user/qemu.h trunk/linux-user/qemu.h Added Paths: ----------- trunk/bsd-user/qemu-types.h trunk/linux-user/qemu-types.h Added: trunk/bsd-user/qemu-types.h =================================================================== --- trunk/bsd-user/qemu-types.h (rev 0) +++ trunk/bsd-user/qemu-types.h 2008-12-08 18:12:04 UTC (rev 5954) @@ -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 Modified: trunk/bsd-user/qemu.h =================================================================== --- trunk/bsd-user/qemu.h 2008-12-08 18:11:57 UTC (rev 5953) +++ trunk/bsd-user/qemu.h 2008-12-08 18:12:04 UTC (rev 5954) @@ -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, Added: trunk/linux-user/qemu-types.h =================================================================== --- trunk/linux-user/qemu-types.h (rev 0) +++ trunk/linux-user/qemu-types.h 2008-12-08 18:12:04 UTC (rev 5954) @@ -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 Modified: trunk/linux-user/qemu.h =================================================================== --- trunk/linux-user/qemu.h 2008-12-08 18:11:57 UTC (rev 5953) +++ trunk/linux-user/qemu.h 2008-12-08 18:12:04 UTC (rev 5954) @@ -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"