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

gem5: Fix a number of incorrect case statements

Browse Source
This commit is contained in:
Ali Saidi
2012-05-10 18:04:26 -05:00
parent 798403b689
commit 8cee4dacc8
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/arch/arm/miscregs.cc
View File

@@ -392,6 +392,7 @@ decodeCP15Reg(unsigned crn, unsigned opc1, unsigned crm, unsigned opc2)
case 7:
return MISCREG_PMCEID1;
}
break;
case 13:
switch (opc2) {
case 0:
@@ -401,6 +402,7 @@ decodeCP15Reg(unsigned crn, unsigned opc1, unsigned crm, unsigned opc2)
case 2:
return MISCREG_PMXEVCNTR;
}
break;
case 14:
switch (opc2) {
case 0:
@@ -410,6 +412,7 @@ decodeCP15Reg(unsigned crn, unsigned opc1, unsigned crm, unsigned opc2)
case 2:
return MISCREG_PMINTENCLR;
}
break;
}
} else if (opc1 == 1) {
switch (crm) {
@@ -422,6 +425,7 @@ decodeCP15Reg(unsigned crn, unsigned opc1, unsigned crm, unsigned opc2)
crn,crm, opc1,opc2);
break;
}
break;
default:
return MISCREG_L2LATENCY;
}

1
src/dev/arm/rv_ctrl.cc
View File

@@ -105,6 +105,7 @@ RealViewCtrl::read(PacketPtr pkt)
break;
case CfgStat:
pkt->set<uint32_t>(1);
break;
default:
warn("Tried to read RealView I/O at offset %#x that doesn't exist\n",
daddr);

16
src/mem/cache/mshr.cc vendored
View File

@@ -161,10 +161,18 @@ print(std::ostream &os, int verbosity, const std::string &prefix) const
for (ConstIterator i = begin(); i != end_i; ++i) {
const char *s;
switch (i->source) {
case Target::FromCPU: s = "FromCPU";
case Target::FromSnoop: s = "FromSnoop";
case Target::FromPrefetcher: s = "FromPrefetcher";
default: s = "";
case Target::FromCPU:
s = "FromCPU";
break;
case Target::FromSnoop:
s = "FromSnoop";
break;
case Target::FromPrefetcher:
s = "FromPrefetcher";
break;
default:
s = "";
break;
}
ccprintf(os, "%s%s: ", prefix, s);
i->pkt->print(os, verbosity, "");