diff options
| author | Jason Lowe-Power <jason@lowepower.com> | 2017-12-13 10:19:04 -0800 |
|---|---|---|
| committer | Jason Lowe-Power <jason@lowepower.com> | 2017-12-14 00:27:59 +0000 |
| commit | 5c41076bd7610d03431fd0dd89bd0fdc7f30d6bd (patch) | |
| tree | ee24cdf5ea368fb808d0b6029313a163c375898b /src/dev/net/i8254xGBe.cc | |
| parent | f07d5069d86e31ecf195664850f79fb00c445bd3 (diff) | |
| download | gem5-5c41076bd7610d03431fd0dd89bd0fdc7f30d6bd.tar.xz | |
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 <functional> 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 <jason@lowepower.com>
Reviewed-on: https://gem5-review.googlesource.com/5802
Reviewed-by: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'src/dev/net/i8254xGBe.cc')
| -rw-r--r-- | src/dev/net/i8254xGBe.cc | 9 |
1 files changed, 4 insertions, 5 deletions
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()) |