misc: Merge branch 'release-staging-v20.1.0.0' into develop

Change-Id: I3694b251855b969c7bd3807f34e1b4241d47d586
This commit is contained in:
Bobby R. Bruce
2020-09-30 20:39:06 -07:00
33 changed files with 198 additions and 91 deletions

View File

@@ -92,7 +92,8 @@ AbstractMemory::initState()
panic_if(!image_range.isSubset(range), "%s: memory image %s doesn't fit.",
name(), file);
PortProxy proxy([this](PacketPtr pkt) { functionalAccess(pkt); }, size());
PortProxy proxy([this](PacketPtr pkt) { functionalAccess(pkt); },
system()->cacheLineSize());
panic_if(!image.write(proxy), "%s: Unable to write image.");
}

View File

@@ -41,8 +41,8 @@
#include <vector>
std::ostream& operator<<(std::ostream& os, const BoolVec& myvector) {
for (const auto& it: myvector) {
os << " " << it;
for (const bool e: myvector) {
os << " " << e;
}
return os;
}

View File

@@ -256,8 +256,8 @@ inline int
countBoolVec(BoolVec bVec)
{
int count = 0;
for (const auto &it: bVec) {
if (it) {
for (const bool e: bVec) {
if (e) {
count++;
}
}

View File

@@ -167,7 +167,7 @@ Sequencer::wakeup()
int total_outstanding = 0;
for (const auto &table_entry : m_RequestTable) {
for (const auto seq_req : table_entry.second) {
for (const auto &seq_req : table_entry.second) {
if (current_time - seq_req.issue_time < m_deadlock_threshold)
continue;