From 90d56af474da5a1e2a1fdb7f090514aafdc612ca Mon Sep 17 00:00:00 2001 From: Iru Cai Date: Wed, 28 Apr 2021 14:33:10 +0800 Subject: [PATCH] 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 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/44925 Reviewed-by: Gabe Black Maintainer: Gabe Black Tested-by: kokoro --- src/dev/net/sinic.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/dev/net/sinic.cc b/src/dev/net/sinic.cc index 13d9eaf441..79a7e299c4 100644 --- a/src/dev/net/sinic.cc +++ b/src/dev/net/sinic.cc @@ -206,19 +206,23 @@ Device::read(PacketPtr pkt) 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);