commit 90d56af474da5a1e2a1fdb7f090514aafdc612ca
author Iru Cai <mytbk920423@gmail.com> Wed Apr 28 14:33:10 2021 +0800
committer Iru Cai <mytbk920423@gmail.com> Mon Jun 07 01:27:17 2021 +0000
tree 4e16050a73c67f1a9998774849ab520420ae687c
parent 2f8a8508fb3ad45f7945639ea220f0ca46d8e308

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 <mytbk920423@gmail.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/44925
Reviewed-by: Gabe Black <gabe.black@gmail.com>
Maintainer: Gabe Black <gabe.black@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>

src/dev/net/sinic.cc

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);