diff options
author | Nilay Vaish <nilay@cs.wisc.edu> | 2010-12-22 23:15:24 -0600 |
---|---|---|
committer | Nilay Vaish <nilay@cs.wisc.edu> | 2010-12-22 23:15:24 -0600 |
commit | 58fa2857e123a44b1633628b898847773153c047 (patch) | |
tree | abf6318d961c8bcb31d7a0f5c4aa9bbb4a0db0ed /src/cpu/testers/rubytest/RubyTester.cc | |
parent | 2c0e80f96bee8c2ad48cd3fb7a18af149bfe76bc (diff) | |
download | gem5-58fa2857e123a44b1633628b898847773153c047.tar.xz |
This patch removes the WARN_* and ERROR_* from src/mem/ruby/common/Debug.hh file. These statements have been replaced with warn(), panic() and fatal() defined in src/base/misc.hh
Diffstat (limited to 'src/cpu/testers/rubytest/RubyTester.cc')
-rw-r--r-- | src/cpu/testers/rubytest/RubyTester.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cpu/testers/rubytest/RubyTester.cc b/src/cpu/testers/rubytest/RubyTester.cc index 516d6ae40..8c5aafd89 100644 --- a/src/cpu/testers/rubytest/RubyTester.cc +++ b/src/cpu/testers/rubytest/RubyTester.cc @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "base/misc.hh" #include "cpu/testers/rubytest/Check.hh" #include "cpu/testers/rubytest/RubyTester.hh" #include "mem/ruby/common/Global.hh" @@ -173,11 +174,10 @@ RubyTester::checkForDeadlock() for (int processor = 0; processor < size; processor++) { if ((current_time - m_last_progress_vector[processor]) > m_deadlock_threshold) { - WARN_EXPR(current_time); - WARN_EXPR(m_last_progress_vector[processor]); - WARN_EXPR(current_time - m_last_progress_vector[processor]); - WARN_EXPR(processor); - ERROR_MSG("Deadlock detected."); + panic("Deadlock detected: current_time: %d last_progress_time: %d " + "difference: %d processor: %d\n", + current_time, m_last_progress_vector[processor], + current_time - m_last_progress_vector[processor], processor); } } } |