From 918fc54caff20b1810c633a63bf6d6c5499bd5dd Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 17 Apr 2013 16:26:42 +0200 Subject: elfload: use abi_llong/ullong instead of target_llong/ullong The alignment is a characteristic of the ABI, not the CPU. Signed-off-by: Paolo Bonzini Signed-off-by: Edgar E. Iglesias --- include/exec/cpu-defs.h | 2 -- include/exec/user/abitypes.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'include/exec') diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h index 3cf1272..d8c64e9 100644 --- a/include/exec/cpu-defs.h +++ b/include/exec/cpu-defs.h @@ -36,8 +36,6 @@ #define TARGET_LONG_SIZE (TARGET_LONG_BITS / 8) -typedef int64_t target_llong __attribute__((aligned(TARGET_LLONG_ALIGNMENT))); -typedef uint64_t target_ullong __attribute__((aligned(TARGET_LLONG_ALIGNMENT))); /* target_ulong is the type of a virtual address */ #if TARGET_LONG_SIZE == 4 typedef int32_t target_long; diff --git a/include/exec/user/abitypes.h b/include/exec/user/abitypes.h index 4b04f6d..008501b 100644 --- a/include/exec/user/abitypes.h +++ b/include/exec/user/abitypes.h @@ -11,6 +11,11 @@ #ifdef TARGET_M68K #define ABI_INT_ALIGNMENT 2 #define ABI_LONG_ALIGNMENT 2 +#define ABI_LLONG_ALIGNMENT 2 +#endif + +#ifdef TARGET_ARM +#define ABI_LLONG_ALIGNMENT 4 #endif #ifndef ABI_SHORT_ALIGNMENT @@ -22,11 +27,16 @@ #ifndef ABI_LONG_ALIGNMENT #define ABI_LONG_ALIGNMENT (TARGET_ABI_BITS / 8) #endif +#ifndef ABI_LLONG_ALIGNMENT +#define ABI_LLONG_ALIGNMENT 8 +#endif typedef int16_t abi_short __attribute__ ((aligned(ABI_SHORT_ALIGNMENT))); typedef uint16_t abi_ushort __attribute__((aligned(ABI_SHORT_ALIGNMENT))); typedef int32_t abi_int __attribute__((aligned(ABI_INT_ALIGNMENT))); typedef uint32_t abi_uint __attribute__((aligned(ABI_INT_ALIGNMENT))); +typedef int64_t abi_llong __attribute__((aligned(ABI_LLONG_ALIGNMENT))); +typedef uint64_t abi_ullong __attribute__((aligned(ABI_LLONG_ALIGNMENT))); #ifdef TARGET_ABI32 typedef uint32_t abi_ulong __attribute__((aligned(ABI_LONG_ALIGNMENT))); -- cgit v1.1