diff options
author | Nathan Binkert <nate@binkert.org> | 2008-09-26 08:18:57 -0700 |
---|---|---|
committer | Nathan Binkert <nate@binkert.org> | 2008-09-26 08:18:57 -0700 |
commit | 9838be252114cf044735ca07007d23ee03d8da2c (patch) | |
tree | e73e627062f5e20b83ad344fc69c368e9d893ab6 /src | |
parent | abca171e244b27d1c44a9bcdedbe231bdc342cbb (diff) | |
download | gem5-9838be252114cf044735ca07007d23ee03d8da2c.tar.xz |
When nesting if statements, use braces to avoid ambiguous else clauses.
Diffstat (limited to 'src')
-rw-r--r-- | src/arch/sparc/tlb_map.hh | 3 | ||||
-rw-r--r-- | src/mem/bridge.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/arch/sparc/tlb_map.hh b/src/arch/sparc/tlb_map.hh index 8285db939..fa49584ba 100644 --- a/src/arch/sparc/tlb_map.hh +++ b/src/arch/sparc/tlb_map.hh @@ -52,7 +52,7 @@ class TlbMap i = tree.upper_bound(r); - if (i == tree.begin()) + if (i == tree.begin()) { if (r.real == i->first.real && r.partitionId == i->first.partitionId && i->first.va < r.va + r.size && @@ -62,6 +62,7 @@ class TlbMap else // Nothing could match, so return end() return tree.end(); + } i--; diff --git a/src/mem/bridge.cc b/src/mem/bridge.cc index c09cacc00..2e668ec32 100644 --- a/src/mem/bridge.cc +++ b/src/mem/bridge.cc @@ -130,7 +130,7 @@ Bridge::BridgePort::recvTiming(PacketPtr pkt) return true; } - if (pkt->needsResponse()) + if (pkt->needsResponse()) { if (respQueueFull()) { DPRINTF(BusBridge, "Local queue full, no space for response, nacking\n"); DPRINTF(BusBridge, "queue size: %d outreq: %d outstanding resp: %d\n", @@ -141,6 +141,7 @@ Bridge::BridgePort::recvTiming(PacketPtr pkt) DPRINTF(BusBridge, "Request Needs response, reserving space\n"); ++outstandingResponses; } + } otherPort->queueForSendTiming(pkt); |