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

cpu: Fix ?: error due to different type

Browse Source 
Change-Id: I35c50fbba047fe05cc0cc29c631002a9b68795fd
This commit is contained in:
Roger Chang
2023-08-10 14:35:19 +08:00
parent 81e3bfcdc3
commit f54777419d
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/cpu/pred/bpred_unit.cc
View File

@@ -498,16 +498,25 @@ BPredUnit::squash(const InstSeqNum &squashed_sn,
hist_it->pushedRAS = false;
}
if (hist_it->usedRAS) {
std::string RASTarget;
DPRINTF(Branch,
"[tid:%i] [squash sn:%llu] Incorrectly predicted "
"return [sn:%llu] PC: %#x Restoring RAS\n", tid,
squashed_sn,
hist_it->seqNum, hist_it->pc);
DPRINTF(Branch,
if (hist_it->RASTarget) {
std::ostringstream os;
os << *hist_it->RASTarget.get();
RASTarget = os.str();
} else {
RASTarget = "no RAS";
}
DPRINTF(Branch,
"[tid:%i] [squash sn:%llu] Restoring top of RAS "
"to: %i, target: %s\n", tid, squashed_sn,
hist_it->RASIndex,
hist_it->RASIndex ? *hist_it->RASTarget.get() : "no RAS");
hist_it->RASIndex, RASTarget.c_str());
RAS[tid].restore(hist_it->RASIndex, hist_it->RASTarget.get());
hist_it->usedRAS = false;
}