write adjusted address

and rename integer to address in label
1k hurray
This commit is contained in:
Torsten Ruger
2018-05-31 00:07:58 +03:00
parent e39e96f646
commit 67100a3ef8
10 changed files with 36 additions and 23 deletions

View File

@ -90,8 +90,8 @@ module Arm
end
def label( pos = 0x12 + 8)
l = Risc::Label.new("some" , "Label" , FakeInt.new(2))
Risc::Position.set(l.integer , 0x22 + 8)
l = Risc::Label.new("some" , "Label" , FakeAddress.new(2))
Risc::Position.set(l.address , 0x22 + 8)
Risc::Position.set(l , pos , @binary)
l
end

View File

@ -16,12 +16,12 @@ module Risc
end
def test_label_set_int
Position.set( @label , 8 , @binary)
assert_equal 8 , @label.integer.value
assert_equal 8 , @label.address.value
end
def test_label_reset_int
Position.set( @label , 8 , @binary)
Position.set( @label , 18 , @binary)
assert_equal 18 , @label.integer.value
assert_equal 18 , @label.address.value
end
def test_ins_propagates
@label.set_next Arm::ArmMachine.b( @label)

View File

@ -3,7 +3,7 @@ require_relative "../helper"
module Risc
class TestInstructions < MiniTest::Test
def setup
@label = Label.new("test" , "test",FakeInt.new(5))
@label = Label.new("test" , "test",FakeAddress.new(5))
@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,FakeInt.new(2)).to_s.include?("Label")
assert Label.new("nil",nil,FakeAddress.new(2)).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" , FakeInt.new(5))
label = Label.new("test" , "Object.test" , FakeAddress.new(5))
assert label.is_method
end
def test_label_is_not_method

View File

@ -13,3 +13,8 @@ class FakeInt
@value = val
end
end
class FakeAddress < FakeInt
def is_a?(clazz)
clazz == Parfait::ReturnAddress
end
end