From e40b8e34c81349e12a373931ab01ec78f657d80d Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Mon, 11 May 2009 10:38:45 -0700 Subject: ruby: clean up a few warnings --- src/mem/ruby/tester/DetermInvGenerator.cc | 2 -- src/mem/ruby/tester/DeterministicDriver.cc | 2 ++ src/mem/ruby/tester/SyntheticDriver.cc | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/mem/ruby/tester') diff --git a/src/mem/ruby/tester/DetermInvGenerator.cc b/src/mem/ruby/tester/DetermInvGenerator.cc index 50d7162ab..89d70d91a 100644 --- a/src/mem/ruby/tester/DetermInvGenerator.cc +++ b/src/mem/ruby/tester/DetermInvGenerator.cc @@ -112,8 +112,6 @@ void DetermInvGenerator::performCallback(NodeID proc, SubBlock& data) if (m_status == DetermInvGeneratorStatus_Load_Pending) { m_driver.recordLoadLatency(g_eventQueue_ptr->getTime() - m_last_transition); - NodeID firstByte = data.readByte(); // dummy read - m_driver.loadCompleted(m_node, data.getAddress()); if (!m_driver.isStoreReady(m_node, m_address)) { // if we don't have to store, we are done for this transaction diff --git a/src/mem/ruby/tester/DeterministicDriver.cc b/src/mem/ruby/tester/DeterministicDriver.cc index 2ea82c77c..bc27c2a35 100644 --- a/src/mem/ruby/tester/DeterministicDriver.cc +++ b/src/mem/ruby/tester/DeterministicDriver.cc @@ -253,7 +253,9 @@ void DeterministicDriver::checkForDeadlock() for (int processor=0; processor g_DEADLOCK_THRESHOLD) { WARN_EXPR(processor); +#ifndef NDEBUG Sequencer* seq_ptr = g_system_ptr->getChip(processor/RubyConfig::numberOfProcsPerChip())->getSequencer(processor%RubyConfig::numberOfProcsPerChip()); +#endif assert(seq_ptr != NULL); // if (seq_ptr->isRequestPending()) { // WARN_EXPR(seq_ptr->pendingAddress()); diff --git a/src/mem/ruby/tester/SyntheticDriver.cc b/src/mem/ruby/tester/SyntheticDriver.cc index f74b69d0b..946bb1db6 100644 --- a/src/mem/ruby/tester/SyntheticDriver.cc +++ b/src/mem/ruby/tester/SyntheticDriver.cc @@ -175,7 +175,6 @@ Address SyntheticDriver::pickAddress(NodeID node) Address addr; // FIXME - make this a parameter of the workload - bool done = false; int lock_number = 0; int counter = 0; while (1) { @@ -241,7 +240,9 @@ void SyntheticDriver::checkForDeadlock() for (int processor=0; processor g_DEADLOCK_THRESHOLD) { WARN_EXPR(processor); +#ifndef NDEBUG Sequencer* seq_ptr = g_system_ptr->getChip(processor/RubyConfig::numberOfProcsPerChip())->getSequencer(processor%RubyConfig::numberOfProcsPerChip()); +#endif assert(seq_ptr != NULL); // if (seq_ptr->isRequestPending()) { // WARN_EXPR(seq_ptr->pendingAddress()); -- cgit v1.2.3