seperate position create and register
many test fixes
This commit is contained in:
@ -5,13 +5,13 @@ module Risc
|
||||
def setup
|
||||
Risc.machine.boot
|
||||
@binary = Parfait::BinaryCode.new(1)
|
||||
@bin_pos = Position.new(@binary,0)
|
||||
@bin_pos = Position.new(@binary).set(0)
|
||||
@instruction = DummyInstruction.new(DummyInstruction.new)
|
||||
@position = InstructionListener.init(@instruction , @binary)
|
||||
end
|
||||
def test_label_address
|
||||
label = Label.new("hi" ,"ho" , FakeAddress.new(0))
|
||||
label_pos = Position.new( label , -1 )
|
||||
label_pos = Position.new( label )
|
||||
label_pos.position_listener(InstructionListener.new(@binary))
|
||||
label_pos.set(8)
|
||||
assert_equal 8 , label_pos.object.address.value
|
||||
@ -52,8 +52,8 @@ module Risc
|
||||
def test_label_at_branch
|
||||
label = Label.new("Hi","Ho" , FakeAddress.new(5) , @instruction)
|
||||
branch = Branch.new("b" , label)
|
||||
Position.new(label , 8 )
|
||||
Position.new(branch , 8 )
|
||||
Position.new(label ).set(8)
|
||||
Position.new(branch).set(8)
|
||||
at_8 = Position.at(8)
|
||||
assert_equal Position , at_8.class
|
||||
assert_equal Branch , at_8.object.class
|
||||
|
@ -6,9 +6,9 @@ module Risc
|
||||
def setup
|
||||
Risc.machine.boot
|
||||
@label = Label.new("Hi","Ho" , FakeAddress.new(5))
|
||||
@label_pos = Position.new(@label , -1)
|
||||
@label_pos = Position.new(@label ).set(4)
|
||||
@code = Parfait::BinaryCode.new(1)
|
||||
@code_pos = Position.new(@code , -1)
|
||||
@code_pos = Position.new(@code)
|
||||
@code_pos.position_listener( LabelListener.new(@label))
|
||||
end
|
||||
|
||||
|
@ -5,7 +5,7 @@ module Risc
|
||||
class TestPosition < MiniTest::Test
|
||||
|
||||
def setup
|
||||
@pos = Position.new(self , -1)
|
||||
@pos = Position.new(self )
|
||||
end
|
||||
def test_new
|
||||
assert @pos
|
||||
@ -15,7 +15,7 @@ module Risc
|
||||
end
|
||||
def test_next_slot
|
||||
mov = Arm::ArmMachine.mov(:r1 , :r1)
|
||||
position = Position.new(mov , 0)
|
||||
position = Position.new(mov ).set(0)
|
||||
assert_equal 4, position.next_slot
|
||||
end
|
||||
def test_has_get_code
|
||||
@ -38,7 +38,7 @@ module Risc
|
||||
assert_equal 1 , @pos.position_listeners.length
|
||||
end
|
||||
def test_set
|
||||
assert_equal 0 , @pos.set(0)
|
||||
assert_equal 0 , @pos.set(0).at
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -5,7 +5,7 @@ module Risc
|
||||
def setup
|
||||
Position.clear_positions
|
||||
@instruction = DummyInstruction.new
|
||||
@position = Position.new(@instruction , 0)
|
||||
@position = Position.new(@instruction).set(0)
|
||||
@listener = PositionListener.new( @instruction )
|
||||
end
|
||||
def test_has_register
|
||||
@ -24,7 +24,7 @@ module Risc
|
||||
end
|
||||
def test_no_fire_after_unregister
|
||||
@object = @instruction
|
||||
Position.new(self, 10)
|
||||
Position.new(self).set(10)
|
||||
assert @position.register_event(:position_changed , self)#can't use helper
|
||||
assert @position.remove_position_listener(self)
|
||||
@position.trigger(:position_changed , @position)
|
||||
@ -38,7 +38,7 @@ module Risc
|
||||
end
|
||||
def test_position_set_triggers
|
||||
@object = @instruction
|
||||
Position.new(self, 0)
|
||||
Position.new(self).set(0)
|
||||
@position.register_event(:position_changed , self)#can't use helper
|
||||
@position.set(10)
|
||||
assert_equal @position , @trigger
|
||||
|
@ -4,7 +4,7 @@ module Risc
|
||||
class TestPositionMath < MiniTest::Test
|
||||
|
||||
def setup
|
||||
@pos = Position.new(self , 5)
|
||||
@pos = Position.new(self).set(5)
|
||||
end
|
||||
def test_add
|
||||
res = @pos + 5
|
||||
@ -15,24 +15,24 @@ module Risc
|
||||
assert_equal 2 , res
|
||||
end
|
||||
def test_sub_pos
|
||||
res = @pos - Position.new(@pos,4)
|
||||
res = @pos - Position.new(@pos).set(4)
|
||||
assert_equal 1 , res
|
||||
end
|
||||
def test_lg
|
||||
assert @pos > Position.new(@pos,4)
|
||||
assert @pos > Position.new(@pos).set(2)
|
||||
end
|
||||
def test_tos
|
||||
assert_equal "0x5" , @pos.to_s
|
||||
end
|
||||
def test_reset_ok
|
||||
pos = @pos.set(10)
|
||||
assert_equal 10 , pos
|
||||
assert_equal 10 , pos.at
|
||||
end
|
||||
def test_object_class_test
|
||||
assert_equal :object , @pos.object_class
|
||||
end
|
||||
def test_object_class_instr
|
||||
assert_equal :instruction , Position.new(Label.new("hi","ho",FakeAddress.new(1)),4).object_class
|
||||
assert_equal :instruction , Position.new(Label.new("hi","ho",FakeAddress.new(1))).set(4).object_class
|
||||
end
|
||||
def test_at
|
||||
pos = Position.at(5)
|
||||
|
@ -6,8 +6,8 @@ module Risc
|
||||
def setup
|
||||
@object = Dummy.new
|
||||
@dependent = Dummy.new
|
||||
@pos = Position.new(@object,0)
|
||||
Position.new(@dependent,0)
|
||||
@pos = Position.new(@object).set(0)
|
||||
Position.new(@dependent).set(0)
|
||||
@listener = PositionListener.new(@dependent)
|
||||
end
|
||||
def test_register
|
||||
|
Reference in New Issue
Block a user