changeset ed56e2cac9aa in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=ed56e2cac9aa
description:
mips: fix ll/sc pairs working incorrectly because of accidental clobber
of LLFLAG
diffstat:
1 file changed, 2 insertions(+), 7 deletions(-)
src/arch/mips/locked_mem.hh | 9 ++-------
diffs (31 lines):
diff -r af82c0870667 -r ed56e2cac9aa src/arch/mips/locked_mem.hh
--- a/src/arch/mips/locked_mem.hh Sun Jul 26 00:13:35 2009 -0400
+++ b/src/arch/mips/locked_mem.hh Fri Jul 31 09:34:29 2009 -0400
@@ -51,7 +51,7 @@
handleLockedRead(XC *xc, Request *req)
{
xc->setMiscRegNoEffect(MISCREG_LLADDR, req->getPaddr() & ~0xf);
- xc->setMiscRegNoEffect(MISCREG_LLADDR, true);
+ xc->setMiscRegNoEffect(MISCREG_LLFLAG, true);
DPRINTF(LLSC, "[tid:%i]: Load-Link Flag Set & Load-Link"
" Address set to %x.\n",
req->threadId(), req->getPaddr() & ~0xf);
@@ -83,17 +83,12 @@
int stCondFailures = xc->readStCondFailures();
stCondFailures++;
xc->setStCondFailures(stCondFailures);
- if (stCondFailures % 10 == 0) {
+ if (stCondFailures % 100000 == 0) {
warn("%i: context %d: %d consecutive "
"store conditional failures\n",
curTick, xc->contextId(), stCondFailures);
}
- if (stCondFailures == 5000) {
- panic("Max (5000) Store Conditional Fails Reached. "
- "Check Code For Deadlock.\n");
- }
-
if (!lock_flag){
DPRINTF(LLSC, "[tid:%i]: Lock Flag Set, "
"Store Conditional Failed.\n",
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
