diff options
author | Nathan Binkert <nate@binkert.org> | 2011-01-10 11:11:20 -0800 |
---|---|---|
committer | Nathan Binkert <nate@binkert.org> | 2011-01-10 11:11:20 -0800 |
commit | bd18ac82877072a87745aaf7a104e7bb036c6c66 (patch) | |
tree | 0fb980aea5b81d79160105fbf505670be0cf5e72 /src/mem/ruby/tester/RaceyPseudoThread.cc | |
parent | 8e262adf4fcc009776810b9795f907fcd468591c (diff) | |
download | gem5-bd18ac82877072a87745aaf7a104e7bb036c6c66.tar.xz |
ruby: get rid of ruby's Debug.hh
Get rid of the Debug class
Get rid of ASSERT and use assert
Use DPRINTFR for ProtocolTrace
Diffstat (limited to 'src/mem/ruby/tester/RaceyPseudoThread.cc')
-rw-r--r-- | src/mem/ruby/tester/RaceyPseudoThread.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mem/ruby/tester/RaceyPseudoThread.cc b/src/mem/ruby/tester/RaceyPseudoThread.cc index cfe4078cf..ae01585e6 100644 --- a/src/mem/ruby/tester/RaceyPseudoThread.cc +++ b/src/mem/ruby/tester/RaceyPseudoThread.cc @@ -30,6 +30,8 @@ * Description: see RaceyPseudoThread.h */ +#include <cassert> + #include "mem/ruby/tester/RaceyPseudoThread.hh" #include "mem/ruby/tester/RaceyDriver.hh" #include "gzstream.hh" @@ -221,7 +223,7 @@ void RaceyPseudoThread::load_sig(unsigned index) { // pc is zero, problem? int64_t request_id = libruby_issue_request(libruby_get_port_by_name(port_name), RubyRequest(sig(index), read_data, 4, 0, RubyRequestType_LD, RubyAccessMode_User)); - ASSERT(m_driver.requests.find(request_id) == m_driver.requests.end()); + assert(m_driver.requests.find(request_id) == m_driver.requests.end()); struct address_data request_data; request_data.address = Address(sig(index)); @@ -248,7 +250,7 @@ void RaceyPseudoThread::load_m(unsigned index) { // pc is zero, problem? int64_t request_id = libruby_issue_request(libruby_get_port_by_name(port_name), RubyRequest(m(index), read_data, 4, 0, RubyRequestType_LD, RubyAccessMode_User)); - ASSERT(m_driver.requests.find(request_id) == m_driver.requests.end()); + assert(m_driver.requests.find(request_id) == m_driver.requests.end()); struct address_data request_data; request_data.address = Address(m(index)); @@ -279,7 +281,7 @@ void RaceyPseudoThread::store_sig(unsigned index, unsigned value) { // pc is zero, problem? int64_t request_id = libruby_issue_request(libruby_get_port_by_name(port_name), RubyRequest(sig(index), write_data, 4, 0, RubyRequestType_ST, RubyAccessMode_User)); - ASSERT(m_driver.requests.find(request_id) == m_driver.requests.end()); + assert(m_driver.requests.find(request_id) == m_driver.requests.end()); struct address_data request_data; request_data.address = Address(sig(index)); @@ -308,7 +310,7 @@ void RaceyPseudoThread::store_m(unsigned index, unsigned value) { // pc is zero, problem? int64_t request_id = libruby_issue_request(libruby_get_port_by_name(port_name), RubyRequest(m(index), write_data, 4, 0, RubyRequestType_ST, RubyAccessMode_User)); - ASSERT(m_driver.requests.find(request_id) == m_driver.requests.end()); + assert(m_driver.requests.find(request_id) == m_driver.requests.end()); struct address_data request_data; request_data.address = Address(m(index)); |