Re: [Qemu-devel] [PATCH] Move abi_* typedefs into qemu-types.h

[Aurelien Jarno]

On Wed, Dec 03, 2008 at 01:29:38PM +0200, Kirill A. Shutemov wrote:
> Signed-off-by: Kirill A. Shutemov <address@hidden>


Applied, thanks. In the future, it would be nice if you can put a short
description to the patch, even if it may be obvious.

> ---
>  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 <stdlib.h>
>  #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 <stdlib.h>
>  #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
 `. `'   address@hidden         | address@hidden
   `-    people.debian.org/~aurel32 | www.aurel32.net