From: David Given <dg@cowlark.com>
Date: Sun, 17 Jun 2018 09:00:01 +0000 (+0200)
Subject: Fix edge case in rlwnm when the mask is 32 bits wide. All tests now pass.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=89e8956bb2f174aac7e31c1170ca9c1c592efdb2;p=ack.git

Fix edge case in rlwnm when the mask is 32 bits wide. All tests now pass.
---

diff --git a/plat/linuxppc/emu/emu.c b/plat/linuxppc/emu/emu.c
index ae1fb929f..90c9fd518 100644
--- a/plat/linuxppc/emu/emu.c
+++ b/plat/linuxppc/emu/emu.c
@@ -278,7 +278,7 @@ static uint32_t rotate(uint32_t i, uint32_t shift)
 static uint32_t rlwnm(uint32_t source, uint8_t shift, uint8_t mb, uint8_t me)
 {
 	uint8_t masksize = 1 + me - mb; /* me and mb are inclusive */
-	uint32_t mask = ((1<<masksize)-1) << (31 - me);
+	uint32_t mask = (((uint64_t)1<<masksize)-1) << (31 - me);
 	return rotate(source, shift) & mask;
 }