mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace TARGET_WORDS_BIGENDIAN

Browse Source 
Convert the TARGET_WORDS_BIGENDIAN macro, similarly to what was done
with HOST_BIG_ENDIAN. The new TARGET_BIG_ENDIAN macro is either 0 or 1,
and thus should always be defined to prevent misuse.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Suggested-by: Halil Pasic <pasic@linux.ibm.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220323155743.1585078-8-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marc-André Lureau 2022-03-23 19:57:18 +04:00 committed by Paolo Bonzini
parent e03b56863d
commit ee3eb3a7ce
83 changed files with 120 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accel/kvm/kvm-all.c
View File

@ -1202,7 +1202,7 @@ void kvm_hwpoison_page_add(ram_addr_t ram_addr)
static uint32_t adjust_ioeventfd_endianness(uint32_t val, uint32_t size) static uint32_t adjust_ioeventfd_endianness(uint32_t val, uint32_t size)
{ {
#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN) #if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
/* The kernel expects ioeventfd values in HOST_BIG_ENDIAN /* The kernel expects ioeventfd values in HOST_BIG_ENDIAN
* endianness, but the memory core hands them in target endianness. * endianness, but the memory core hands them in target endianness.
* For example, PPC is always treated as big-endian even if running * For example, PPC is always treated as big-endian even if running

2
bsd-user/qemu.h
View File

@ -465,7 +465,7 @@ static inline void *lock_user_string(abi_ulong guest_addr)
static inline uint64_t target_arg64(uint32_t word0, uint32_t word1) static inline uint64_t target_arg64(uint32_t word0, uint32_t word1)
{ {
#if TARGET_ABI_BITS == 32 #if TARGET_ABI_BITS == 32
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
return ((uint64_t)word0 << 32) | word1; return ((uint64_t)word0 << 32) | word1;
#else #else
return ((uint64_t)word1 << 32) | word0; return ((uint64_t)word1 << 32) | word0;

2
configs/targets/aarch64_be-linux-user.mak
View File

@ -1,6 +1,6 @@
TARGET_ARCH=aarch64 TARGET_ARCH=aarch64
TARGET_BASE_ARCH=arm TARGET_BASE_ARCH=arm
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml TARGET_XML_FILES= gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml
TARGET_HAS_BFLT=y TARGET_HAS_BFLT=y
CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y

2
configs/targets/armeb-linux-user.mak
View File

@ -1,7 +1,7 @@
TARGET_ARCH=arm TARGET_ARCH=arm
TARGET_SYSTBL_ABI=common,oabi TARGET_SYSTBL_ABI=common,oabi
TARGET_SYSTBL=syscall.tbl TARGET_SYSTBL=syscall.tbl
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-vfp-sysregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml gdb-xml/arm-m-profile-mve.xml TARGET_XML_FILES= gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-vfp-sysregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml gdb-xml/arm-m-profile-mve.xml
TARGET_HAS_BFLT=y TARGET_HAS_BFLT=y
CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y

2
configs/targets/hppa-linux-user.mak
View File

@ -2,4 +2,4 @@ TARGET_ARCH=hppa
TARGET_SYSTBL_ABI=common,32 TARGET_SYSTBL_ABI=common,32
TARGET_SYSTBL=syscall.tbl TARGET_SYSTBL=syscall.tbl
TARGET_ALIGNED_ONLY=y TARGET_ALIGNED_ONLY=y
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y

2
configs/targets/hppa-softmmu.mak
View File

@ -1,4 +1,4 @@
TARGET_ARCH=hppa TARGET_ARCH=hppa
TARGET_ALIGNED_ONLY=y TARGET_ALIGNED_ONLY=y
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y
TARGET_SUPPORTS_MTTCG=y TARGET_SUPPORTS_MTTCG=y

2
configs/targets/m68k-linux-user.mak
View File

@ -1,6 +1,6 @@
TARGET_ARCH=m68k TARGET_ARCH=m68k
TARGET_SYSTBL_ABI=common TARGET_SYSTBL_ABI=common
TARGET_SYSTBL=syscall.tbl TARGET_SYSTBL=syscall.tbl
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/cf-core.xml gdb-xml/cf-fp.xml gdb-xml/m68k-core.xml gdb-xml/m68k-fp.xml TARGET_XML_FILES= gdb-xml/cf-core.xml gdb-xml/cf-fp.xml gdb-xml/m68k-core.xml gdb-xml/m68k-fp.xml
TARGET_HAS_BFLT=y TARGET_HAS_BFLT=y

2
configs/targets/m68k-softmmu.mak
View File

@ -1,3 +1,3 @@
TARGET_ARCH=m68k TARGET_ARCH=m68k
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/cf-core.xml gdb-xml/cf-fp.xml gdb-xml/m68k-core.xml gdb-xml/m68k-fp.xml TARGET_XML_FILES= gdb-xml/cf-core.xml gdb-xml/cf-fp.xml gdb-xml/m68k-core.xml gdb-xml/m68k-fp.xml

2
configs/targets/microblaze-linux-user.mak
View File

@ -1,5 +1,5 @@
TARGET_ARCH=microblaze TARGET_ARCH=microblaze
TARGET_SYSTBL_ABI=common TARGET_SYSTBL_ABI=common
TARGET_SYSTBL=syscall.tbl TARGET_SYSTBL=syscall.tbl
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y
TARGET_HAS_BFLT=y TARGET_HAS_BFLT=y

2
configs/targets/microblaze-softmmu.mak
View File

@ -1,4 +1,4 @@
TARGET_ARCH=microblaze TARGET_ARCH=microblaze
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y
TARGET_SUPPORTS_MTTCG=y TARGET_SUPPORTS_MTTCG=y
TARGET_NEED_FDT=y TARGET_NEED_FDT=y

2
configs/targets/mips-linux-user.mak
View File

@ -3,4 +3,4 @@ TARGET_ABI_MIPSO32=y
TARGET_SYSTBL_ABI=o32 TARGET_SYSTBL_ABI=o32
TARGET_SYSTBL=syscall_o32.tbl TARGET_SYSTBL=syscall_o32.tbl
TARGET_ALIGNED_ONLY=y TARGET_ALIGNED_ONLY=y
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y

2
configs/targets/mips-softmmu.mak
View File

@ -1,4 +1,4 @@
TARGET_ARCH=mips TARGET_ARCH=mips
TARGET_ALIGNED_ONLY=y TARGET_ALIGNED_ONLY=y
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y
TARGET_SUPPORTS_MTTCG=y TARGET_SUPPORTS_MTTCG=y

2
configs/targets/mips64-linux-user.mak
View File

@ -4,4 +4,4 @@ TARGET_BASE_ARCH=mips
TARGET_SYSTBL_ABI=n64 TARGET_SYSTBL_ABI=n64
TARGET_SYSTBL=syscall_n64.tbl TARGET_SYSTBL=syscall_n64.tbl
TARGET_ALIGNED_ONLY=y TARGET_ALIGNED_ONLY=y
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y

2
configs/targets/mips64-softmmu.mak
View File

@ -1,4 +1,4 @@
TARGET_ARCH=mips64 TARGET_ARCH=mips64
TARGET_BASE_ARCH=mips TARGET_BASE_ARCH=mips
TARGET_ALIGNED_ONLY=y TARGET_ALIGNED_ONLY=y
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y

2
configs/targets/mipsn32-linux-user.mak
View File

@ -5,4 +5,4 @@ TARGET_BASE_ARCH=mips
TARGET_SYSTBL_ABI=n32 TARGET_SYSTBL_ABI=n32
TARGET_SYSTBL=syscall_n32.tbl TARGET_SYSTBL=syscall_n32.tbl
TARGET_ALIGNED_ONLY=y TARGET_ALIGNED_ONLY=y
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y

2
configs/targets/or1k-linux-user.mak
View File

@ -1,2 +1,2 @@
TARGET_ARCH=openrisc TARGET_ARCH=openrisc
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y

2
configs/targets/or1k-softmmu.mak
View File

@ -1,3 +1,3 @@
TARGET_ARCH=openrisc TARGET_ARCH=openrisc
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y
TARGET_NEED_FDT=y TARGET_NEED_FDT=y

2
configs/targets/ppc-linux-user.mak
View File

@ -1,5 +1,5 @@
TARGET_ARCH=ppc TARGET_ARCH=ppc
TARGET_SYSTBL_ABI=common,nospu,32 TARGET_SYSTBL_ABI=common,nospu,32
TARGET_SYSTBL=syscall.tbl TARGET_SYSTBL=syscall.tbl
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/power-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml TARGET_XML_FILES= gdb-xml/power-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml

2
configs/targets/ppc-softmmu.mak
View File

@ -1,4 +1,4 @@
TARGET_ARCH=ppc TARGET_ARCH=ppc
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/power-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml TARGET_XML_FILES= gdb-xml/power-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml
TARGET_NEED_FDT=y TARGET_NEED_FDT=y

2
configs/targets/ppc64-linux-user.mak
View File

@ -3,5 +3,5 @@ TARGET_BASE_ARCH=ppc
TARGET_ABI_DIR=ppc TARGET_ABI_DIR=ppc
TARGET_SYSTBL_ABI=common,nospu,64 TARGET_SYSTBL_ABI=common,nospu,64
TARGET_SYSTBL=syscall.tbl TARGET_SYSTBL=syscall.tbl
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml TARGET_XML_FILES= gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml

2
configs/targets/ppc64-softmmu.mak
View File

@ -1,6 +1,6 @@
TARGET_ARCH=ppc64 TARGET_ARCH=ppc64
TARGET_BASE_ARCH=ppc TARGET_BASE_ARCH=ppc
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y
TARGET_SUPPORTS_MTTCG=y TARGET_SUPPORTS_MTTCG=y
TARGET_XML_FILES= gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml TARGET_XML_FILES= gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml
TARGET_NEED_FDT=y TARGET_NEED_FDT=y

2
configs/targets/s390x-linux-user.mak
View File

@ -1,5 +1,5 @@
TARGET_ARCH=s390x TARGET_ARCH=s390x
TARGET_SYSTBL_ABI=common,64 TARGET_SYSTBL_ABI=common,64
TARGET_SYSTBL=syscall.tbl TARGET_SYSTBL=syscall.tbl
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/s390x-core64.xml gdb-xml/s390-acr.xml gdb-xml/s390-fpr.xml gdb-xml/s390-vx.xml gdb-xml/s390-cr.xml gdb-xml/s390-virt.xml gdb-xml/s390-gs.xml TARGET_XML_FILES= gdb-xml/s390x-core64.xml gdb-xml/s390-acr.xml gdb-xml/s390-fpr.xml gdb-xml/s390-vx.xml gdb-xml/s390-cr.xml gdb-xml/s390-virt.xml gdb-xml/s390-gs.xml

2
configs/targets/s390x-softmmu.mak
View File

@ -1,4 +1,4 @@
TARGET_ARCH=s390x TARGET_ARCH=s390x
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y
TARGET_SUPPORTS_MTTCG=y TARGET_SUPPORTS_MTTCG=y
TARGET_XML_FILES= gdb-xml/s390x-core64.xml gdb-xml/s390-acr.xml gdb-xml/s390-fpr.xml gdb-xml/s390-vx.xml gdb-xml/s390-cr.xml gdb-xml/s390-virt.xml gdb-xml/s390-gs.xml TARGET_XML_FILES= gdb-xml/s390x-core64.xml gdb-xml/s390-acr.xml gdb-xml/s390-fpr.xml gdb-xml/s390-vx.xml gdb-xml/s390-cr.xml gdb-xml/s390-virt.xml gdb-xml/s390-gs.xml

2
configs/targets/sh4eb-linux-user.mak
View File

@ -2,5 +2,5 @@ TARGET_ARCH=sh4
TARGET_SYSTBL_ABI=common TARGET_SYSTBL_ABI=common
TARGET_SYSTBL=syscall.tbl TARGET_SYSTBL=syscall.tbl
TARGET_ALIGNED_ONLY=y TARGET_ALIGNED_ONLY=y
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y
TARGET_HAS_BFLT=y TARGET_HAS_BFLT=y

2
configs/targets/sh4eb-softmmu.mak
View File

@ -1,3 +1,3 @@
TARGET_ARCH=sh4 TARGET_ARCH=sh4
TARGET_ALIGNED_ONLY=y TARGET_ALIGNED_ONLY=y
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y

2
configs/targets/sparc-linux-user.mak
View File

@ -2,4 +2,4 @@ TARGET_ARCH=sparc
TARGET_SYSTBL_ABI=common,32 TARGET_SYSTBL_ABI=common,32
TARGET_SYSTBL=syscall.tbl TARGET_SYSTBL=syscall.tbl
TARGET_ALIGNED_ONLY=y TARGET_ALIGNED_ONLY=y
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y

2
configs/targets/sparc-softmmu.mak
View File

@ -1,3 +1,3 @@
TARGET_ARCH=sparc TARGET_ARCH=sparc
TARGET_ALIGNED_ONLY=y TARGET_ALIGNED_ONLY=y
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y

2
configs/targets/sparc32plus-linux-user.mak
View File

@ -5,4 +5,4 @@ TARGET_ABI_DIR=sparc
TARGET_SYSTBL_ABI=common,32 TARGET_SYSTBL_ABI=common,32
TARGET_SYSTBL=syscall.tbl TARGET_SYSTBL=syscall.tbl
TARGET_ALIGNED_ONLY=y TARGET_ALIGNED_ONLY=y
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y

2
configs/targets/sparc64-linux-user.mak
View File

@ -4,4 +4,4 @@ TARGET_ABI_DIR=sparc
TARGET_SYSTBL_ABI=common,64 TARGET_SYSTBL_ABI=common,64
TARGET_SYSTBL=syscall.tbl TARGET_SYSTBL=syscall.tbl
TARGET_ALIGNED_ONLY=y TARGET_ALIGNED_ONLY=y
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y

2
configs/targets/sparc64-softmmu.mak
View File

@ -1,4 +1,4 @@
TARGET_ARCH=sparc64 TARGET_ARCH=sparc64
TARGET_BASE_ARCH=sparc TARGET_BASE_ARCH=sparc
TARGET_ALIGNED_ONLY=y TARGET_ALIGNED_ONLY=y
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y

2
configs/targets/xtensaeb-linux-user.mak
View File

@ -1,5 +1,5 @@
TARGET_ARCH=xtensa TARGET_ARCH=xtensa
TARGET_SYSTBL_ABI=common TARGET_SYSTBL_ABI=common
TARGET_SYSTBL=syscall.tbl TARGET_SYSTBL=syscall.tbl
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y
TARGET_HAS_BFLT=y TARGET_HAS_BFLT=y

2
configs/targets/xtensaeb-softmmu.mak
View File

@ -1,3 +1,3 @@
TARGET_ARCH=xtensa TARGET_ARCH=xtensa
TARGET_WORDS_BIGENDIAN=y TARGET_BIG_ENDIAN=y
TARGET_SUPPORTS_MTTCG=y TARGET_SUPPORTS_MTTCG=y

2
cpu.c
View File

@ -469,7 +469,7 @@ int cpu_memory_rw_debug(CPUState *cpu, vaddr addr,
bool target_words_bigendian(void) bool target_words_bigendian(void)
{ {
#if defined(TARGET_WORDS_BIGENDIAN) #if TARGET_BIG_ENDIAN
return true; return true;
#else #else
return false; return false;

2
disas.c
View File

@ -126,7 +126,7 @@ static void initialize_debug_target(CPUDebug *s, CPUState *cpu)
s->cpu = cpu; s->cpu = cpu;
s->info.read_memory_func = target_read_memory; s->info.read_memory_func = target_read_memory;
s->info.print_address_func = print_address; s->info.print_address_func = print_address;
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
s->info.endian = BFD_ENDIAN_BIG; s->info.endian = BFD_ENDIAN_BIG;
#else #else
s->info.endian = BFD_ENDIAN_LITTLE; s->info.endian = BFD_ENDIAN_LITTLE;

2
docs/devel/loads-stores.rst
View File

@ -275,7 +275,7 @@ called during the translator callback ``translate_insn``.
There is a set of functions ending in ``_swap`` which, if the parameter There is a set of functions ending in ``_swap`` which, if the parameter
is true, returns the value in the endianness that is the reverse of is true, returns the value in the endianness that is the reverse of
the guest native endianness, as determined by ``TARGET_WORDS_BIGENDIAN``. the guest native endianness, as determined by ``TARGET_BIG_ENDIAN``.
Function names follow the pattern: Function names follow the pattern:

2
hw/arm/armv7m.c
View File

@ -577,7 +577,7 @@ void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, int mem_size)
int asidx; int asidx;
CPUState *cs = CPU(cpu); CPUState *cs = CPU(cpu);
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
big_endian = 1; big_endian = 1;
#else #else
big_endian = 0; big_endian = 0;

2
hw/display/vga.c
View File

@ -2242,7 +2242,7 @@ bool vga_common_init(VGACommonState *s, Object *obj, Error **errp)
* into a device attribute set by the machine/platform to remove * into a device attribute set by the machine/platform to remove
* all target endian dependencies from this file. * all target endian dependencies from this file.
*/ */
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
s->default_endian_fb = true; s->default_endian_fb = true;
#else #else
s->default_endian_fb = false; s->default_endian_fb = false;

2
hw/microblaze/boot.c
View File

@ -138,7 +138,7 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,
uint32_t base32; uint32_t base32;
int big_endian = 0; int big_endian = 0;
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
big_endian = 1; big_endian = 1;
#endif #endif

6
hw/mips/gt64xxx_pci.c
View File

@ -986,7 +986,7 @@ static void gt64120_reset(DeviceState *dev)
/* FIXME: Malta specific hw assumptions ahead */ /* FIXME: Malta specific hw assumptions ahead */
/* CPU Configuration */ /* CPU Configuration */
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
s->regs[GT_CPU] = 0x00000000; s->regs[GT_CPU] = 0x00000000;
#else #else
s->regs[GT_CPU] = 0x00001000; s->regs[GT_CPU] = 0x00001000;
@ -1097,7 +1097,7 @@ static void gt64120_reset(DeviceState *dev)
s->regs[GT_TC_CONTROL] = 0x00000000; s->regs[GT_TC_CONTROL] = 0x00000000;
/* PCI Internal */ /* PCI Internal */
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
s->regs[GT_PCI0_CMD] = 0x00000000; s->regs[GT_PCI0_CMD] = 0x00000000;
#else #else
s->regs[GT_PCI0_CMD] = 0x00010001; s->regs[GT_PCI0_CMD] = 0x00010001;
@ -1118,7 +1118,7 @@ static void gt64120_reset(DeviceState *dev)
s->regs[GT_PCI0_SSCS10_BAR] = 0x00000000; s->regs[GT_PCI0_SSCS10_BAR] = 0x00000000;
s->regs[GT_PCI0_SSCS32_BAR] = 0x01000000; s->regs[GT_PCI0_SSCS32_BAR] = 0x01000000;
s->regs[GT_PCI0_SCS3BT_BAR] = 0x1f000000; s->regs[GT_PCI0_SCS3BT_BAR] = 0x1f000000;
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
s->regs[GT_PCI1_CMD] = 0x00000000; s->regs[GT_PCI1_CMD] = 0x00000000;
#else #else
s->regs[GT_PCI1_CMD] = 0x00010001; s->regs[GT_PCI1_CMD] = 0x00010001;

2
hw/mips/jazz.c
View File

@ -158,7 +158,7 @@ static void mips_jazz_init(MachineState *machine,
[JAZZ_PICA61] = {33333333, 4}, [JAZZ_PICA61] = {33333333, 4},
}; };
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
big_endian = 1; big_endian = 1;
#else #else
big_endian = 0; big_endian = 0;

24
hw/mips/malta.c
View File

@ -367,7 +367,7 @@ static uint64_t malta_fpga_read(void *opaque, hwaddr addr,
/* STATUS Register */ /* STATUS Register */
case 0x00208: case 0x00208:
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
val = 0x00000012; val = 0x00000012;
#else #else
val = 0x00000010; val = 0x00000010;
@ -695,7 +695,7 @@ static void write_bootloader_nanomips(uint8_t *base, uint64_t run_addr,
stw_p(p++, 0xe040); stw_p(p++, 0x0681); stw_p(p++, 0xe040); stw_p(p++, 0x0681);
/* lui t1, %hi(0xb4000000) */ /* lui t1, %hi(0xb4000000) */
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
stw_p(p++, 0xe020); stw_p(p++, 0x0be1); stw_p(p++, 0xe020); stw_p(p++, 0x0be1);
/* lui t0, %hi(0xdf000000) */ /* lui t0, %hi(0xdf000000) */
@ -894,7 +894,7 @@ static void write_bootloader(uint8_t *base, uint64_t run_addr,
/* Load BAR registers as done by YAMON */ /* Load BAR registers as done by YAMON */
stl_p(p++, 0x3c09b400); /* lui t1, 0xb400 */ stl_p(p++, 0x3c09b400); /* lui t1, 0xb400 */
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
stl_p(p++, 0x3c08df00); /* lui t0, 0xdf00 */ stl_p(p++, 0x3c08df00); /* lui t0, 0xdf00 */
#else #else
stl_p(p++, 0x340800df); /* ori t0, r0, 0x00df */ stl_p(p++, 0x340800df); /* ori t0, r0, 0x00df */
@ -903,39 +903,39 @@ static void write_bootloader(uint8_t *base, uint64_t run_addr,
stl_p(p++, 0x3c09bbe0); /* lui t1, 0xbbe0 */ stl_p(p++, 0x3c09bbe0); /* lui t1, 0xbbe0 */
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
stl_p(p++, 0x3c08c000); /* lui t0, 0xc000 */ stl_p(p++, 0x3c08c000); /* lui t0, 0xc000 */
#else #else
stl_p(p++, 0x340800c0); /* ori t0, r0, 0x00c0 */ stl_p(p++, 0x340800c0); /* ori t0, r0, 0x00c0 */
#endif #endif
stl_p(p++, 0xad280048); /* sw t0, 0x0048(t1) */ stl_p(p++, 0xad280048); /* sw t0, 0x0048(t1) */
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
stl_p(p++, 0x3c084000); /* lui t0, 0x4000 */ stl_p(p++, 0x3c084000); /* lui t0, 0x4000 */
#else #else
stl_p(p++, 0x34080040); /* ori t0, r0, 0x0040 */ stl_p(p++, 0x34080040); /* ori t0, r0, 0x0040 */
#endif #endif
stl_p(p++, 0xad280050); /* sw t0, 0x0050(t1) */ stl_p(p++, 0xad280050); /* sw t0, 0x0050(t1) */
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
stl_p(p++, 0x3c088000); /* lui t0, 0x8000 */ stl_p(p++, 0x3c088000); /* lui t0, 0x8000 */
#else #else
stl_p(p++, 0x34080080); /* ori t0, r0, 0x0080 */ stl_p(p++, 0x34080080); /* ori t0, r0, 0x0080 */
#endif #endif
stl_p(p++, 0xad280058); /* sw t0, 0x0058(t1) */ stl_p(p++, 0xad280058); /* sw t0, 0x0058(t1) */
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
stl_p(p++, 0x3c083f00); /* lui t0, 0x3f00 */ stl_p(p++, 0x3c083f00); /* lui t0, 0x3f00 */
#else #else
stl_p(p++, 0x3408003f); /* ori t0, r0, 0x003f */ stl_p(p++, 0x3408003f); /* ori t0, r0, 0x003f */
#endif #endif
stl_p(p++, 0xad280060); /* sw t0, 0x0060(t1) */ stl_p(p++, 0xad280060); /* sw t0, 0x0060(t1) */
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
stl_p(p++, 0x3c08c100); /* lui t0, 0xc100 */ stl_p(p++, 0x3c08c100); /* lui t0, 0xc100 */
#else #else
stl_p(p++, 0x340800c1); /* ori t0, r0, 0x00c1 */ stl_p(p++, 0x340800c1); /* ori t0, r0, 0x00c1 */
#endif #endif
stl_p(p++, 0xad280080); /* sw t0, 0x0080(t1) */ stl_p(p++, 0xad280080); /* sw t0, 0x0080(t1) */
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
stl_p(p++, 0x3c085e00); /* lui t0, 0x5e00 */ stl_p(p++, 0x3c085e00); /* lui t0, 0x5e00 */
#else #else
stl_p(p++, 0x3408005e); /* ori t0, r0, 0x005e */ stl_p(p++, 0x3408005e); /* ori t0, r0, 0x005e */
@ -1030,7 +1030,7 @@ static uint64_t load_kernel(void)
int prom_index = 0; int prom_index = 0;
uint64_t (*xlate_to_kseg0) (void *opaque, uint64_t addr); uint64_t (*xlate_to_kseg0) (void *opaque, uint64_t addr);
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
big_endian = 1; big_endian = 1;
#else #else
big_endian = 0; big_endian = 0;
@ -1272,7 +1272,7 @@ void mips_malta_init(MachineState *machine)
ram_low_postio); ram_low_postio);
} }
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
be = 1; be = 1;
#else #else
be = 0; be = 0;
@ -1353,7 +1353,7 @@ void mips_malta_init(MachineState *machine)
* In little endian mode the 32bit words in the bios are swapped, * In little endian mode the 32bit words in the bios are swapped,
* a neat trick which allows bi-endian firmware. * a neat trick which allows bi-endian firmware.
*/ */
#ifndef TARGET_WORDS_BIGENDIAN #if !TARGET_BIG_ENDIAN
{ {
uint32_t *end, *addr; uint32_t *end, *addr;
const size_t swapsize = MIN(bios_size, 0x3e0000); const size_t swapsize = MIN(bios_size, 0x3e0000);

2
hw/mips/mipssim.c
View File

@ -65,7 +65,7 @@ static uint64_t load_kernel(void)
ram_addr_t initrd_offset; ram_addr_t initrd_offset;
int big_endian; int big_endian;
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
big_endian = 1; big_endian = 1;
#else #else
big_endian = 0; big_endian = 0;

2
hw/nios2/boot.c
View File

@ -140,7 +140,7 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base,
uint64_t entry, high; uint64_t entry, high;
int big_endian = 0; int big_endian = 0;
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
big_endian = 1; big_endian = 1;
#endif #endif

2
hw/xtensa/sim.c
View File

@ -96,7 +96,7 @@ XtensaCPU *xtensa_sim_common_init(MachineState *machine)
void xtensa_sim_load_kernel(XtensaCPU *cpu, MachineState *machine) void xtensa_sim_load_kernel(XtensaCPU *cpu, MachineState *machine)
{ {
const char *kernel_filename = machine->kernel_filename; const char *kernel_filename = machine->kernel_filename;
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
int big_endian = true; int big_endian = true;
#else #else
int big_endian = false; int big_endian = false;

4
hw/xtensa/xtfpga.c
View File

@ -219,7 +219,7 @@ static const MemoryRegionOps xtfpga_io_ops = {
static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine) static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)
{ {
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
int be = 1; int be = 1;
#else #else
int be = 0; int be = 0;
@ -430,7 +430,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)
} }
if (entry_point != env->pc) { if (entry_point != env->pc) {
uint8_t boot[] = { uint8_t boot[] = {
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
0x60, 0x00, 0x08, /* j 1f */ 0x60, 0x00, 0x08, /* j 1f */
0x00, /* .literal_position */ 0x00, /* .literal_position */
0x00, 0x00, 0x00, 0x00, /* .literal entry_pc */ 0x00, 0x00, 0x00, 0x00, /* .literal entry_pc */

7
include/exec/cpu-all.h
View File

@ -37,11 +37,10 @@
* HOST_BIG_ENDIAN : whether the host cpu is big endian and * HOST_BIG_ENDIAN : whether the host cpu is big endian and
* otherwise little endian. * otherwise little endian.
* *
* TARGET_WORDS_BIGENDIAN : if defined, the host cpu is big endian and otherwise * TARGET_BIG_ENDIAN : same for the target cpu
* little endian.
*/ */
#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN) #if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
#define BSWAP_NEEDED #define BSWAP_NEEDED
#endif #endif
@ -121,7 +120,7 @@ static inline void tswap64s(uint64_t *s)
/* Target-endianness CPU memory access functions. These fit into the /* Target-endianness CPU memory access functions. These fit into the
* {ld,st}{type}{sign}{size}{endian}_p naming scheme described in bswap.h. * {ld,st}{type}{sign}{size}{endian}_p naming scheme described in bswap.h.
*/ */
#if defined(TARGET_WORDS_BIGENDIAN) #if TARGET_BIG_ENDIAN
#define lduw_p(p) lduw_be_p(p) #define lduw_p(p) lduw_be_p(p)
#define ldsw_p(p) ldsw_be_p(p) #define ldsw_p(p) ldsw_be_p(p)
#define ldl_p(p) ldl_be_p(p) #define ldl_p(p) ldl_be_p(p)

2
include/exec/cpu_ldst.h
View File

@ -377,7 +377,7 @@ static inline CPUTLBEntry *tlb_entry(CPUArchState *env, uintptr_t mmu_idx,
#endif /* defined(CONFIG_USER_ONLY) */ #endif /* defined(CONFIG_USER_ONLY) */
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
# define cpu_lduw_data cpu_lduw_be_data # define cpu_lduw_data cpu_lduw_be_data
# define cpu_ldsw_data cpu_ldsw_be_data # define cpu_ldsw_data cpu_ldsw_be_data
# define cpu_ldl_data cpu_ldl_be_data # define cpu_ldl_data cpu_ldl_be_data

2
include/exec/gdbstub.h
View File

@ -110,7 +110,7 @@ static inline int gdb_get_reg128(GByteArray *buf, uint64_t val_hi,
uint64_t val_lo) uint64_t val_lo)
{ {
uint64_t to_quad; uint64_t to_quad;
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
to_quad = tswap64(val_hi); to_quad = tswap64(val_hi);
g_byte_array_append(buf, (uint8_t *) &to_quad, 8); g_byte_array_append(buf, (uint8_t *) &to_quad, 8);
to_quad = tswap64(val_lo); to_quad = tswap64(val_lo);

2
include/exec/memop.h
View File

@ -36,7 +36,7 @@ typedef enum MemOp {
MO_BE = MO_BSWAP, MO_BE = MO_BSWAP,
#endif #endif
#ifdef NEED_CPU_H #ifdef NEED_CPU_H
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
MO_TE = MO_BE, MO_TE = MO_BE,
#else #else
MO_TE = MO_LE, MO_TE = MO_LE,

2
include/exec/memory.h
View File

@ -2931,7 +2931,7 @@ static inline MemOp devend_memop(enum device_endian end)
QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN &&
DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN);
#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN) #if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
/* Swap if non-host endianness or native (target) endianness */ /* Swap if non-host endianness or native (target) endianness */
return (end == DEVICE_HOST_ENDIAN) ? 0 : MO_BSWAP; return (end == DEVICE_HOST_ENDIAN) ? 0 : MO_BSWAP;
#else #else

2
include/exec/poison.h
View File

@ -38,7 +38,7 @@
#pragma GCC poison TARGET_HAS_BFLT #pragma GCC poison TARGET_HAS_BFLT
#pragma GCC poison TARGET_NAME #pragma GCC poison TARGET_NAME
#pragma GCC poison TARGET_SUPPORTS_MTTCG #pragma GCC poison TARGET_SUPPORTS_MTTCG
#pragma GCC poison TARGET_WORDS_BIGENDIAN #pragma GCC poison TARGET_BIG_ENDIAN
#pragma GCC poison BSWAP_NEEDED #pragma GCC poison BSWAP_NEEDED
#pragma GCC poison TARGET_LONG_BITS #pragma GCC poison TARGET_LONG_BITS

2
include/hw/core/cpu.h
View File

@ -1028,7 +1028,7 @@ void cpu_exec_unrealizefn(CPUState *cpu);
* target_words_bigendian: * target_words_bigendian:
* Returns true if the (default) endianness of the target is big endian, * Returns true if the (default) endianness of the target is big endian,
* false otherwise. Note that in target-specific code, you can use * false otherwise. Note that in target-specific code, you can use
* TARGET_WORDS_BIGENDIAN directly instead. On the other hand, common * TARGET_BIG_ENDIAN directly instead. On the other hand, common
* code should normally never need to know about the endianness of the * code should normally never need to know about the endianness of the
* target, so please do *not* use this function unless you know very well * target, so please do *not* use this function unless you know very well
* what you are doing! * what you are doing!

2
include/hw/mips/bios.h
View File

@ -5,7 +5,7 @@
#include "cpu.h" #include "cpu.h"
#define BIOS_SIZE (4 * MiB) #define BIOS_SIZE (4 * MiB)
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
#define BIOS_FILENAME "mips_bios.bin" #define BIOS_FILENAME "mips_bios.bin"
#else #else
#define BIOS_FILENAME "mipsel_bios.bin" #define BIOS_FILENAME "mipsel_bios.bin"

2
include/hw/virtio/virtio-access.h
View File

@ -28,7 +28,7 @@ static inline bool virtio_access_is_big_endian(VirtIODevice *vdev)
{ {
#if defined(LEGACY_VIRTIO_IS_BIENDIAN) #if defined(LEGACY_VIRTIO_IS_BIENDIAN)
return virtio_is_big_endian(vdev); return virtio_is_big_endian(vdev);
#elif defined(TARGET_WORDS_BIGENDIAN) #elif TARGET_BIG_ENDIAN
if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) {
/* Devices conforming to VIRTIO 1.0 or later are always LE. */ /* Devices conforming to VIRTIO 1.0 or later are always LE. */
return false; return false;

2
linux-user/aarch64/cpu_loop.c
View File

@ -202,7 +202,7 @@ void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs)
} }
env->pc = regs->pc; env->pc = regs->pc;
env->xregs[31] = regs->sp; env->xregs[31] = regs->sp;
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
env->cp15.sctlr_el[1] |= SCTLR_E0E; env->cp15.sctlr_el[1] |= SCTLR_E0E;
for (i = 1; i < 4; ++i) { for (i = 1; i < 4; ++i) {
env->cp15.sctlr_el[i] |= SCTLR_EE; env->cp15.sctlr_el[i] |= SCTLR_EE;

4
linux-user/aarch64/signal.c
View File

@ -147,7 +147,7 @@ static void target_setup_fpsimd_record(struct target_fpsimd_context *fpsimd,
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
uint64_t *q = aa64_vfp_qreg(env, i); uint64_t *q = aa64_vfp_qreg(env, i);
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
__put_user(q[0], &fpsimd->vregs[i * 2 + 1]); __put_user(q[0], &fpsimd->vregs[i * 2 + 1]);
__put_user(q[1], &fpsimd->vregs[i * 2]); __put_user(q[1], &fpsimd->vregs[i * 2]);
#else #else
@ -233,7 +233,7 @@ static void target_restore_fpsimd_record(CPUARMState *env,
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
uint64_t *q = aa64_vfp_qreg(env, i); uint64_t *q = aa64_vfp_qreg(env, i);
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
__get_user(q[0], &fpsimd->vregs[i * 2 + 1]); __get_user(q[0], &fpsimd->vregs[i * 2 + 1]);
__get_user(q[1], &fpsimd->vregs[i * 2]); __get_user(q[1], &fpsimd->vregs[i * 2]);
#else #else

2
linux-user/aarch64/target_syscall.h
View File

@ -8,7 +8,7 @@ struct target_pt_regs {
uint64_t pstate; uint64_t pstate;
}; };
#if defined(TARGET_WORDS_BIGENDIAN) #if TARGET_BIG_ENDIAN
#define UNAME_MACHINE "aarch64_be" #define UNAME_MACHINE "aarch64_be"
#else #else
#define UNAME_MACHINE "aarch64" #define UNAME_MACHINE "aarch64"

2
linux-user/arm/cpu_loop.c
View File

@ -519,7 +519,7 @@ void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs)
for(i = 0; i < 16; i++) { for(i = 0; i < 16; i++) {
env->regs[i] = regs->uregs[i]; env->regs[i] = regs->uregs[i];
} }
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
/* Enable BE8. */ /* Enable BE8. */
if (EF_ARM_EABI_VERSION(info->elf_flags) >= EF_ARM_EABI_VER4 if (EF_ARM_EABI_VERSION(info->elf_flags) >= EF_ARM_EABI_VER4
&& (info->elf_flags & EF_ARM_BE8)) { && (info->elf_flags & EF_ARM_BE8)) {

2
linux-user/arm/target_syscall.h
View File

@ -18,7 +18,7 @@ struct target_pt_regs {
#define ARM_NR_set_tls (ARM_NR_BASE + 5) #define ARM_NR_set_tls (ARM_NR_BASE + 5)
#define ARM_NR_get_tls (ARM_NR_BASE + 6) #define ARM_NR_get_tls (ARM_NR_BASE + 6)
#if defined(TARGET_WORDS_BIGENDIAN) #if TARGET_BIG_ENDIAN
#define UNAME_MACHINE "armv5teb" #define UNAME_MACHINE "armv5teb"
#else #else
#define UNAME_MACHINE "armv5tel" #define UNAME_MACHINE "armv5tel"

6
linux-user/elfload.c
View File

@ -105,7 +105,7 @@ int info_is_fdpic(struct image_info *info)
#define ELIBBAD 80 #define ELIBBAD 80
#endif #endif
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
#define ELF_DATA ELFDATA2MSB #define ELF_DATA ELFDATA2MSB
#else #else
#define ELF_DATA ELFDATA2LSB #define ELF_DATA ELFDATA2LSB
@ -483,7 +483,7 @@ static const char *get_elf_platform(void)
{ {
CPUARMState *env = thread_cpu->env_ptr; CPUARMState *env = thread_cpu->env_ptr;
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
# define END "b" # define END "b"
#else #else
# define END "l" # define END "l"
@ -514,7 +514,7 @@ static const char *get_elf_platform(void)
#define ELF_ARCH EM_AARCH64 #define ELF_ARCH EM_AARCH64
#define ELF_CLASS ELFCLASS64 #define ELF_CLASS ELFCLASS64
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
# define ELF_PLATFORM "aarch64_be" # define ELF_PLATFORM "aarch64_be"
#else #else
# define ELF_PLATFORM "aarch64" # define ELF_PLATFORM "aarch64"

4
linux-user/ppc/signal.c
View File

@ -215,7 +215,7 @@ static target_ulong get_sigframe(struct target_sigaction *ka,
return (oldsp - frame_size) & ~0xFUL; return (oldsp - frame_size) & ~0xFUL;
} }
#if defined(TARGET_WORDS_BIGENDIAN) == HOST_BIG_ENDIAN #if TARGET_BIG_ENDIAN == HOST_BIG_ENDIAN
#define PPC_VEC_HI 0 #define PPC_VEC_HI 0
#define PPC_VEC_LO 1 #define PPC_VEC_LO 1
#else #else
@ -542,7 +542,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
env->nip = (target_ulong) ka->_sa_handler; env->nip = (target_ulong) ka->_sa_handler;
#endif #endif
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
/* Signal handlers are entered in big-endian mode. */ /* Signal handlers are entered in big-endian mode. */
ppc_store_msr(env, env->msr & ~(1ull << MSR_LE)); ppc_store_msr(env, env->msr & ~(1ull << MSR_LE));
#else #else

2
linux-user/ppc/target_syscall.h
View File

@ -59,7 +59,7 @@ struct target_revectored_struct {
*/ */
#if defined(TARGET_PPC64) #if defined(TARGET_PPC64)
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
#define UNAME_MACHINE "ppc64" #define UNAME_MACHINE "ppc64"
#else #else
#define UNAME_MACHINE "ppc64le" #define UNAME_MACHINE "ppc64le"

2
linux-user/qemu.h
View File

@ -236,7 +236,7 @@ static inline bool access_ok(CPUState *cpu, int type,
} while (0) } while (0)
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
# define __put_user(x, hptr) __put_user_e(x, hptr, be) # define __put_user(x, hptr) __put_user_e(x, hptr, be)
# define __get_user(x, hptr) __get_user_e(x, hptr, be) # define __get_user(x, hptr) __get_user_e(x, hptr, be)
#else #else

6
linux-user/syscall.c
View File

@ -8132,7 +8132,7 @@ static int is_proc_myself(const char *filename, const char *entry)
return 0; return 0;
} }
#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN) || \ #if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN || \
defined(TARGET_SPARC) || defined(TARGET_M68K) || defined(TARGET_HPPA) defined(TARGET_SPARC) || defined(TARGET_M68K) || defined(TARGET_HPPA)
static int is_proc(const char *filename, const char *entry) static int is_proc(const char *filename, const char *entry)
{ {
@ -8140,7 +8140,7 @@ static int is_proc(const char *filename, const char *entry)
} }
#endif #endif
#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN) #if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
static int open_net_route(void *cpu_env, int fd) static int open_net_route(void *cpu_env, int fd)
{ {
FILE *fp; FILE *fp;
@ -8226,7 +8226,7 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags,
{ "stat", open_self_stat, is_proc_myself }, { "stat", open_self_stat, is_proc_myself },
{ "auxv", open_self_auxv, is_proc_myself }, { "auxv", open_self_auxv, is_proc_myself },
{ "cmdline", open_self_cmdline, is_proc_myself }, { "cmdline", open_self_cmdline, is_proc_myself },
#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN) #if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
{ "/proc/net/route", open_net_route, is_proc }, { "/proc/net/route", open_net_route, is_proc },
#endif #endif
#if defined(TARGET_SPARC) || defined(TARGET_HPPA) #if defined(TARGET_SPARC) || defined(TARGET_HPPA)

2
linux-user/uname.c
View File

@ -41,7 +41,7 @@ const char *cpu_to_uname_machine(void *cpu_env)
/* in theory, endianness is configurable on some ARM CPUs, but this isn't /* in theory, endianness is configurable on some ARM CPUs, but this isn't
* used in user mode emulation */ * used in user mode emulation */
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
#define utsname_suffix "b" #define utsname_suffix "b"
#else #else
#define utsname_suffix "l" #define utsname_suffix "l"

2
linux-user/user-internals.h
View File

@ -115,7 +115,7 @@ static inline int is_error(abi_long ret)
#if (TARGET_ABI_BITS == 32) && !defined(TARGET_ABI_MIPSN32) #if (TARGET_ABI_BITS == 32) && !defined(TARGET_ABI_MIPSN32)
static inline uint64_t target_offset64(uint32_t word0, uint32_t word1) static inline uint64_t target_offset64(uint32_t word0, uint32_t word1)
{ {
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
return ((uint64_t)word0 << 32) | word1; return ((uint64_t)word0 << 32) | word1;
#else #else
return ((uint64_t)word1 << 32) | word0; return ((uint64_t)word1 << 32) | word0;

2
linux-user/xtensa/signal.c
View File

@ -130,7 +130,7 @@ static int setup_sigcontext(struct target_rt_sigframe *frame,
static void install_sigtramp(uint8_t *tramp) static void install_sigtramp(uint8_t *tramp)
{ {
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
/* Generate instruction: MOVI a2, __NR_rt_sigreturn */ /* Generate instruction: MOVI a2, __NR_rt_sigreturn */
__put_user(0x22, &tramp[0]); __put_user(0x22, &tramp[0]);
__put_user(0x0a, &tramp[1]); __put_user(0x0a, &tramp[1]);

2
linux-user/xtensa/target_structs.h
View File

@ -15,7 +15,7 @@ struct target_ipc_perm {
struct target_semid64_ds { struct target_semid64_ds {
struct target_ipc_perm sem_perm; struct target_ipc_perm sem_perm;
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
abi_ulong __unused1; abi_ulong __unused1;
abi_ulong sem_otime; abi_ulong sem_otime;
abi_ulong __unused2; abi_ulong __unused2;

5
meson.build
View File

@ -2186,6 +2186,9 @@ foreach target : target_dirs
if 'TARGET_ABI_DIR' not in config_target if 'TARGET_ABI_DIR' not in config_target
config_target += {'TARGET_ABI_DIR': config_target['TARGET_ARCH']} config_target += {'TARGET_ABI_DIR': config_target['TARGET_ARCH']}
endif endif
if 'TARGET_BIG_ENDIAN' not in config_target
config_target += {'TARGET_BIG_ENDIAN': 'n'}
endif
foreach k, v: disassemblers foreach k, v: disassemblers
if host_arch.startswith(k) or config_target['TARGET_BASE_ARCH'].startswith(k) if host_arch.startswith(k) or config_target['TARGET_BASE_ARCH'].startswith(k)
@ -2210,6 +2213,8 @@ foreach target : target_dirs
config_target_data.set_quoted(k, v) config_target_data.set_quoted(k, v)
elif v == 'y' elif v == 'y'
config_target_data.set(k, 1) config_target_data.set(k, 1)
elif v == 'n'
config_target_data.set(k, 0)
else else
config_target_data.set(k, v) config_target_data.set(k, v)
endif endif

2
softmmu/memory.c
View File

@ -350,7 +350,7 @@ static void flatview_simplify(FlatView *view)
static bool memory_region_big_endian(MemoryRegion *mr) static bool memory_region_big_endian(MemoryRegion *mr)
{ {
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
return mr->ops->endianness != DEVICE_LITTLE_ENDIAN; return mr->ops->endianness != DEVICE_LITTLE_ENDIAN;
#else #else
return mr->ops->endianness == DEVICE_BIG_ENDIAN; return mr->ops->endianness == DEVICE_BIG_ENDIAN;

2
softmmu/qtest.c
View File

@ -714,7 +714,7 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
qtest_send(chr, "OK\n"); qtest_send(chr, "OK\n");
} else if (strcmp(words[0], "endianness") == 0) { } else if (strcmp(words[0], "endianness") == 0) {
qtest_send_prefix(chr); qtest_send_prefix(chr);
#if defined(TARGET_WORDS_BIGENDIAN) #if TARGET_BIG_ENDIAN
qtest_sendf(chr, "OK big\n"); qtest_sendf(chr, "OK big\n");
#else #else
qtest_sendf(chr, "OK little\n"); qtest_sendf(chr, "OK little\n");

2
target/arm/cpu.c
View File

@ -812,7 +812,7 @@ static void arm_disas_set_info(CPUState *cpu, disassemble_info *info)
sctlr_b = arm_sctlr_b(env); sctlr_b = arm_sctlr_b(env);
if (bswap_code(sctlr_b)) { if (bswap_code(sctlr_b)) {
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
info->endian = BFD_ENDIAN_LITTLE; info->endian = BFD_ENDIAN_LITTLE;
#else #else
info->endian = BFD_ENDIAN_BIG; info->endian = BFD_ENDIAN_BIG;

8
target/arm/cpu.h
View File

@ -3549,12 +3549,12 @@ static inline int cpu_mmu_index(CPUARMState *env, bool ifetch)
static inline bool bswap_code(bool sctlr_b) static inline bool bswap_code(bool sctlr_b)
{ {
#ifdef CONFIG_USER_ONLY #ifdef CONFIG_USER_ONLY
/* BE8 (SCTLR.B = 0, TARGET_WORDS_BIGENDIAN = 1) is mixed endian. /* BE8 (SCTLR.B = 0, TARGET_BIG_ENDIAN = 1) is mixed endian.
* The invalid combination SCTLR.B=1/CPSR.E=1/TARGET_WORDS_BIGENDIAN=0 * The invalid combination SCTLR.B=1/CPSR.E=1/TARGET_BIG_ENDIAN=0
* would also end up as a mixed-endian mode with BE code, LE data. * would also end up as a mixed-endian mode with BE code, LE data.
*/ */
return return
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
1 ^ 1 ^
#endif #endif
sctlr_b; sctlr_b;
@ -3570,7 +3570,7 @@ static inline bool bswap_code(bool sctlr_b)
static inline bool arm_cpu_bswap_data(CPUARMState *env) static inline bool arm_cpu_bswap_data(CPUARMState *env)
{ {
return return
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
1 ^ 1 ^
#endif #endif
arm_cpu_data_is_big_endian(env); arm_cpu_data_is_big_endian(env);

4
target/mips/cpu.c
View File

@ -189,7 +189,7 @@ static void mips_cpu_reset(DeviceState *dev)
/* Reset registers to their default values */ /* Reset registers to their default values */
env->CP0_PRid = env->cpu_model->CP0_PRid; env->CP0_PRid = env->cpu_model->CP0_PRid;
env->CP0_Config0 = env->cpu_model->CP0_Config0; env->CP0_Config0 = env->cpu_model->CP0_Config0;
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
env->CP0_Config0 |= (1 << CP0C0_BE); env->CP0_Config0 |= (1 << CP0C0_BE);
#endif #endif
env->CP0_Config1 = env->cpu_model->CP0_Config1; env->CP0_Config1 = env->cpu_model->CP0_Config1;
@ -418,7 +418,7 @@ static void mips_cpu_disas_set_info(CPUState *s, disassemble_info *info)
CPUMIPSState *env = &cpu->env; CPUMIPSState *env = &cpu->env;
if (!(env->insn_flags & ISA_NANOMIPS32)) { if (!(env->insn_flags & ISA_NANOMIPS32)) {
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
info->print_insn = print_insn_big_mips; info->print_insn = print_insn_big_mips;
#else #else
info->print_insn = print_insn_little_mips; info->print_insn = print_insn_little_mips;

10
target/mips/tcg/msa_helper.c
View File

@ -8218,7 +8218,7 @@ void helper_msa_ffint_u_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
#define MEMOP_IDX(DF) #define MEMOP_IDX(DF)
#endif #endif
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
static inline uint64_t bswap16x4(uint64_t x) static inline uint64_t bswap16x4(uint64_t x)
{ {
uint64_t m = 0x00ff00ff00ff00ffull; uint64_t m = 0x00ff00ff00ff00ffull;
@ -8258,7 +8258,7 @@ void helper_msa_ld_h(CPUMIPSState *env, uint32_t wd,
*/ */
d0 = cpu_ldq_le_data_ra(env, addr + 0, ra); d0 = cpu_ldq_le_data_ra(env, addr + 0, ra);
d1 = cpu_ldq_le_data_ra(env, addr + 8, ra); d1 = cpu_ldq_le_data_ra(env, addr + 8, ra);
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
d0 = bswap16x4(d0); d0 = bswap16x4(d0);
d1 = bswap16x4(d1); d1 = bswap16x4(d1);
#endif #endif
@ -8279,7 +8279,7 @@ void helper_msa_ld_w(CPUMIPSState *env, uint32_t wd,
*/ */
d0 = cpu_ldq_le_data_ra(env, addr + 0, ra); d0 = cpu_ldq_le_data_ra(env, addr + 0, ra);
d1 = cpu_ldq_le_data_ra(env, addr + 8, ra); d1 = cpu_ldq_le_data_ra(env, addr + 8, ra);
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
d0 = bswap32x2(d0); d0 = bswap32x2(d0);
d1 = bswap32x2(d1); d1 = bswap32x2(d1);
#endif #endif
@ -8345,7 +8345,7 @@ void helper_msa_st_h(CPUMIPSState *env, uint32_t wd,
/* Store 8 bytes at a time. See helper_msa_ld_h. */ /* Store 8 bytes at a time. See helper_msa_ld_h. */
d0 = pwd->d[0]; d0 = pwd->d[0];
d1 = pwd->d[1]; d1 = pwd->d[1];
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
d0 = bswap16x4(d0); d0 = bswap16x4(d0);
d1 = bswap16x4(d1); d1 = bswap16x4(d1);
#endif #endif
@ -8366,7 +8366,7 @@ void helper_msa_st_w(CPUMIPSState *env, uint32_t wd,
/* Store 8 bytes at a time. See helper_msa_ld_w. */ /* Store 8 bytes at a time. See helper_msa_ld_w. */
d0 = pwd->d[0]; d0 = pwd->d[0];
d1 = pwd->d[1]; d1 = pwd->d[1];
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
d0 = bswap32x2(d0); d0 = bswap32x2(d0);
d1 = bswap32x2(d1); d1 = bswap32x2(d1);
#endif #endif

2
target/ppc/cpu_init.c
View File

@ -7150,7 +7150,7 @@ static void ppc_cpu_reset(DeviceState *dev)
#if defined(TARGET_PPC64) #if defined(TARGET_PPC64)
msr |= (target_ulong)1 << MSR_TM; /* Transactional memory */ msr |= (target_ulong)1 << MSR_TM; /* Transactional memory */
#endif #endif
#if !defined(TARGET_WORDS_BIGENDIAN) #if !TARGET_BIG_ENDIAN
msr |= (target_ulong)1 << MSR_LE; /* Little-endian user mode */ msr |= (target_ulong)1 << MSR_LE; /* Little-endian user mode */
if (!((env->msr_mask >> MSR_LE) & 1)) { if (!((env->msr_mask >> MSR_LE) & 1)) {
fprintf(stderr, "Selected CPU does not support little-endian.\n"); fprintf(stderr, "Selected CPU does not support little-endian.\n");

4
target/ppc/gdbstub.c
View File

@ -87,9 +87,9 @@ static int ppc_gdb_register_len(int n)
/* /*
* We need to present the registers to gdb in the "current" memory * We need to present the registers to gdb in the "current" memory
* ordering. For user-only mode we get this for free; * ordering. For user-only mode we get this for free;
* TARGET_WORDS_BIGENDIAN is set to the proper ordering for the * TARGET_BIG_ENDIAN is set to the proper ordering for the
* binary, and cannot be changed. For system mode, * binary, and cannot be changed. For system mode,
* TARGET_WORDS_BIGENDIAN is always set, and we must check the current * TARGET_BIG_ENDIAN is always set, and we must check the current
* mode of the chip to see if we're running in little-endian. * mode of the chip to see if we're running in little-endian.
*/ */
void ppc_maybe_bswap_register(CPUPPCState *env, uint8_t *mem_buf, int len) void ppc_maybe_bswap_register(CPUPPCState *env, uint8_t *mem_buf, int len)

2
target/ppc/mem_helper.c
View File

@ -32,7 +32,7 @@
static inline bool needs_byteswap(const CPUPPCState *env) static inline bool needs_byteswap(const CPUPPCState *env)
{ {
#if defined(TARGET_WORDS_BIGENDIAN) #if TARGET_BIG_ENDIAN
return msr_le; return msr_le;
#else #else
return !msr_le; return !msr_le;

2
target/ppc/translate.c
View File

@ -193,7 +193,7 @@ struct DisasContext {
/* Return true iff byteswap is needed in a scalar memop */ /* Return true iff byteswap is needed in a scalar memop */
static inline bool need_byteswap(const DisasContext *ctx) static inline bool need_byteswap(const DisasContext *ctx)
{ {
#if defined(TARGET_WORDS_BIGENDIAN) #if TARGET_BIG_ENDIAN
return ctx->le_mode; return ctx->le_mode;
#else #else
return !ctx->le_mode; return !ctx->le_mode;

2
target/xtensa/cpu.h
View File

@ -590,7 +590,7 @@ void xtensa_cpu_do_unaligned_access(CPUState *cpu, vaddr addr,
#define XTENSA_CPU_TYPE_NAME(model) model XTENSA_CPU_TYPE_SUFFIX #define XTENSA_CPU_TYPE_NAME(model) model XTENSA_CPU_TYPE_SUFFIX
#define CPU_RESOLVING_TYPE TYPE_XTENSA_CPU #define CPU_RESOLVING_TYPE TYPE_XTENSA_CPU
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
#define XTENSA_DEFAULT_CPU_MODEL "fsf" #define XTENSA_DEFAULT_CPU_MODEL "fsf"
#define XTENSA_DEFAULT_CPU_NOMMU_MODEL "fsf" #define XTENSA_DEFAULT_CPU_NOMMU_MODEL "fsf"
#else #else

2
target/xtensa/overlay_tool.h
View File

@ -449,7 +449,7 @@
#endif #endif
#if (defined(TARGET_WORDS_BIGENDIAN) != 0) == (XCHAL_HAVE_BE != 0) #if TARGET_BIG_ENDIAN == (XCHAL_HAVE_BE != 0)
#define REGISTER_CORE(core) \ #define REGISTER_CORE(core) \
static void __attribute__((constructor)) register_core(void) \ static void __attribute__((constructor)) register_core(void) \
{ \ { \

6
target/xtensa/translate.c
View File

@ -1471,14 +1471,14 @@ static void translate_b(DisasContext *dc, const OpcodeArg arg[],
static void translate_bb(DisasContext *dc, const OpcodeArg arg[], static void translate_bb(DisasContext *dc, const OpcodeArg arg[],
const uint32_t par[]) const uint32_t par[])
{ {
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
TCGv_i32 bit = tcg_const_i32(0x80000000u); TCGv_i32 bit = tcg_const_i32(0x80000000u);
#else #else
TCGv_i32 bit = tcg_const_i32(0x00000001u); TCGv_i32 bit = tcg_const_i32(0x00000001u);
#endif #endif
TCGv_i32 tmp = tcg_temp_new_i32(); TCGv_i32 tmp = tcg_temp_new_i32();
tcg_gen_andi_i32(tmp, arg[1].in, 0x1f); tcg_gen_andi_i32(tmp, arg[1].in, 0x1f);
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
tcg_gen_shr_i32(bit, bit, tmp); tcg_gen_shr_i32(bit, bit, tmp);
#else #else
tcg_gen_shl_i32(bit, bit, tmp); tcg_gen_shl_i32(bit, bit, tmp);
@ -1493,7 +1493,7 @@ static void translate_bbi(DisasContext *dc, const OpcodeArg arg[],
const uint32_t par[]) const uint32_t par[])
{ {
TCGv_i32 tmp = tcg_temp_new_i32(); TCGv_i32 tmp = tcg_temp_new_i32();
#ifdef TARGET_WORDS_BIGENDIAN #if TARGET_BIG_ENDIAN
tcg_gen_andi_i32(tmp, arg[0].in, 0x80000000u >> arg[1].imm); tcg_gen_andi_i32(tmp, arg[0].in, 0x80000000u >> arg[1].imm);
#else #else
tcg_gen_andi_i32(tmp, arg[0].in, 0x00000001u << arg[1].imm); tcg_gen_andi_i32(tmp, arg[0].in, 0x00000001u << arg[1].imm);

2
tests/tcg/xtensa/Makefile.softmmu-target
View File

@ -2,7 +2,7 @@
# Xtensa softmmu tests # Xtensa softmmu tests
# #
ifneq ($(TARGET_WORDS_BIGENDIAN),y) ifneq ($(TARGET_BIG_ENDIAN),y)
XTENSA_SRC = $(SRC_PATH)/tests/tcg/xtensa XTENSA_SRC = $(SRC_PATH)/tests/tcg/xtensa
XTENSA_ALL = $(filter-out $(XTENSA_SRC)/linker.ld.S,$(wildcard $(XTENSA_SRC)/*.S)) XTENSA_ALL = $(filter-out $(XTENSA_SRC)/linker.ld.S,$(wildcard $(XTENSA_SRC)/*.S))