diff options
Diffstat (limited to 'src/cpu')
| -rw-r--r-- | src/cpu/testers/rubytest/Check.cc | 8 | ||||
| -rw-r--r-- | src/cpu/testers/rubytest/Check.hh | 2 | ||||
| -rw-r--r-- | src/cpu/testers/rubytest/RubyTester.cc | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/src/cpu/testers/rubytest/Check.cc b/src/cpu/testers/rubytest/Check.cc index 7de3415b1..a861dbfd8 100644 --- a/src/cpu/testers/rubytest/Check.cc +++ b/src/cpu/testers/rubytest/Check.cc @@ -276,7 +276,7 @@ Check::initiateCheck() } void -Check::performCallback(NodeID proc, SubBlock* data) +Check::performCallback(NodeID proc, SubBlock* data, Time curTime) { Address address = data->getAddress(); @@ -312,8 +312,7 @@ Check::performCallback(NodeID proc, SubBlock* data) "Time: %d\n", proc, address, data, byte_number, (int)m_value + byte_number, - (int)data->getByte(byte_number), *this, - g_system_ptr->getTime()); + (int)data->getByte(byte_number), *this, curTime); } } DPRINTF(RubyTest, "Action/check success\n"); @@ -327,8 +326,7 @@ Check::performCallback(NodeID proc, SubBlock* data) } else { panic("Unexpected TesterStatus: %s proc: %d data: %s m_status: %s " - "time: %d\n", - *this, proc, data, m_status, g_system_ptr->getTime()); + "time: %d\n", *this, proc, data, m_status, curTime); } DPRINTF(RubyTest, "proc: %d, Address: 0x%x\n", proc, diff --git a/src/cpu/testers/rubytest/Check.hh b/src/cpu/testers/rubytest/Check.hh index 6396189cc..47d790b1e 100644 --- a/src/cpu/testers/rubytest/Check.hh +++ b/src/cpu/testers/rubytest/Check.hh @@ -50,7 +50,7 @@ class Check int _num_readers, RubyTester* _tester); void initiate(); // Does Action or Check or nether - void performCallback(NodeID proc, SubBlock* data); + void performCallback(NodeID proc, SubBlock* data, Time curTime); const Address& getAddress() { return m_address; } void changeAddress(const Address& address); diff --git a/src/cpu/testers/rubytest/RubyTester.cc b/src/cpu/testers/rubytest/RubyTester.cc index 6ddab93e8..085647533 100644 --- a/src/cpu/testers/rubytest/RubyTester.cc +++ b/src/cpu/testers/rubytest/RubyTester.cc @@ -191,7 +191,7 @@ void RubyTester::hitCallback(NodeID proc, SubBlock* data) { // Mark that we made progress - m_last_progress_vector[proc] = g_system_ptr->getTime(); + m_last_progress_vector[proc] = curCycle(); DPRINTF(RubyTest, "completed request for proc: %d\n", proc); DPRINTF(RubyTest, "addr: 0x%x, size: %d, data: ", @@ -205,7 +205,7 @@ RubyTester::hitCallback(NodeID proc, SubBlock* data) // back the data to make the check Check* check_ptr = m_checkTable_ptr->getCheck(data->getAddress()); assert(check_ptr != NULL); - check_ptr->performCallback(proc, data); + check_ptr->performCallback(proc, data, curCycle()); } void @@ -229,7 +229,7 @@ void RubyTester::checkForDeadlock() { int size = m_last_progress_vector.size(); - Time current_time = g_system_ptr->getTime(); + Time current_time = curCycle(); for (int processor = 0; processor < size; processor++) { if ((current_time - m_last_progress_vector[processor]) > m_deadlock_threshold) { |