From 22a5f66820b9c2399898a7ba741ecda49a3c235d Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 5 Aug 2009 02:56:38 -0700 Subject: [PATCH] X86: Fix the carry flag for shl. --- src/arch/x86/isa/microops/regop.isa | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/arch/x86/isa/microops/regop.isa b/src/arch/x86/isa/microops/regop.isa index 698216139..ac380f34b 100644 --- a/src/arch/x86/isa/microops/regop.isa +++ b/src/arch/x86/isa/microops/regop.isa @@ -648,8 +648,10 @@ let {{ ccFlagBits = ccFlagBits & ~(ext & (CFBit | ECFBit | OFBit)); int CFBits = 0; //Figure out if we -would- set the CF bits if requested. - if (bits(SrcReg1, dataSize * 8 - shiftAmt)) + if (shiftAmt <= dataSize * 8 && + bits(SrcReg1, dataSize * 8 - shiftAmt)) { CFBits = 1; + } //If some combination of the CF bits need to be set, set them. if ((ext & (CFBit | ECFBit)) && CFBits) ccFlagBits = ccFlagBits | (ext & (CFBit | ECFBit)); -- 2.30.2