Attention is currently required from: Boris Shingarov.
Hello kokoro, Boris Shingarov,

I'd like you to do a code review. Please visit

    https://gem5-review.googlesource.com/c/public/gem5/+/43232

to review the following change.


Change subject: arch-sparc: Fix an operator precedence bug in the iob device.
......................................................................

arch-sparc: Fix an operator precedence bug in the iob device.

Like in the nomali library, this bug is in some code making a bitmask
where what bits are enabled depends on some conditions. It used ?: to
evaluate the conditions and | to aggregate the bits, but didn't use any
()s, so the | happened first, then the ?:s. This would generate an
incorrect bitmask.

Change-Id: Iabcc8a9fd38cde5de3c0627a3b143407247c0c0e
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/40955
Maintainer: Gabe Black <[email protected]>
Tested-by: kokoro <[email protected]>
Reviewed-by: Boris Shingarov <[email protected]>
---
M src/dev/sparc/iob.cc
1 file changed, 2 insertions(+), 2 deletions(-)



diff --git a/src/dev/sparc/iob.cc b/src/dev/sparc/iob.cc
index a0d1982..624563e 100644
--- a/src/dev/sparc/iob.cc
+++ b/src/dev/sparc/iob.cc
@@ -101,8 +101,8 @@

if (accessAddr >= IntCtlAddr && accessAddr < IntCtlAddr + IntCtlSize) {
             int index = (accessAddr - IntCtlAddr) >> 3;
-            uint64_t data = intCtl[index].mask  ? 1 << 2 : 0 |
-                intCtl[index].pend  ? 1 << 0 : 0;
+            uint64_t data = (intCtl[index].mask  ? (1 << 2) : 0) |
+                (intCtl[index].pend  ? (1 << 0) : 0);
             pkt->setBE(data);
             return;
         }

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43232
To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings

Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v21-0
Gerrit-Change-Id: Iabcc8a9fd38cde5de3c0627a3b143407247c0c0e
Gerrit-Change-Number: 43232
Gerrit-PatchSet: 1
Gerrit-Owner: Peter Yuen <[email protected]>
Gerrit-Reviewer: Boris Shingarov <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-CC: Gabe Black <[email protected]>
Gerrit-Attention: Boris Shingarov <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s

Reply via email to