Skip to content

Commit dba6636

Browse files
committed
misc: move trim func out of anon namespace
Change-Id: I16d6b8d495ef16e9e20f4b5ca5a8262484674ae6
1 parent 03981d9 commit dba6636

File tree

2 files changed

+16
-20
lines changed

2 files changed

+16
-20
lines changed

src/cpu/o3/fetch.cc

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -81,29 +81,9 @@ namespace gem5
8181
namespace o3
8282
{
8383

84-
namespace
85-
{
86-
8784
constexpr uint8_t RvcInstBytes = 2;
8885
constexpr uint8_t BaseInstBytes = 4;
8986

90-
void
91-
trimResolveTrainInstsAfterTaken(Fetch::ResolveTrainQueueEntry &entry)
92-
{
93-
auto first_taken = std::find_if(
94-
entry.insts.begin(), entry.insts.end(),
95-
[](const Fetch::ResolveTrainInstData &inst_data) {
96-
return inst_data.taken;
97-
});
98-
if (first_taken == entry.insts.end()) {
99-
return;
100-
}
101-
102-
entry.insts.erase(std::next(first_taken), entry.insts.end());
103-
}
104-
105-
} // anonymous namespace
106-
10787
Fetch::IcachePort::IcachePort(Fetch *_fetch, CPU *_cpu) :
10888
RequestPort(_cpu->name() + ".icache_port", _cpu), fetch(_fetch)
10989
{}
@@ -1657,6 +1637,21 @@ Fetch::appendResolveTrainInst(
16571637
trimResolveTrainInstsAfterTaken(entry);
16581638
}
16591639

1640+
void
1641+
Fetch::trimResolveTrainInstsAfterTaken(ResolveTrainQueueEntry &entry)
1642+
{
1643+
auto first_taken = std::find_if(
1644+
entry.insts.begin(), entry.insts.end(),
1645+
[](const ResolveTrainInstData &inst_data) {
1646+
return inst_data.taken;
1647+
});
1648+
if (first_taken == entry.insts.end()) {
1649+
return;
1650+
}
1651+
1652+
entry.insts.erase(std::next(first_taken), entry.insts.end());
1653+
}
1654+
16601655
void
16611656
Fetch::filterResolveTrainQueue()
16621657
{

src/cpu/o3/fetch.hh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,7 @@ class Fetch
500500
const ResolveTrainQueueEntry &entry) const;
501501
void appendResolveTrainInst(
502502
ResolveTrainQueueEntry &entry, const ResolveTrainInstData &inst_data);
503+
void trimResolveTrainInstsAfterTaken(ResolveTrainQueueEntry &entry);
503504
void filterResolveTrainQueue();
504505

505506
/** Handles decode squash signals.

0 commit comments

Comments
 (0)