sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

X86: Fix how ECF is computed in genFlags, and get rid of some duplicate code.

Browse source 
--HG--
extra : convert_revision : f86330a5a9fea782ee63aaa18ca964fb6f9cef0b
This commit is contained in:
Gabe Black 2007-09-13 16:35:41 -07:00
parent 534c6a800a
commit bbc8a40857
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/arch/x86/insts/microregop.cc
View file

@ -68,17 +68,15 @@ namespace X86ISA
{
DPRINTF(Sparc, "flagMask = %#x\n", flagMask);
uint64_t flags = oldFlags & ~flagMask;
if(flagMask & CFBit)
if(flagMask & (ECFBit | CFBit))
{
if(findCarry(dataSize*8, _dest, _src1, _src2))
flags |= CFBit;
flags |= (flagMask & (ECFBit | CFBit));
if(subtract)
flags ^= CFBit;
flags ^= (flagMask & (ECFBit | CFBit));
}
if(flagMask & PFBit && findParity(dataSize*8, _dest))
flags |= PFBit;
if(flagMask & ECFBit && findCarry(dataSize*8, _dest, _src1, _src2))
flags |= ECFBit;
if(flagMask & AFBit)
{
if(findCarry(4, _dest, _src1, _src2))
@ -86,10 +84,8 @@ namespace X86ISA
if(subtract)
flags ^= AFBit;
}
if(flagMask & EZFBit && findZero(dataSize*8, _dest))
flags |= EZFBit;
if(flagMask & ZFBit && findZero(dataSize*8, _dest))
flags |= ZFBit;
if(flagMask & (EZFBit | ZFBit) && findZero(dataSize*8, _dest))
flags |= (flagMask & (EZFBit | ZFBit));
if(flagMask & SFBit && findNegative(dataSize*8, _dest))
flags |= SFBit;
if(flagMask & OFBit && findOverflow(dataSize*8, _dest, _src1, _src2))

2
src/arch/x86/isa/insts/processor_information.py
View file

@ -74,7 +74,7 @@ def macroop CPUID_R {
movi t2, t2, 0x18, flags=(nCEZF,)
subi t0, t1, t2, flags=(ECF,)
# ECF will be set if the offset is too large.
bri t0, label("end"), flags=(CECF,)
bri t0, label("end"), flags=(nCECF,)
#