motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 00:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

exec/cpu-all: remove BSWAP_NEEDED

Browse source 
This identifier is poisoned, so it can't be used from common code
anyway. We replace all occurrences with its definition directly.

Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Link: https://lore.kernel.org/r/20250320223002.2915728-2-pierrick.bouvier@linaro.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Pierrick Bouvier 2025-03-20 15:29:33 -07:00 • committed by Paolo Bonzini
parent 134ab17fff
commit e16354b7f2
5 changed files with 8 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
bsd-user/elfload.c
View file

@ -44,7 +44,7 @@ static inline void memcpy_fromfs(void *to, const void *from, unsigned long n)
memcpy(to, from, n); memcpy(to, from, n);
} }
#ifdef BSWAP_NEEDED #if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
static void bswap_ehdr(struct elfhdr *ehdr) static void bswap_ehdr(struct elfhdr *ehdr)
{ {
bswap16s(&ehdr->e_type); /* Object file type */ bswap16s(&ehdr->e_type); /* Object file type */
@ -111,7 +111,7 @@ static void bswap_note(struct elf_note *en)
bswap32s(&en->n_type); bswap32s(&en->n_type);
} }
#else /* ! BSWAP_NEEDED */ #else
static void bswap_ehdr(struct elfhdr *ehdr) { } static void bswap_ehdr(struct elfhdr *ehdr) { }
static void bswap_phdr(struct elf_phdr *phdr, int phnum) { } static void bswap_phdr(struct elf_phdr *phdr, int phnum) { }
@ -119,7 +119,7 @@ static void bswap_shdr(struct elf_shdr *shdr, int shnum) { }
static void bswap_sym(struct elf_sym *sym) { } static void bswap_sym(struct elf_sym *sym) { }
static void bswap_note(struct elf_note *en) { } static void bswap_note(struct elf_note *en) { }
#endif /* ! BSWAP_NEEDED */ #endif /* HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN */
#include "elfcore.c" #include "elfcore.c"

12
include/exec/cpu-all.h
View file

@ -26,18 +26,6 @@
#include "exec/tswap.h" #include "exec/tswap.h"
#include "hw/core/cpu.h" #include "hw/core/cpu.h"
/* some important defines:
*
* HOST_BIG_ENDIAN : whether the host cpu is big endian and
* otherwise little endian.
*
* TARGET_BIG_ENDIAN : same for the target cpu
*/
#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
#define BSWAP_NEEDED
#endif
/* 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.
*/ */

1
include/exec/poison.h
View file

@ -37,7 +37,6 @@
#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_BIG_ENDIAN #pragma GCC poison TARGET_BIG_ENDIAN
#pragma GCC poison BSWAP_NEEDED
#pragma GCC poison TARGET_LONG_BITS #pragma GCC poison TARGET_LONG_BITS
#pragma GCC poison TARGET_FMT_lx #pragma GCC poison TARGET_FMT_lx

8
linux-user/elfload.c
View file

@ -2121,7 +2121,7 @@ static inline void memcpy_fromfs(void * to, const void * from, unsigned long n)
memcpy(to, from, n); memcpy(to, from, n);
} }
#ifdef BSWAP_NEEDED #if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
static void bswap_ehdr(struct elfhdr *ehdr) static void bswap_ehdr(struct elfhdr *ehdr)
{ {
bswap16s(&ehdr->e_type); /* Object file type */ bswap16s(&ehdr->e_type); /* Object file type */
@ -3143,7 +3143,7 @@ static bool parse_elf_properties(const ImageSource *src,
* The contents of a valid PT_GNU_PROPERTY is a sequence of uint32_t. * The contents of a valid PT_GNU_PROPERTY is a sequence of uint32_t.
* Swap most of them now, beyond the header and namesz. * Swap most of them now, beyond the header and namesz.
*/ */
#ifdef BSWAP_NEEDED #if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
for (int i = 4; i < n / 4; i++) { for (int i = 4; i < n / 4; i++) {
bswap32s(note.data + i); bswap32s(note.data + i);
} }
@ -3999,7 +3999,7 @@ struct target_elf_prpsinfo {
char pr_psargs[ELF_PRARGSZ]; /* initial part of arg list */ char pr_psargs[ELF_PRARGSZ]; /* initial part of arg list */
}; };
#ifdef BSWAP_NEEDED #if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
static void bswap_prstatus(struct target_elf_prstatus *prstatus) static void bswap_prstatus(struct target_elf_prstatus *prstatus)
{ {
prstatus->pr_info.si_signo = tswap32(prstatus->pr_info.si_signo); prstatus->pr_info.si_signo = tswap32(prstatus->pr_info.si_signo);
@ -4038,7 +4038,7 @@ static void bswap_note(struct elf_note *en)
static inline void bswap_prstatus(struct target_elf_prstatus *p) { } static inline void bswap_prstatus(struct target_elf_prstatus *p) { }
static inline void bswap_psinfo(struct target_elf_prpsinfo *p) {} static inline void bswap_psinfo(struct target_elf_prpsinfo *p) {}
static inline void bswap_note(struct elf_note *en) { } static inline void bswap_note(struct elf_note *en) { }
#endif /* BSWAP_NEEDED */ #endif /* HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN */
/* /*
* Calculate file (dump) size of given memory region. * Calculate file (dump) size of given memory region.

2
linux-user/syscall_defs.h
View file

@ -462,7 +462,7 @@ typedef struct {
abi_ulong sig[TARGET_NSIG_WORDS]; abi_ulong sig[TARGET_NSIG_WORDS];
} target_sigset_t; } target_sigset_t;
#ifdef BSWAP_NEEDED #if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
static inline void tswap_sigset(target_sigset_t *d, const target_sigset_t *s) static inline void tswap_sigset(target_sigset_t *d, const target_sigset_t *s)
{ {
int i; int i;