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/mem/ruby/slicc_interface | |
| 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/mem/ruby/slicc_interface')
| -rw-r--r-- | src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh | 3 | ||||
| -rw-r--r-- | src/mem/ruby/slicc_interface/RubySlicc_Util.hh | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh index c96667028..82c95c469 100644 --- a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh +++ b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh @@ -151,8 +151,7 @@ ConvertMachToGenericMach(MachineType machType) if (machType == MachineType_Directory) return GenericMachineType_Directory; - ERROR_MSG("cannot convert to a GenericMachineType"); - return GenericMachineType_NULL; + panic("cannot convert to a GenericMachineType"); } inline int diff --git a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh index 24240dc52..432379449 100644 --- a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh +++ b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh @@ -148,12 +148,6 @@ getPreviousDelayedCycles(Time t1, Time t2) } } -inline void -WARN_ERROR_TIME(Time time) -{ - WARN_EXPR(time); -} - // Return type for time_to_int is "Time" and not "int" so we get a // 64-bit integer inline Time |