X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.cc;h=addf93f67469f1cd7f96a15ffad8ec5551cb1c1b;hb=eb07120dfdbb206124f7857016a71b6ef0b9eb99;hp=dd2dd855c658f7734b7024f76a973e2341ac522c;hpb=9f1ddeb2b2ba0bf52d14456c90b363daa2f09965;p=model-checker.git diff --git a/nodestack.cc b/nodestack.cc index dd2dd85..addf93f 100644 --- a/nodestack.cc +++ b/nodestack.cc @@ -164,7 +164,7 @@ bool Node::increment_promise() //sending our value to two rmws... not going to work..try next combination continue; } - promises[i] = (promises[i] & PROMISE_RMW) |PROMISE_FULFILLED; + promises[i] = (promises[i] & PROMISE_RMW) | PROMISE_FULFILLED; while (i > 0) { i--; if ((promises[i] & PROMISE_MASK) == PROMISE_FULFILLED) @@ -188,9 +188,9 @@ bool Node::promise_empty() const for (int i = promises.size() - 1; i >= 0; i--) { if (promises[i] == PROMISE_UNFULFILLED) return false; - if (!fulfilledrmw && ((promises[i]&PROMISE_MASK) == PROMISE_UNFULFILLED)) + if (!fulfilledrmw && ((promises[i] & PROMISE_MASK) == PROMISE_UNFULFILLED)) return false; - if (promises[i] == (PROMISE_FULFILLED|PROMISE_RMW)) + if (promises[i] == (PROMISE_FULFILLED | PROMISE_RMW)) fulfilledrmw = true; } return true;