summaryrefslogtreecommitdiff
path: root/src/mem/ruby/slicc_interface
diff options
context:
space:
mode:
Diffstat (limited to 'src/mem/ruby/slicc_interface')
-rw-r--r--src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh3
-rw-r--r--src/mem/ruby/slicc_interface/RubySlicc_Util.hh6
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