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

Some fixes for decode stage branches without delay slots. This will need some work to be compatible with delay slots too. Also changed some direct variable uses to use an accessor function.

Browse source 
--HG--
extra : convert_revision : b291292600e9d3e7e4a8255daf54342b736c7e35
This commit is contained in:
Gabe Black 2006-12-28 14:32:41 -05:00
parent 15df0a27bb
commit d24f60788f
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/cpu/o3/decode_impl.hh
View file

@ -282,6 +282,10 @@ DefaultDecode<Impl>::squash(DynInstPtr &inst, unsigned tid)
toFetch->decodeInfo[tid].doneSeqNum = inst->seqNum; toFetch->decodeInfo[tid].doneSeqNum = inst->seqNum;
toFetch->decodeInfo[tid].squash = true; toFetch->decodeInfo[tid].squash = true;
toFetch->decodeInfo[tid].nextPC = inst->branchTarget(); toFetch->decodeInfo[tid].nextPC = inst->branchTarget();
///FIXME There needs to be a way to set the nextPC and nextNPC
///explicitly for ISAs with delay slots.
toFetch->decodeInfo[tid].nextNPC =
inst->branchTarget() + sizeof(TheISA::MachInst);
#if ISA_HAS_DELAY_SLOT #if ISA_HAS_DELAY_SLOT
toFetch->decodeInfo[tid].branchTaken = inst->readNextNPC() != toFetch->decodeInfo[tid].branchTaken = inst->readNextNPC() !=
(inst->readNextPC() + sizeof(TheISA::MachInst)); (inst->readNextPC() + sizeof(TheISA::MachInst));
@ -742,8 +746,8 @@ DefaultDecode<Impl>::decodeInsts(unsigned tid)
// Ensure that if it was predicted as a branch, it really is a // Ensure that if it was predicted as a branch, it really is a
// branch. // branch.
if (inst->readPredTaken() && !inst->isControl()) { if (inst->readPredTaken() && !inst->isControl()) {
DPRINTF(Decode, "PredPC : %#x != NextPC: %#x\n",inst->predPC, DPRINTF(Decode, "PredPC : %#x != NextPC: %#x\n",
inst->nextPC + 4); inst->readPredPC(), inst->readNextPC() + 4);
panic("Instruction predicted as a branch!"); panic("Instruction predicted as a branch!");