derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arch,cpu: Make branching() a virtual member of PCStateBase.

Browse Source 
Change-Id: I4422d07024e97dbd67e97ad95a16e1b06fd6be12
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/52066
Tested-by: kokoro <noreply+kokoro@google.com>
Maintainer: Gabe Black <gabe.black@gmail.com>
Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br>
This commit is contained in:
Gabe Black
2021-10-16 04:13:08 -07:00
parent f8b8ab90ac
commit 9f2fa6c4ce
7 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cpu/o3/fetch.cc
View File

@@ -1287,7 +1287,7 @@ Fetch::fetch(bool &status_change)
// If we're branching after this instruction, quit fetching
// from the same block.
predictedBranch |= this_pc.as<TheISA::PCState>().branching();
predictedBranch |= this_pc.branching();
predictedBranch |= lookupAndUpdateNextPC(instruction, *next_pc);
if (predictedBranch) {
DPRINTF(Fetch, "Branch detected with PC = %s\n", this_pc);

3
src/cpu/o3/iew.cc
View File

@@ -461,8 +461,7 @@ IEW::squashDueToBranch(const DynInstPtr& inst, ThreadID tid)
inst->seqNum < toCommit->squashedSeqNum[tid]) {
toCommit->squash[tid] = true;
toCommit->squashedSeqNum[tid] = inst->seqNum;
toCommit->branchTaken[tid] =
inst->pcState().as<TheISA::PCState>().branching();
toCommit->branchTaken[tid] = inst->pcState().branching();
set(toCommit->pc[tid], inst->pcState());
inst->staticInst->advancePC(*toCommit->pc[tid]);

3
src/cpu/simple/base.cc
View File

@@ -461,8 +461,7 @@ BaseSimpleCPU::advancePC(const Fault &fault)
SimpleExecContext &t_info = *threadInfo[curThread];
SimpleThread* thread = t_info.thread;
const bool branching =
thread->pcState().as<TheISA::PCState>().branching();
const bool branching = thread->pcState().branching();
//Since we're moving to a new pc, zero out the offset
t_info.fetchOffset = 0;