diff options
| author | Nathan Binkert <nate@binkert.org> | 2011-12-13 11:49:27 -0800 |
|---|---|---|
| committer | Nathan Binkert <nate@binkert.org> | 2011-12-13 11:49:27 -0800 |
| commit | 6ef9691035623ba6945e237a41f0dca04db637bb (patch) | |
| tree | 94a81d0d368991f4ed657e1849ed1e10b96eca2b /src/mem/ruby | |
| parent | 9b52717a92ed9592bd98a41683509f538262a5c7 (diff) | |
| download | gem5-6ef9691035623ba6945e237a41f0dca04db637bb.tar.xz | |
gcc: fix unused variable warnings from GCC 4.6.1
--HG--
extra : rebase_source : f9e22de341493a25ac6106c16ac35c61c128a080
Diffstat (limited to 'src/mem/ruby')
| -rw-r--r-- | src/mem/ruby/system/SConscript | 2 | ||||
| -rw-r--r-- | src/mem/ruby/system/Sequencer.cc | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/mem/ruby/system/SConscript b/src/mem/ruby/system/SConscript index 4cf0b31ad..66d7d95bb 100644 --- a/src/mem/ruby/system/SConscript +++ b/src/mem/ruby/system/SConscript @@ -49,6 +49,6 @@ Source('WireBuffer.cc') Source('MemoryNode.cc') Source('PersistentTable.cc') Source('RubyPort.cc') -Source('Sequencer.cc', Werror=False) +Source('Sequencer.cc') Source('System.cc') Source('TimerTable.cc') diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc index 9010178be..7137dcc28 100644 --- a/src/mem/ruby/system/Sequencer.cc +++ b/src/mem/ruby/system/Sequencer.cc @@ -221,10 +221,8 @@ Sequencer::printConfig(ostream& out) const RequestStatus Sequencer::insertRequest(PacketPtr pkt, RubyRequestType request_type) { - int total_outstanding = - m_writeRequestTable.size() + m_readRequestTable.size(); - - assert(m_outstanding_count == total_outstanding); + assert(m_outstanding_count == + (m_writeRequestTable.size() + m_readRequestTable.size())); // See if we should schedule a deadlock check if (deadlockCheckEvent.scheduled() == false) { @@ -285,8 +283,8 @@ Sequencer::insertRequest(PacketPtr pkt, RubyRequestType request_type) } g_system_ptr->getProfiler()->sequencerRequests(m_outstanding_count); - total_outstanding = m_writeRequestTable.size() + m_readRequestTable.size(); - assert(m_outstanding_count == total_outstanding); + assert(m_outstanding_count == + (m_writeRequestTable.size() + m_readRequestTable.size())); return RequestStatus_Ready; } |