From 1baece99c75ae942c4e8057ef2c700cbd4dc2a9f Mon Sep 17 00:00:00 2001
From: Torsten Ruger <torsten@villataika.fi>
Date: Fri, 12 Jun 2015 18:52:06 +0300
Subject: [PATCH] split the pass runs to debug

---
 lib/virtual/machine.rb     | 77 ++++++++++++++++++++++++++++----------
 test/virtual/test_hello.rb |  4 +-
 2 files changed, 61 insertions(+), 20 deletions(-)

diff --git a/lib/virtual/machine.rb b/lib/virtual/machine.rb
index 9b940ded..bd51cc24 100644
--- a/lib/virtual/machine.rb
+++ b/lib/virtual/machine.rb
@@ -43,28 +43,47 @@ module Virtual
     end
     attr_reader  :passes , :space , :class_mappings , :init , :objects
 
-    def run_passes
-      @init = Block.new("init",nil)
-      @init.add_code  Register::RegisterMain.new( self.space.get_main )
+    # run all passes before the pass given
+    # also collect the  block to run the passes on and
+    # runs housekeeping Minimizer and Collector
+    # Has to be called before run_after
+    def run_before stop_at
       Minimizer.new.run
       Collector.new.run
-      @passes.each do |pass_class|
-        blocks = [@init]
-        @space.classes.values.each do |c|
-          c.instance_methods.each do |f|
-            nb = f.info.blocks
-            blocks += nb
-          end
+      @blocks = [@init]
+      @space.classes.values.each do |c|
+        c.instance_methods.each do |f|
+          nb = f.info.blocks
+          @blocks += nb
         end
-        #puts "running #{pass_class}"
-        blocks.each do |block|
-          raise "nil block " unless block
-          pass = eval pass_class
-          raise "no such pass-class as #{pass_class}" unless pass
-          pass.new.run(block)
-        end
-        #puts @space.get_main if pass_class == "Virtual::SendImplementation"
       end
+      @passes.each do |pass_class|
+        puts "running #{pass_class}"
+        run_blocks_for pass_class
+        return if stop_at == pass_class
+      end
+    end
+
+    # run all passes after the pass given
+    # run_before MUST be called first.
+    # the two are meant as a poor mans breakoint
+    def run_after start_at
+      run = false
+      @passes.each do |pass_class|
+        if run
+          puts "running #{pass_class}"
+          run_blocks_for pass_class
+        else
+          run = true if start_at == pass_class
+        end
+      end
+    end
+
+    # as before, run all passes that are registered
+    # (but now finer control with before/after versions)
+    def run_passes
+      run_before "Virtual::SendImplementation"
+      run_after "Virtual::SendImplementation"
     end
 
     # Objects are data and get assembled after functions
@@ -97,10 +116,17 @@ module Virtual
       me = Virtual.machine
       # boot is a verb here. this is a somewhat tricky process which is in it's own file, boot.rb
       raise "already booted" if @booted
-      me.boot_parfait!
+      me.boot
       me
     end
 
+    def boot
+      boot_parfait!
+      @init = Block.new("init",nil)
+      @init.add_code  Register::RegisterMain.new( self.space.get_main )
+      @booted = true
+    end
+
     # for testing, make sure no old artefacts hang around
     #maybe should be moved to test dir
     def self.reboot
@@ -111,14 +137,27 @@ module Virtual
       parts = Parser::Transform.new.apply(syntax)
       Compiler.compile( parts , @space.get_main )
     end
+
+    private
+    def run_blocks_for pass_class
+      pass = eval pass_class
+      raise "no such pass-class as #{pass_class}" unless pass
+      @blocks.each do |block|
+        raise "nil block " unless block
+        pass.new.run(block)
+      end
+    end
+
   end
 
+  # Module function to retrieve singleton
   def self.machine
     unless defined?(@machine)
       @machine = Machine.new
     end
     @machine
   end
+
 end
 
 require_relative "boot"
diff --git a/test/virtual/test_hello.rb b/test/virtual/test_hello.rb
index 0c42b818..65823994 100644
--- a/test/virtual/test_hello.rb
+++ b/test/virtual/test_hello.rb
@@ -6,8 +6,10 @@ class HelloTest < MiniTest::Test
   def check
     machine = Virtual::Machine.boot
     expressions = machine.compile_main @string_input
+    machine.run_before "Register::CallImplementation"
     puts Sof::Writer.write(machine.space)
-    machine.run_passes
+    machine.run_after "Register::CallImplementation"
+
 
     writer = Elf::ObjectWriter.new(machine)
     writer.save "hello.o"