Iru Cai has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/44925 )
Change subject: dev: add a falsely removed if condition check in commit
03a00e5d3
......................................................................
dev: add a falsely removed if condition check in commit 03a00e5d3
Also add brackets at the if blocks near by.
This error is found by -Werror=misleading-indentation in GCC 11.1.
Change-Id: Ib9139b66411d0fd9424e027ba508cd556032389e
Signed-off-by: Iru Cai <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/44925
Reviewed-by: Gabe Black <[email protected]>
Maintainer: Gabe Black <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/dev/net/sinic.cc
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/dev/net/sinic.cc b/src/dev/net/sinic.cc
index 13d9eaf..79a7e29 100644
--- a/src/dev/net/sinic.cc
+++ b/src/dev/net/sinic.cc
@@ -206,19 +206,23 @@
Addr index = daddr >> registers::VirtualShift;
Addr raddr = daddr & registers::VirtualMask;
- if (!regValid(raddr))
+ if (!regValid(raddr)) {
panic("invalid register: cpu=%d vnic=%d da=%#x pa=%#x size=%d",
cpu, index, daddr, pkt->getAddr(), pkt->getSize());
+ }
const registers::Info &info = regInfo(raddr);
- if (!info.read)
+ if (!info.read) {
panic("read %s (write only): "
"cpu=%d vnic=%d da=%#x pa=%#x size=%d",
info.name, cpu, index, daddr, pkt->getAddr(),
pkt->getSize());
+ }
+ if (info.size != pkt->getSize()) {
panic("read %s (invalid size): "
"cpu=%d vnic=%d da=%#x pa=%#x size=%d",
info.name, cpu, index, daddr, pkt->getAddr(),
pkt->getSize());
+ }
prepareRead(cpu, index);
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44925
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ib9139b66411d0fd9424e027ba508cd556032389e
Gerrit-Change-Number: 44925
Gerrit-PatchSet: 3
Gerrit-Owner: Iru Cai <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Iru Cai <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
