give labels an integer that will end up being the position at runtime

Since integers are first class objects, we need to use an integer object
as the return address. The actual address can not be stored in an
instance variable since it is not an object.
The address is unique to the label and never changes after positioning
(using the int is next up)

lib/arm/translator.rb

@@ -13,7 +13,7 @@ module Arm
     end
 
     def translate_Label( code )
-      Risc::Label.new( code.source , code.name )
+      Risc.label( code.source , code.name , code.integer)
     end
 
     # arm indexes are

lib/mom/instruction/basic_values.rb

@@ -11,7 +11,8 @@ module Mom
       @value = value
     end
     def to_parfait(compiler)
-      value = Parfait::Integer.new(@value)
+      value = Parfait.object_space.get_integer
+      value.set_value(@value)
       compiler.add_constant(value)
       value
     end

lib/mom/instruction/dynamic_call.rb

@@ -33,7 +33,7 @@ module Mom
     def to_risc(compiler)
       compiler.add_constant( @cache_entry )
       reg = compiler.use_reg( :Object )
-      return_label = Risc::Label.new(self,"continue_#{object_id}")
+      return_label = Risc.label(self, "continue_#{object_id}")
       save_return =  SlotLoad.new([:message,:next_message,:return_address],[return_label],self)
       moves = save_return.to_risc(compiler)
       moves << Risc.slot_to_reg(self, :message , :next_message , Risc.message_reg)

lib/mom/instruction/label.rb

@@ -31,8 +31,9 @@ module Mom
     # Off course some specific place still has to be responsible for actually
     # adding the label to the instruction list (usually an if/while)
     def to_risc(compiler)
-      
+      int = Parfait.object_space.get_integer
-      @risc_label ||= Risc::Label.new(self,name)
+      compiler.add_constant(int)
+      @risc_label ||= Risc.label(self,name , int , nil)
     end
   end
 end

lib/mom/instruction/simple_call.rb

@@ -23,7 +23,7 @@ module Mom
     # For returning, we add a label after the call, and load it's address into the
     # return_address of the next_message, for the ReturnSequence to pick it up.
     def to_risc(compiler)
-      return_label = Risc::Label.new(self,"continue_#{object_id}")
+      return_label = Risc.label(self,"continue_#{object_id}")
       save_return =  SlotLoad.new([:message,:next_message,:return_address],[return_label],self)
       moves = save_return.to_risc(compiler)
       moves << Risc.slot_to_reg(self, :message , :next_message , Risc.message_reg)

lib/risc/instructions/label.rb

@@ -8,11 +8,13 @@ module Risc
   #
 
   class Label < Instruction
-    def initialize( source , name , nekst = nil)
+    def initialize( source , name , int , nekst = nil)
       super(source , nekst)
       @name = name
+      @integer = int
+      raise "Not int #{int}" if int and !int.is_a?(Parfait::Integer)
     end
-    attr_reader :name
+    attr_reader :name , :integer
 
     def to_cpu(translator)
       @cpu_label ||= super
@@ -51,7 +53,8 @@ module Risc
     alias :padded_length  :byte_length
   end
 
-  def self.label( source , name , nekst = nil)
+  def self.label( source , name , position = nil , nekst = nil)
-    Label.new( source , name , nekst = nil)
+    position ||= Parfait.object_space.get_integer
+    Label.new( source , name , position, nekst )
   end
 end

test/risc/position/test_code_position.rb

@@ -7,7 +7,7 @@ module Risc
       Risc.machine.boot
       @binary = Parfait::BinaryCode.new(1)
       @method = Parfait.object_space.types.values.first.methods
-      @label = Label.new("hi","ho")
+      @label = Risc.label("hi","ho")
     end
     def test_set_bin
       pos = Position.set( @binary , 0 , @method)
@@ -29,7 +29,7 @@ module Risc
       machine.translate(:interpreter)
       @binary = Parfait::BinaryCode.new(1)
       @method = Parfait.object_space.types.values.first.methods
-      @label = Label.new("hi","ho")
+      @label = Risc.label("hi","ho")
     end
 
     def test_bin_propagates_existing

test/risc/position/test_instruction_position.rb

@@ -8,7 +8,7 @@ module Risc
         Risc.machine.boot
         @binary = Parfait::BinaryCode.new(1)
         Position.set(@binary , 0 , Parfait.object_space.get_main)
-        @label = Label.new("hi","ho")
+        @label = Risc.label("hi","ho")
       end
       def test_set_instr
         pos = Position.set( @label , 8 , @binary)

test/risc/test_builder.rb

@@ -7,7 +7,7 @@ module Risc
       Risc.machine.boot
       init = Parfait.object_space.get_init
       @builder = Risc::MethodCompiler.new( init ).builder(false , init)
-      @label = Risc::Label.new("source","name")
+      @label = Risc.label("source","name")
     end
     def test_has_build
       assert @builder.respond_to?(:build)

test/risc/test_instructions.rb

@@ -3,7 +3,7 @@ require_relative "../helper"
 module Risc
   class TestInstructions < MiniTest::Test
     def setup
-      @label = Label.new("test" , "test")
+      @label = Label.new("test" , "test",nil)
       @branch = Branch.new("test" , @label)
       @instruction = Instruction.new("test")
     end
@@ -19,7 +19,7 @@ module Risc
       assert @label.to_s.include?("Label")
     end
     def test_label_tos2
-      assert Label.new(nil,nil).to_s.include?("Label")
+      assert Label.new(nil,nil,nil).to_s.include?("Label")
     end
     def test_last_empty
       assert_equal @instruction, @instruction.last
@@ -55,7 +55,7 @@ module Risc
       assert_nil  @instruction.next(2)
     end
     def test_label_is_method
-      label = Label.new("test" , "Object.test")
+      label = Label.new("test" , "Object.test" , nil)
       assert label.is_method
     end
     def test_label_is_not_method

test/risc/test_interpreter_platform.rb

@@ -26,7 +26,7 @@ module Risc
     end
 
     def test_load_translates_label
-      label = Label.new("test" , "test")
+      label = Risc.label("test" , "test",nil)
       load = Risc.load_constant("source" , label , :r1)
       translated = @translator.translate(load)
       assert label != translated.constant