diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-17 16:26:40 +0200 |
|---|---|---|
| committer | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2013-04-18 14:12:31 +0200 |
| commit | f8fd4fc4cd9138576cb1cec15c6ac9416e51eeb8 (patch) | |
| tree | ed70e161b96c9a9ff16bd1fae8265c023364be70 /include/exec | |
| parent | 1ddd592fd3b00227a61d5cd890c51b51847a415b (diff) | |
| download | hqemu-f8fd4fc4cd9138576cb1cec15c6ac9416e51eeb8.zip hqemu-f8fd4fc4cd9138576cb1cec15c6ac9416e51eeb8.tar.gz | |
elfload: use abi_int/uint instead of target_int/uint
The alignment is a characteristic of the ABI, not the CPU.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Diffstat (limited to 'include/exec')
| -rw-r--r-- | include/exec/cpu-defs.h | 2 | ||||
| -rw-r--r-- | include/exec/user/abitypes.h | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h index d376f0f..2aa9331 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 int32_t target_int __attribute__((aligned(TARGET_INT_ALIGNMENT))); -typedef uint32_t target_uint __attribute__((aligned(TARGET_INT_ALIGNMENT))); 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 */ diff --git a/include/exec/user/abitypes.h b/include/exec/user/abitypes.h index abaa028..4f3e804 100644 --- a/include/exec/user/abitypes.h +++ b/include/exec/user/abitypes.h @@ -2,12 +2,21 @@ #define QEMU_TYPES_H #include "cpu.h" +#ifdef TARGET_M68K +#define ABI_INT_ALIGNMENT 2 +#endif + #ifndef ABI_SHORT_ALIGNMENT #define ABI_SHORT_ALIGNMENT 2 #endif +#ifndef ABI_INT_ALIGNMENT +#define ABI_INT_ALIGNMENT 4 +#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))); #ifdef TARGET_ABI32 typedef uint32_t abi_ulong; |
