diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-09-02 17:36:23 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-09-13 19:09:44 +0200 |
| commit | 0342454f8aa6fc55e515bad26425533e10b58085 (patch) | |
| tree | edbc9f66676cbf5282fce5cae4542b472b3b74e1 | |
| parent | 0cebabd5e8277864ef87b4526cb1c9b3f0c06ee7 (diff) | |
optionrom: do not rely on compiler's bswap optimization
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>
| -rw-r--r-- | pc-bios/linuxboot_dma.bin | bin | 1536 -> 1536 bytes | |||
| -rw-r--r-- | pc-bios/optionrom/linuxboot_dma.c | 18 |
2 files changed, 4 insertions, 14 deletions
diff --git a/pc-bios/linuxboot_dma.bin b/pc-bios/linuxboot_dma.bin Binary files differindex 238a195d38..218d3ab4a2 100644 --- a/pc-bios/linuxboot_dma.bin +++ b/pc-bios/linuxboot_dma.bin diff --git a/pc-bios/optionrom/linuxboot_dma.c b/pc-bios/optionrom/linuxboot_dma.c index 7549797732..4754282ad7 100644 --- a/pc-bios/optionrom/linuxboot_dma.c +++ b/pc-bios/optionrom/linuxboot_dma.c @@ -122,24 +122,14 @@ static inline void writel_es(uint16_t offset, uint32_t val) static inline uint32_t bswap32(uint32_t x) { - return - ((x & 0x000000ffU) << 24) | - ((x & 0x0000ff00U) << 8) | - ((x & 0x00ff0000U) >> 8) | - ((x & 0xff000000U) >> 24); + asm("bswapl %0" : "=r" (x) : "0" (x)); + return x; } static inline uint64_t bswap64(uint64_t x) { - return - ((x & 0x00000000000000ffULL) << 56) | - ((x & 0x000000000000ff00ULL) << 40) | - ((x & 0x0000000000ff0000ULL) << 24) | - ((x & 0x00000000ff000000ULL) << 8) | - ((x & 0x000000ff00000000ULL) >> 8) | - ((x & 0x0000ff0000000000ULL) >> 24) | - ((x & 0x00ff000000000000ULL) >> 40) | - ((x & 0xff00000000000000ULL) >> 56); + asm("bswapl %%eax; bswapl %%edx; xchg %%eax, %%edx" : "=A" (x) : "0" (x)); + return x; } static inline uint64_t cpu_to_be64(uint64_t x) |