diff options
| author | Derek Hower <drh5@cs.wisc.edu> | 2009-07-21 21:27:54 -0500 |
|---|---|---|
| committer | Derek Hower <drh5@cs.wisc.edu> | 2009-07-21 21:27:54 -0500 |
| commit | c635d04642723f7dea68ee6c6c882c7751d8484b (patch) | |
| tree | 0173732c6b4354a813f04cb57a7e78410cebdb78 /src/mem/ruby/config/cfg.rb | |
| parent | 74584d79b66b3459c72db6c74bfa9e22ee1ae23b (diff) | |
| parent | 7f34ee36ec2c01d818bd2984745cbd4e62a7f549 (diff) | |
| download | gem5-c635d04642723f7dea68ee6c6c882c7751d8484b.tar.xz | |
Automated merge with ssh://m5sim.org//repo/m5
Diffstat (limited to 'src/mem/ruby/config/cfg.rb')
| -rw-r--r-- | src/mem/ruby/config/cfg.rb | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/mem/ruby/config/cfg.rb b/src/mem/ruby/config/cfg.rb index de8bcafd2..a43b5e125 100644 --- a/src/mem/ruby/config/cfg.rb +++ b/src/mem/ruby/config/cfg.rb @@ -100,9 +100,11 @@ class LibRubyObject end def self.printConstructors() + str = "" @@all_objs.each { |obj| - print obj.cppClassName, " ", obj.obj_name, " ",obj.argv,"\n" + str += obj.cppClassName + " " + obj.obj_name + " " + obj.argv + "\n" } + return str end def self.all() @@all_objs @@ -215,7 +217,7 @@ class RubySystem EOS end - def self.generateConfig() + def self.getConfig() # get current time for random seed if set to "rand" if @@params[:random_seed] == "rand" t = Time.now @@ -224,13 +226,18 @@ class RubySystem if ! @@params[:random_seed].is_a?(Integer) raise TypeException end - print "System sys0 ",argv,"\n" + str = "System sys0 "+argv+"\n" LibRubyObject.all.each { |obj| if obj.is_a?(SetAssociativeCache) obj.calculateLatency end } - LibRubyObject.printConstructors + str += LibRubyObject.printConstructors + return str + end + + def self.generateConfig() + puts getConfig end def self.printIfacePorts() |