linker goes through assemblers, not space

used to traverse all methods in space
now "just" use the passed assemblers, which usually should be compiled and builtin (but for testing . . .)
tests fixed accordingly

lib/risc/linker.rb

@@ -51,7 +51,7 @@ module Risc
     # in place and we don't have to deal with changing loading code
     def position_all
       #need the initial jump at 0 and then functions
-      Position.new(cpu_init).set(0)
+      #TODO Position.new(cpu_init).set(0)
       code_start = position_objects( @platform.padding )
       # and then everything code
       position_code(code_start)
@@ -86,43 +86,37 @@ module Risc
     #
     # start at code_start.
     def position_code(code_start)
-      Parfait.object_space.types.values.each do |type|
+      assemblers.each do |asm|
-        next unless type.methods
+        #next unless method.name == :main or method.name == :__init__
-        type.methods.each_method do |method|
+        Position.log.debug "Method start #{code_start.to_s(16)} #{asm.method.name}"
-          #next unless method.name == :main or method.name == :__init__
+        code_pos = CodeListener.init(asm.method.binary, platform)
-          Position.log.debug "Method start #{code_start.to_s(16)} #{method.name}"
+        instructions = asm.instructions
-          code_pos = CodeListener.init(method.binary)
+        InstructionListener.init( instructions, asm.method.binary)
-          InstructionListener.init(method.cpu_instructions, method.binary)
+        code_pos.position_listener( LabelListener.new(instructions))
-          code_pos.position_listener( LabelListener.new(method.cpu_instructions))
+        code_pos.set(code_start)
-          code_pos.set(code_start)
+        code_start = Position.get(asm.method.binary.last_code).next_slot
-          code_start = Position.get(method.binary.last_code).next_slot
-        end
       end
     end
 
     # Create Binary code for all methods and the initial jump
     # BinaryWriter handles the writing from instructions into BinaryCode objects
     #
-    # current (poor) design throws an exception when the assembly can't fit
-    # constant loads into one instruction.
-    #
     def create_binary
-      methods = object_positions.keys.find_all{|obj| obj.is_a? Parfait::TypedMethod}
+      prerun
-      prerun(methods)
+      assemble
-      assemble(methods)
       log.debug "BinaryInit #{cpu_init.object_id.to_s(16)}"
     end
 
-    def prerun(methods)
+    def prerun
-      methods.each do |method|
+      assemblers.each do |asm|
-        method.cpu_instructions.each {|i| i.precheck }
+        asm.instructions.each {|i| i.precheck }
       end
     end
 
-    def assemble(methods)
+    def assemble
-      methods.each do |method|
+      assemblers.each do |asm|
-        writer = BinaryWriter.new(method.binary)
+        writer = BinaryWriter.new(asm.method.binary)
-        writer.assemble(method.cpu_instructions)
+        writer.assemble(asm.instructions)
       end
     end
 

test/risc/test_linker.rb

@@ -25,18 +25,18 @@ module Risc
       @linker.position_all
     end
     def test_positions_set
-      @machine.object_positions.each do |obj , position|
+      @linker.object_positions.each do |obj , position|
         assert Position.get(obj).valid? , "#{Position.get(obj)} , #{obj.object_id.to_s(16)}"
       end
     end
   end
-  class TestMachineInit #< MiniTest::Test
+  class TestMachineInit < MiniTest::Test
     def setup
       Parfait.boot!
-      @machine = Risc.machine.boot
+      Risc.boot!
-      @machine.translate(:arm)
+      @linker = Mom::MomCompiler.new.translate(:arm)
-      @machine.position_all
+      @linker.position_all
-      @machine.create_binary
+      @linker.create_binary
     end
     def test_pos_cpu
       assert_equal 0 ,  Position.get(@machine.cpu_init).at