From bbdd7cecb90704cf33277816e18aaf2b8e2ff8c2 Mon Sep 17 00:00:00 2001 From: Nathanael Premillieu Date: Sun, 22 Nov 2015 05:10:18 -0500 Subject: [PATCH] arm: Fix fplib 128-bit shift operators Appease clang. --- src/arch/arm/insts/fplib.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/arch/arm/insts/fplib.cc b/src/arch/arm/insts/fplib.cc index 98410dd38..e01644887 100644 --- a/src/arch/arm/insts/fplib.cc +++ b/src/arch/arm/insts/fplib.cc @@ -101,7 +101,10 @@ lsr64(uint64_t x, uint32_t shift) static inline void lsl128(uint64_t *r0, uint64_t *r1, uint64_t x0, uint64_t x1, uint32_t shift) { - if (shift < 64) { + if (shift == 0) { + *r1 = x1; + *r0 = x0; + } else if (shift < 64) { *r1 = x1 << shift | x0 >> (64 - shift); *r0 = x0 << shift; } else if (shift < 128) { @@ -116,7 +119,10 @@ lsl128(uint64_t *r0, uint64_t *r1, uint64_t x0, uint64_t x1, uint32_t shift) static inline void lsr128(uint64_t *r0, uint64_t *r1, uint64_t x0, uint64_t x1, uint32_t shift) { - if (shift < 64) { + if (shift == 0) { + *r1 = x1; + *r0 = x0; + } else if (shift < 64) { *r0 = x0 >> shift | x1 << (64 - shift); *r1 = x1 >> shift; } else if (shift < 128) { -- 2.30.2