From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 5 Aug 2009 10:00:03 +0000 (-0700)
Subject: X86: Handle rotating right all the way around or more.
X-Git-Tag: Calvin_Submission~176
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=64d794869271485b79123951d5b198b8a9b12885;p=gem5.git

X86: Handle rotating right all the way around or more.
---

diff --git a/src/arch/x86/isa/microops/regop.isa b/src/arch/x86/isa/microops/regop.isa
index 85fe8fe51..2514be91a 100644
--- a/src/arch/x86/isa/microops/regop.isa
+++ b/src/arch/x86/isa/microops/regop.isa
@@ -727,10 +727,11 @@ let {{
         code = '''
             uint8_t shiftAmt =
                 (op2 & ((dataSize == 8) ? mask(6) : mask(5)));
-            if(shiftAmt)
+            uint8_t realShiftAmt = shiftAmt % (dataSize * 8);
+            if(realShiftAmt)
             {
-                uint64_t top = psrc1 << (dataSize * 8 - shiftAmt);
-                uint64_t bottom = bits(psrc1, dataSize * 8, shiftAmt);
+                uint64_t top = psrc1 << (dataSize * 8 - realShiftAmt);
+                uint64_t bottom = bits(psrc1, dataSize * 8, realShiftAmt);
                 DestReg = merge(DestReg, top | bottom, dataSize);
             }
             else