diff options
author | Steve Reinhardt <steve.reinhardt@amd.com> | 2011-10-20 13:09:10 -0700 |
---|---|---|
committer | Steve Reinhardt <steve.reinhardt@amd.com> | 2011-10-20 13:09:10 -0700 |
commit | 7b500f56ca539d1a31f9590a810e86146dd2582f (patch) | |
tree | e42ca4f5bb4af376c1d03a3a1e34c1b7e0a3d407 /src/sim/System.py | |
parent | 45d14e02c4eef63c9d0db4e9155bf5fe93673c10 (diff) | |
download | gem5-7b500f56ca539d1a31f9590a810e86146dd2582f.tar.xz |
SimObject: add export_method* hooks to export C++ methods to Python
Replace the (broken as of previous changeset) swig_objdecl() method
that allowed/forced you to substitute a whole new C++ struct
definition for SWIG to wrap with a set of export_method* hooks
that let you just declare a set of C++ methods (or other declarations)
that get inserted in the auto-generated struct.
Restore the System get/setMemoryMode methods, and use this mechanism
to specialize SimObject as well, eliminating teh need for sim_object.i.
Needed bits of sim_object.i are moved to the new pyobject.i.
Also sucked a little SimObject specialization into cxx_param_decl()
allowing us to get rid of src/sim/sim_object_params.hh. Now the
generation and wrapping of the base SimObject param struct is more
in line with how derived objects are handled.
--HG--
rename : src/python/swig/sim_object.i => src/python/swig/pyobject.i
Diffstat (limited to 'src/sim/System.py')
-rw-r--r-- | src/sim/System.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/sim/System.py b/src/sim/System.py index 1a69db95f..d9836211f 100644 --- a/src/sim/System.py +++ b/src/sim/System.py @@ -40,11 +40,16 @@ class MemoryMode(Enum): vals = ['invalid', 'atomic', 'timing'] class System(SimObject): type = 'System' - # This method is temporarily obsolete. Its functionality will be - # restored in a future changeset. @classmethod - def swig_objdecls(cls, code): - code('%include "python/swig/system.i"') + def export_method_cxx_predecls(cls, code): + code('#include "sim/system.hh"') + + @classmethod + def export_methods(cls, code): + code(''' + Enums::MemoryMode getMemoryMode(); + void setMemoryMode(Enums::MemoryMode mode); +''') physmem = Param.PhysicalMemory("Physical Memory") mem_mode = Param.MemoryMode('atomic', "The mode the memory system is in") |