summaryrefslogtreecommitdiff
path: root/src/python
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2008-06-18 12:07:15 -0700
committerNathan Binkert <nate@binkert.org>2008-06-18 12:07:15 -0700
commitc1584e422783a33731c7dfa23517d30bcecf28bc (patch)
treed3664f74378429cc389c6e166aebaca7fbcd6963 /src/python
parent67a33eed40f0a551fdf9bf1059928cda1c2d7fdb (diff)
downloadgem5-c1584e422783a33731c7dfa23517d30bcecf28bc.tar.xz
imported patch sim_object_params.diff
Diffstat (limited to 'src/python')
-rw-r--r--src/python/generate.py1
-rw-r--r--src/python/m5/SimObject.py19
2 files changed, 13 insertions, 7 deletions
diff --git a/src/python/generate.py b/src/python/generate.py
index e6c36ecd2..7b69ad876 100644
--- a/src/python/generate.py
+++ b/src/python/generate.py
@@ -300,6 +300,7 @@ class Generate(object):
print >>out, code
+ print >>out, '%%include "src/sim/sim_object_params.hh"' % obj
for obj in ordered_objs:
print >>out, '%%include "params/%s.hh"' % obj
diff --git a/src/python/m5/SimObject.py b/src/python/m5/SimObject.py
index 41ed3df9e..4cf0f7a3d 100644
--- a/src/python/m5/SimObject.py
+++ b/src/python/m5/SimObject.py
@@ -396,13 +396,21 @@ class MetaSimObject(type):
code += '#include "enums/%s.hh"\n' % ptype.__name__
code += "\n\n"
+ code += cls.cxx_struct(base, params)
+
+ # close #ifndef __PARAMS__* guard
+ code += "\n#endif\n"
+ return code
+
+ def cxx_struct(cls, base, params):
+ if cls == SimObject:
+ return '#include "sim/sim_object_params.hh"\n'
+
# now generate the actual param struct
- code += "struct %sParams" % cls
+ code = "struct %sParams" % cls
if base:
code += " : public %sParams" % base
code += "\n{\n"
- if cls == SimObject:
- code += " virtual ~%sParams() {}\n" % cls
if not hasattr(cls, 'abstract') or not cls.abstract:
if 'type' in cls.__dict__:
code += " %s create();\n" % cls.cxx_type
@@ -411,8 +419,6 @@ class MetaSimObject(type):
code += "".join([" %s\n" % d for d in decls])
code += "};\n"
- # close #ifndef __PARAMS__* guard
- code += "\n#endif\n"
return code
def cxx_type_decl(cls):
@@ -483,7 +489,6 @@ class SimObject(object):
type = 'SimObject'
abstract = True
- name = Param.String("Object name")
swig_objdecls = [ '%include "python/swig/sim_object.i"' ]
# Initialize new instance. For objects with SimObject-valued
@@ -762,7 +767,7 @@ class SimObject(object):
cc_params_struct = getattr(m5.objects.params, '%sParams' % self.type)
cc_params = cc_params_struct()
- cc_params.object = self
+ cc_params.pyobj = self
cc_params.name = str(self)
param_names = self._params.keys()