fix instruction positioning
use at as at and only compute difference when needed (to determine if there is a jump in binary) Easier to understand that way
This commit is contained in:
@ -7,6 +7,7 @@ module Risc
|
||||
def setup
|
||||
Risc.machine.boot
|
||||
@binary = Parfait::BinaryCode.new(1)
|
||||
Position.set(@binary , 0)
|
||||
@label = Label.new("hi","ho")
|
||||
end
|
||||
def test_set_instr
|
||||
|
@ -6,21 +6,21 @@ module Risc
|
||||
class TestPositionBasic < MiniTest::Test
|
||||
|
||||
def test_creation_ok
|
||||
assert ObjectPosition.new(0)
|
||||
assert ObjectPosition.new(0,self)
|
||||
end
|
||||
def test_creation_fail
|
||||
assert_raises {Position.new("0")}
|
||||
end
|
||||
def test_add
|
||||
res = ObjectPosition.new(0) + 5
|
||||
res = ObjectPosition.new(0,self) + 5
|
||||
assert_equal 5 , res
|
||||
end
|
||||
def test_sub
|
||||
res = ObjectPosition.new(5) - 1
|
||||
res = ObjectPosition.new(5,self) - 1
|
||||
assert_equal 4 , res
|
||||
end
|
||||
def test_sub_pos
|
||||
res = ObjectPosition.new(5) - ObjectPosition.new(1)
|
||||
res = ObjectPosition.new(5,self) - ObjectPosition.new(1,self)
|
||||
assert_equal 4 , res
|
||||
end
|
||||
def test_set
|
||||
|
@ -39,7 +39,7 @@ module Risc
|
||||
assert_equal Parfait::BinaryCode , @machine.binary_init.class
|
||||
end
|
||||
def test_has_jump
|
||||
assert_equal "ea0011f4" , @machine.binary_init.get_word(1).to_s(16)
|
||||
assert_equal "ea000fb4" , @machine.binary_init.get_word(1).to_s(16)
|
||||
end
|
||||
def test_pos_bin
|
||||
assert_equal "0x0" , Position.get(@machine.binary_init).to_s
|
||||
@ -48,7 +48,7 @@ module Risc
|
||||
assert_equal 12 , Position.get(@machine.cpu_init).at
|
||||
end
|
||||
def test_cpu_at
|
||||
assert_equal 3 , Position.get(@machine.cpu_init.first).at
|
||||
assert_equal "0x3ee4" , Position.get(@machine.cpu_init.first).to_s
|
||||
end
|
||||
def test_cpu_bin
|
||||
assert_equal "0x3ed8" , Position.get(Position.get(@machine.cpu_init.first).binary).to_s
|
||||
|
Reference in New Issue
Block a user