mips: fix ll/sc pairs working incorrectly because of accidental clobber of LLFLAG
This commit is contained in:
parent
6c46313556
commit
60063cc700
1 changed files with 2 additions and 7 deletions
|
@ -51,7 +51,7 @@ inline void
|
|||
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 @@ handleLockedWrite(XC *xc, Request *req)
|
|||
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",
|
||||
|
|
Loading…
Reference in a new issue