changeset 69714e675ee2 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=69714e675ee2
description:
params: small cleanup to param description internals
diffstat:
2 files changed, 6 insertions(+), 7 deletions(-)
src/SConscript | 7 +------
src/python/m5/params.py | 6 +++++-
diffs (47 lines):
diff -r 380a32b43336 -r 69714e675ee2 src/SConscript
--- a/src/SConscript Tue Sep 22 15:24:16 2009 -0700
+++ b/src/SConscript Tue Sep 22 15:24:16 2009 -0700
@@ -489,12 +489,7 @@
# Generate any parameter header files needed
params_i_files = []
for name,param in all_params.iteritems():
- if isinstance(param, m5.params.VectorParamDesc):
- ext = 'vptype'
- else:
- ext = 'ptype'
-
- i_file = File('params/%s_%s.i' % (name, ext))
+ i_file = File('params/%s_%s.i' % (name, param.file_ext))
params_i_files.append(i_file)
env.Command(i_file, Value(name), createSwigParam)
env.Depends(i_file, depends)
diff -r 380a32b43336 -r 69714e675ee2 src/python/m5/params.py
--- a/src/python/m5/params.py Tue Sep 22 15:24:16 2009 -0700
+++ b/src/python/m5/params.py Tue Sep 22 15:24:16 2009 -0700
@@ -93,6 +93,8 @@
# Regular parameter description.
class ParamDesc(object):
+ file_ext = 'ptype'
+
def __init__(self, ptype_str, ptype, *args, **kwargs):
self.ptype_str = ptype_str
# remember ptype only if it is provided
@@ -127,7 +129,7 @@
def __getattr__(self, attr):
if attr == 'ptype':
ptype = SimObject.allClasses[self.ptype_str]
- assert issubclass(ptype, SimObject.SimObject)
+ assert isSimObjectClass(ptype)
self.ptype = ptype
return ptype
@@ -182,6 +184,8 @@
v.print_ini(ini_file)
class VectorParamDesc(ParamDesc):
+ file_ext = 'vptype'
+
# Convert assigned value to appropriate type. If the RHS is not a
# list or tuple, it generates a single-element list.
def convert(self, value):
_______________________________________________
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev
