ruby: libruby_init now takes parsed Ruby-lang config text

libruby_init now expects to get a file that contains the output of
running a ruby-lang configuration, opposed to the ruby-lang
configuration itself.

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()