Commit f8fd4fc4 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Edgar E. Iglesias
Browse files

elfload: use abi_int/uint instead of target_int/uint 



The alignment is a characteristic of the ABI, not the CPU.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarEdgar E. Iglesias <edgar.iglesias@gmail.com>
parent 1ddd592f

configure

+0 −3
Original line number Diff line number Diff line
@@ -4153,7 +4153,6 @@ bflt="no" 
target_nptl="no"

interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_arch2/g"`

gdb_xml_files=""

target_int_alignment=4

target_long_alignment=4

target_llong_alignment=8

target_libs_softmmu=
@@ -4189,7 +4188,6 @@ case "$target_arch2" in 
  m68k)

    bflt="yes"

    gdb_xml_files="cf-core.xml cf-fp.xml"

    target_int_alignment=2

    target_long_alignment=2

    target_llong_alignment=2

  ;;
@@ -4294,7 +4292,6 @@ case "$cpu" in 
  ;;

esac



echo "TARGET_INT_ALIGNMENT=$target_int_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_ARCH=$TARGET_ARCH" >> $config_target_mak

include/exec/cpu-defs.h

+0 −2
Original line number Diff line number Diff line
@@ -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 */

include/exec/user/abitypes.h

+9 −0
Original line number Diff line number Diff line
@@ -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;

linux-user/elfload.c

+7 −7
Original line number Diff line number Diff line
@@ -113,10 +113,10 @@ typedef abi_ulong target_elf_greg_t; 
typedef abi_ushort      target_uid_t;

typedef abi_ushort      target_gid_t;

#else

typedef target_uint     target_uid_t;

typedef target_uint     target_gid_t;

typedef abi_uint        target_uid_t;

typedef abi_uint        target_gid_t;

#endif

typedef target_int      target_pid_t;

typedef abi_int         target_pid_t;



#ifdef TARGET_I386
@@ -2109,9 +2109,9 @@ struct memelfnote { 
};



struct target_elf_siginfo {

    target_int  si_signo; /* signal number */

    target_int  si_code;  /* extra code */

    target_int  si_errno; /* errno */

    abi_int    si_signo; /* signal number */

    abi_int    si_code;  /* extra code */

    abi_int    si_errno; /* errno */

};



struct target_elf_prstatus {
@@ -2128,7 +2128,7 @@ struct target_elf_prstatus { 
    struct target_timeval pr_cutime; /* XXX Cumulative user time */

    struct target_timeval pr_cstime; /* XXX Cumulative system time */

    target_elf_gregset_t      pr_reg;       /* GP registers */

    target_int         pr_fpvalid;   /* XXX */

    abi_int            pr_fpvalid;   /* XXX */

};



#define ELF_PRARGSZ     (80) /* Number of chars for args */