OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

optionrom: do not rely on compiler's bswap optimization

Browse Source 
Recent compilers can detect and inline manually-written bswap code,
but GCC 4.2.1 (the last GPLv2 version) cannot and generates really
awful code.  Depending on how the compiler is configured, it might
also not want to generate bswap because it was not in i386.  Using
asm is fine because TCG knows about bswap and all processors with
virtualization extensions also do.

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2016-09-02 17:36:23 +02:00
parent 0cebabd5e8
commit 0342454f8a
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pc-bios/linuxboot_dma.bin
View File

Binary file not shown.

18
pc-bios/optionrom/linuxboot_dma.c
View File

@ -122,24 +122,14 @@ static inline void writel_es(uint16_t offset, uint32_t val)
static inline uint32_t bswap32(uint32_t x) static inline uint32_t bswap32(uint32_t x)
{ {
return asm("bswapl %0" : "=r" (x) : "0" (x));
((x & 0x000000ffU) << 24) | return x;
((x & 0x0000ff00U) << 8) |
((x & 0x00ff0000U) >> 8) |
((x & 0xff000000U) >> 24);
} }
static inline uint64_t bswap64(uint64_t x) static inline uint64_t bswap64(uint64_t x)
{ {
return asm("bswapl %%eax; bswapl %%edx; xchg %%eax, %%edx" : "=A" (x) : "0" (x));
((x & 0x00000000000000ffULL) << 56) | return x;
((x & 0x000000000000ff00ULL) << 40) |
((x & 0x0000000000ff0000ULL) << 24) |
((x & 0x00000000ff000000ULL) << 8) |
((x & 0x000000ff00000000ULL) >> 8) |
((x & 0x0000ff0000000000ULL) >> 24) |
((x & 0x00ff000000000000ULL) >> 40) |
((x & 0xff00000000000000ULL) >> 56);
} }
static inline uint64_t cpu_to_be64(uint64_t x) static inline uint64_t cpu_to_be64(uint64_t x)