ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

elfload: use abi_short/ushort instead of target_short/ushort 

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>
This commit is contained in:
Paolo Bonzini 2013-04-17 16:26:39 +02:00 committed by Edgar E. Iglesias
parent 86cd7b2d48
commit 1ddd592fd3
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -4153,7 +4153,6 @@ bflt="no"
target_nptl="no" target_nptl="no"
interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_arch2/g"` interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_arch2/g"`
gdb_xml_files="" gdb_xml_files=""
target_short_alignment=2
target_int_alignment=4 target_int_alignment=4
target_long_alignment=4 target_long_alignment=4
target_llong_alignment=8 target_llong_alignment=8
@ -4295,7 +4294,6 @@ case "$cpu" in
;; ;;
esac esac
echo "TARGET_SHORT_ALIGNMENT=$target_short_alignment" >> $config_target_mak
echo "TARGET_INT_ALIGNMENT=$target_int_alignment" >> $config_target_mak echo "TARGET_INT_ALIGNMENT=$target_int_alignment" >> $config_target_mak
echo "TARGET_LONG_ALIGNMENT=$target_long_alignment" >> $config_target_mak echo "TARGET_LONG_ALIGNMENT=$target_long_alignment" >> $config_target_mak
echo "TARGET_LLONG_ALIGNMENT=$target_llong_alignment" >> $config_target_mak echo "TARGET_LLONG_ALIGNMENT=$target_llong_alignment" >> $config_target_mak

2
include/exec/cpu-defs.h
View File

@ -36,8 +36,6 @@
#define TARGET_LONG_SIZE (TARGET_LONG_BITS / 8) #define TARGET_LONG_SIZE (TARGET_LONG_BITS / 8)
typedef int16_t target_short __attribute__ ((aligned(TARGET_SHORT_ALIGNMENT)));
typedef uint16_t target_ushort __attribute__((aligned(TARGET_SHORT_ALIGNMENT)));
typedef int32_t target_int __attribute__((aligned(TARGET_INT_ALIGNMENT))); typedef int32_t target_int __attribute__((aligned(TARGET_INT_ALIGNMENT)));
typedef uint32_t target_uint __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 int64_t target_llong __attribute__((aligned(TARGET_LLONG_ALIGNMENT)));

7
include/exec/user/abitypes.h
View File

@ -2,6 +2,13 @@
#define QEMU_TYPES_H #define QEMU_TYPES_H
#include "cpu.h" #include "cpu.h"
#ifndef ABI_SHORT_ALIGNMENT
#define ABI_SHORT_ALIGNMENT 2
#endif
typedef int16_t abi_short __attribute__ ((aligned(ABI_SHORT_ALIGNMENT)));
typedef uint16_t abi_ushort __attribute__((aligned(ABI_SHORT_ALIGNMENT)));
#ifdef TARGET_ABI32 #ifdef TARGET_ABI32
typedef uint32_t abi_ulong; typedef uint32_t abi_ulong;
typedef int32_t abi_long; typedef int32_t abi_long;

6
linux-user/elfload.c
View File

@ -110,8 +110,8 @@ typedef abi_ulong target_elf_greg_t;
#endif #endif
#ifdef USE_UID16 #ifdef USE_UID16
typedef target_ushort target_uid_t; typedef abi_ushort target_uid_t;
typedef target_ushort target_gid_t; typedef abi_ushort target_gid_t;
#else #else
typedef target_uint target_uid_t; typedef target_uint target_uid_t;
typedef target_uint target_gid_t; typedef target_uint target_gid_t;
@ -2116,7 +2116,7 @@ struct target_elf_siginfo {
struct target_elf_prstatus { struct target_elf_prstatus {
struct target_elf_siginfo pr_info; /* Info associated with signal */ struct target_elf_siginfo pr_info; /* Info associated with signal */
target_short pr_cursig; /* Current signal */ abi_short pr_cursig; /* Current signal */
abi_ulong pr_sigpend; /* XXX */ abi_ulong pr_sigpend; /* XXX */
abi_ulong pr_sighold; /* XXX */ abi_ulong pr_sighold; /* XXX */
target_pid_t pr_pid; target_pid_t pr_pid;