7f254c5cb8
Since commit8efb2ed5ec("linux-user: Correct signedness of target_flock l_start and l_len fields"), flock64 structure uses abi_llong for l_start and l_len in place of "unsigned long long" this should force them to be aligned accordingly to the target rules. So we can remove the padding field and the QEMU_PACKED attribute. I have compared the result of the following program before and after the change: cat -> flock64_dump <<EOF p/d sizeof(struct target_flock64) p/d &((struct target_flock64 *)0)->l_type p/d &((struct target_flock64 *)0)->l_whence p/d &((struct target_flock64 *)0)->l_start p/d &((struct target_flock64 *)0)->l_len p/d &((struct target_flock64 *)0)->l_pid quit EOF for file in build/all/*-linux-user/qemu-* ; do echo $file gdb -batch -nx -x flock64_dump $file 2> /dev/null done The sizeof() changes because we remove the QEMU_PACKED. The new size is 32 (except for i386 and m68k) and this is the real size of "struct flock64" on the target architecture. The following architectures differ: aarch64_be, aarch64, alpha, armeb, arm, cris, hppa, nios2, or1k, riscv32, riscv64, s390x. For a subset of these architectures, I have checked with the following program the new structure is the correct one: #include <stdio.h> #define __USE_LARGEFILE64 #include <fcntl.h> int main(void) { printf("struct flock64 %d\n", sizeof(struct flock64)); printf("l_type %d\n", &((struct flock64 *)0)->l_type); printf("l_whence %d\n", &((struct flock64 *)0)->l_whence); printf("l_start %d\n", &((struct flock64 *)0)->l_start); printf("l_len %d\n", &((struct flock64 *)0)->l_len); printf("l_pid %d\n", &((struct flock64 *)0)->l_pid); } [I have checked aarch64, alpha, hppa, s390x] For ARM, the target_flock64 becomes the EABI definition, so we need to define the OABI one in place of the EABI one and use it when it is needed. I have also fixed the alignment value for sh4 (to align llong on 4 bytes) (seec2e3dee6e0"linux-user: Define target alignment size") [We should check alignment properties for cris, nios2 and or1k] Signed-off-by: Laurent Vivier <laurent@vivier.eu> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20180502215730.28162-1-laurent@vivier.eu>
72 lines
1.9 KiB
C
72 lines
1.9 KiB
C
#ifndef EXEC_USER_ABITYPES_H
|
|
#define EXEC_USER_ABITYPES_H
|
|
|
|
#include "cpu.h"
|
|
|
|
#ifdef TARGET_ABI32
|
|
#define TARGET_ABI_BITS 32
|
|
#else
|
|
#define TARGET_ABI_BITS TARGET_LONG_BITS
|
|
#endif
|
|
|
|
#ifdef TARGET_M68K
|
|
#define ABI_INT_ALIGNMENT 2
|
|
#define ABI_LONG_ALIGNMENT 2
|
|
#define ABI_LLONG_ALIGNMENT 2
|
|
#endif
|
|
|
|
#if (defined(TARGET_I386) && !defined(TARGET_X86_64)) || defined(TARGET_SH4)
|
|
#define ABI_LLONG_ALIGNMENT 4
|
|
#endif
|
|
|
|
#ifndef ABI_SHORT_ALIGNMENT
|
|
#define ABI_SHORT_ALIGNMENT 2
|
|
#endif
|
|
#ifndef ABI_INT_ALIGNMENT
|
|
#define ABI_INT_ALIGNMENT 4
|
|
#endif
|
|
#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)));
|
|
typedef int32_t abi_long __attribute__((aligned(ABI_LONG_ALIGNMENT)));
|
|
#define TARGET_ABI_FMT_lx "%08x"
|
|
#define TARGET_ABI_FMT_ld "%d"
|
|
#define TARGET_ABI_FMT_lu "%u"
|
|
|
|
static inline abi_ulong tswapal(abi_ulong v)
|
|
{
|
|
return tswap32(v);
|
|
}
|
|
|
|
#else
|
|
typedef target_ulong abi_ulong __attribute__((aligned(ABI_LONG_ALIGNMENT)));
|
|
typedef target_long abi_long __attribute__((aligned(ABI_LONG_ALIGNMENT)));
|
|
#define TARGET_ABI_FMT_lx TARGET_FMT_lx
|
|
#define TARGET_ABI_FMT_ld TARGET_FMT_ld
|
|
#define TARGET_ABI_FMT_lu TARGET_FMT_lu
|
|
/* for consistency, define ABI32 too */
|
|
#if TARGET_ABI_BITS == 32
|
|
#define TARGET_ABI32 1
|
|
#endif
|
|
|
|
static inline abi_ulong tswapal(abi_ulong v)
|
|
{
|
|
return tswapl(v);
|
|
}
|
|
|
|
#endif
|
|
#endif
|