From 5c41076bd7610d03431fd0dd89bd0fdc7f30d6bd Mon Sep 17 00:00:00 2001 From: Jason Lowe-Power Date: Wed, 13 Dec 2017 10:19:04 -0800 Subject: misc: Updates for gcc7.2 for x86 GCC 7.2 is much stricter than previous GCC versions. The following changes are needed: * There is now a warning if there is an implicit fallthrough between two case statments. C++17 adds the [[fallthrough]]; declaration. However, to support non C++17 standards (i.e., C++11), we use M5_FALLTHROUGH. M5_FALLTHROUGH checks for [[fallthrough]] compliant C++17 compiler and if that doesn't exist, it defaults to nothing (no older compilers generate warnings). * The above resulted in a couple of bugs that were found. This is noted in the review request on gerrit. * throw() for dynamic exception specification is deprecated * There were a couple of new uninitialized variable warnings * Can no longer perform bitwise operations on a bool. * Must now include for std::function * Compiler bug for void* lambda. Changed to auto as work around. See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82878 Change-Id: I5d4c782a4e133fa4cdb119e35d9aff68c6e2958e Signed-off-by: Jason Lowe-Power Reviewed-on: https://gem5-review.googlesource.com/5802 Reviewed-by: Gabe Black --- src/dev/net/i8254xGBe.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/dev/net') diff --git a/src/dev/net/i8254xGBe.cc b/src/dev/net/i8254xGBe.cc index 3dde72ac7..3359b0d61 100644 --- a/src/dev/net/i8254xGBe.cc +++ b/src/dev/net/i8254xGBe.cc @@ -2290,14 +2290,13 @@ IGbE::rxStateMachine() int descLeft = rxDescCache.descLeft(); DPRINTF(EthernetSM, "RXS: descLeft: %d rdmts: %d rdlen: %d\n", descLeft, regs.rctl.rdmts(), regs.rdlen()); - switch (regs.rctl.rdmts()) { - case 2: if (descLeft > .125 * regs.rdlen()) break; - case 1: if (descLeft > .250 * regs.rdlen()) break; - case 0: if (descLeft > .500 * regs.rdlen()) break; + + // rdmts 2->1/8, 1->1/4, 0->1/2 + int ratio = (1ULL << (regs.rctl.rdmts() + 1)); + if (descLeft * ratio <= regs.rdlen()) { DPRINTF(Ethernet, "RXS: Interrupting (RXDMT) " "because of descriptors left\n"); postInterrupt(IT_RXDMT); - break; } if (rxFifo.empty()) -- cgit v1.2.3