aboutsummaryrefslogtreecommitdiff
path: root/include/exec/user
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-04-17 16:26:40 +0200
committerEdgar E. Iglesias <edgar.iglesias@gmail.com>2013-04-18 14:12:31 +0200
commitf8fd4fc4cd9138576cb1cec15c6ac9416e51eeb8 (patch)
treeed70e161b96c9a9ff16bd1fae8265c023364be70 /include/exec/user
parent1ddd592fd3b00227a61d5cd890c51b51847a415b (diff)
downloadqemu-f8fd4fc4cd9138576cb1cec15c6ac9416e51eeb8.zip
qemu-f8fd4fc4cd9138576cb1cec15c6ac9416e51eeb8.tar.gz
qemu-f8fd4fc4cd9138576cb1cec15c6ac9416e51eeb8.tar.bz2
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/user')
-rw-r--r--include/exec/user/abitypes.h9
1 files changed, 9 insertions, 0 deletions
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;