Use logical operator instead of bitwise operator for correctness.

This commit is contained in:
Nathan Binkert 2008-09-26 08:18:56 -07:00
parent 6798aa14ed
commit abca171e24
2 changed files with 2 additions and 2 deletions

View file

@ -220,7 +220,7 @@ yieldThread(TC *tc, Fault &fault, int src_reg, uint32_t yield_mask)
warn("%i: Deactivating Hardware Thread Context #%i", curTick, tc->getThreadNum());
}
} else if (src_reg > 0) {
if (src_reg & !yield_mask != 0) {
if (src_reg && !yield_mask != 0) {
unsigned vpe_control = tc->readMiscReg(VPEControl);
tc->setMiscReg(VPEControl, insertBits(vpe_control, VPEC_EXCPT_HI, VPEC_EXCPT_LO, 2));
fault = new ThreadFault();

View file

@ -723,7 +723,7 @@ class Tru64 : public OperatingSystem
abort();
}
if (thread_index < 0 | thread_index > process->numCpus()) {
if (thread_index < 0 || thread_index > process->numCpus()) {
cerr << "nxm_thread_create: bad thread index " << thread_index
<< endl;
abort();