ruby-x/rubyx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix instruction order, now with the save

Browse Source 
and finally formatted in statements too
This commit is contained in:
Torsten Ruger 2015-11-03 11:25:02 +02:00
parent dae12c532c
commit 14f8b42015
8 changed files with 88 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/compiler/statements/test_assign.rb
View File

@ -54,9 +54,9 @@ class Object
end end
end end
HERE HERE
@expect = [Label, GetSlot, GetSlot, SetSlot, LoadConstant, SetSlot, LoadConstant , @expect = [Label, GetSlot, GetSlot, SetSlot, LoadConstant, SetSlot, LoadConstant ,
SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall, GetSlot, GetSlot , SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall, Label, GetSlot ,
SetSlot, Label, RegisterTransfer, GetSlot, FunctionReturn] GetSlot, SetSlot, Label, RegisterTransfer, GetSlot, FunctionReturn]
check check
end end

31
test/compiler/statements/test_call.rb
View File

@ -17,9 +17,9 @@ class Object
end end
end end
HERE HERE
@expect = [Label, GetSlot, LoadConstant, SetSlot, LoadConstant, SetSlot, LoadConstant , @expect = [Label, GetSlot, LoadConstant, SetSlot, LoadConstant, SetSlot, LoadConstant ,
SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall, GetSlot, Label , SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall, Label, GetSlot ,
RegisterTransfer, GetSlot, FunctionReturn] Label, RegisterTransfer, GetSlot, FunctionReturn]
check check
end end
@ -37,9 +37,9 @@ class Object
end end
end end
HERE HERE
@expect = [Label, GetSlot, LoadConstant, SetSlot, LoadConstant, SetSlot, LoadConstant , @expect = [Label, GetSlot, LoadConstant, SetSlot, LoadConstant, SetSlot, LoadConstant ,
SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall, GetSlot, Label , SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall, Label, GetSlot ,
RegisterTransfer, GetSlot, FunctionReturn] Label, RegisterTransfer, GetSlot, FunctionReturn]
check check
end end
@ -57,9 +57,10 @@ class Object
end end
end end
HERE HERE
@expect = [Label, LoadConstant, GetSlot, SetSlot, GetSlot, GetSlot, GetSlot , @expect = [Label, LoadConstant, GetSlot, SetSlot, GetSlot, GetSlot, GetSlot ,
SetSlot, LoadConstant, SetSlot, LoadConstant, SetSlot, LoadConstant, SetSlot , SetSlot, LoadConstant, SetSlot, LoadConstant, SetSlot, LoadConstant, SetSlot ,
RegisterTransfer, FunctionCall, GetSlot, Label, RegisterTransfer, GetSlot, FunctionReturn] RegisterTransfer, FunctionCall, Label, GetSlot, Label, RegisterTransfer, GetSlot ,
FunctionReturn]
check check
end end
@ -77,9 +78,9 @@ class Object
end end
end end
HERE HERE
@expect = [Label, GetSlot, GetSlot, GetSlot, SetSlot, LoadConstant, SetSlot , @expect = [Label, GetSlot, GetSlot, GetSlot, SetSlot, LoadConstant, SetSlot ,
LoadConstant, SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall, GetSlot , LoadConstant, SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall, Label ,
Label, RegisterTransfer, GetSlot, FunctionReturn] GetSlot, Label, RegisterTransfer, GetSlot, FunctionReturn]
check check
end end
@ -94,9 +95,9 @@ int main()
end end
end end
HERE HERE
@expect = [Label, GetSlot, GetSlot, SetSlot, LoadConstant, SetSlot, LoadConstant , @expect = [Label, GetSlot, GetSlot, SetSlot, LoadConstant, SetSlot, LoadConstant ,
SetSlot, LoadConstant, SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall , SetSlot, LoadConstant, SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall ,
GetSlot, Label, RegisterTransfer, GetSlot, FunctionReturn] Label, GetSlot, Label, RegisterTransfer, GetSlot, FunctionReturn]
was = check was = check
set = was.next(7) set = was.next(7)
assert_equal SetSlot , set.class assert_equal SetSlot , set.class

6
test/compiler/statements/test_class.rb
View File

@ -34,9 +34,9 @@ class Object
end end
end end
HERE HERE
@expect = [Label, GetSlot, LoadConstant, SetSlot, LoadConstant, SetSlot, LoadConstant , @expect = [Label, GetSlot, LoadConstant, SetSlot, LoadConstant, SetSlot, LoadConstant ,
SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall, GetSlot, SetSlot , SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall, Label, GetSlot ,
Label, RegisterTransfer, GetSlot, FunctionReturn] SetSlot, Label, RegisterTransfer, GetSlot, FunctionReturn]
check check
end end

4
test/compiler/statements/test_return.rb
View File

@ -70,8 +70,8 @@ class Object
end end
HERE HERE
@expect = [Label, GetSlot, GetSlot, SetSlot, LoadConstant, SetSlot, LoadConstant , @expect = [Label, GetSlot, GetSlot, SetSlot, LoadConstant, SetSlot, LoadConstant ,
SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall, GetSlot, SetSlot , SetSlot, LoadConstant, SetSlot, RegisterTransfer, FunctionCall, Label, GetSlot ,
Label, RegisterTransfer, GetSlot, FunctionReturn] SetSlot, Label, RegisterTransfer, GetSlot, FunctionReturn]
check check
end end
end end

20
test/interpreter/test_add.rb
View File

@ -30,16 +30,21 @@ class AddTest < MiniTest::Test
assert @interpreter.get_register( :r2 ).is_a? Integer assert @interpreter.get_register( :r2 ).is_a? Integer
end end
def test_transfer def test_transfer
transfer = ticks 6 transfer = ticks 8
assert_equal Register::RegisterTransfer , transfer.class assert_equal Register::RegisterTransfer , transfer.class
assert_equal @interpreter.get_register(transfer.to) , @interpreter.get_register(transfer.from) assert_equal @interpreter.get_register(transfer.to) , @interpreter.get_register(transfer.from)
end end
def test_call def test_call
assert_equal Register::FunctionCall , ticks(7).class ret = ticks(18)
assert @interpreter.link assert_equal Register::FunctionReturn , ret.class
object = @interpreter.object_for( ret.register )
link = object.internal_object_get( ret.index )
assert_equal Register::Label , link.class
end end
def test_adding def test_adding
done_op = ticks(12) done_op = ticks(13)
assert_equal Register::OperatorInstruction , done_op.class assert_equal Register::OperatorInstruction , done_op.class
left = @interpreter.get_register(done_op.left) left = @interpreter.get_register(done_op.left)
rr = done_op.right rr = done_op.right
@ -57,9 +62,10 @@ class AddTest < MiniTest::Test
def test_chain def test_chain
#show_ticks # get output of what is #show_ticks # get output of what is
["Branch","Label","LoadConstant","GetSlot","SetSlot", ["Branch","Label","LoadConstant","GetSlot","SetSlot",
"RegisterTransfer","FunctionCall","Label","SaveReturn","LoadConstant", "LoadConstant","SetSlot","RegisterTransfer","FunctionCall","Label",
"LoadConstant","OperatorInstruction","SetSlot","Label","RegisterTransfer", "LoadConstant","LoadConstant","OperatorInstruction","SetSlot","Label",
"GetSlot","FunctionReturn","RegisterTransfer","Syscall","NilClass"].each_with_index do |name , index| "RegisterTransfer","GetSlot","FunctionReturn","RegisterTransfer","Syscall",
"NilClass"].each_with_index do |name , index|
got = ticks(1) got = ticks(1)
assert got.class.name.index(name) , "Wrong class for #{index+1}, expect #{name} , got #{got}" assert got.class.name.index(name) , "Wrong class for #{index+1}, expect #{name} , got #{got}"
end end

26
test/interpreter/test_if.rb
View File

@ -26,24 +26,22 @@ HERE
#puts parts.inspect #puts parts.inspect
Soml.compile( parts ) Soml.compile( parts )
machine.collect machine.collect
# statements = Register.machine.boot.parse_and_compile @string_input
# Soml::Compiler.compile( statements , Register.machine.space.get_main )
@interpreter = Interpreter::Interpreter.new @interpreter = Interpreter::Interpreter.new
@interpreter.start Register.machine.init @interpreter.start Register.machine.init
#show_ticks # get output of what is #show_ticks # get output of what is
["Branch","Label","LoadConstant","GetSlot","SetSlot", ["Branch","Label","LoadConstant","GetSlot","SetSlot",
"RegisterTransfer","FunctionCall","Label","SaveReturn","GetSlot", "LoadConstant","SetSlot","RegisterTransfer","FunctionCall","Label",
"GetSlot","SetSlot","LoadConstant","SetSlot","LoadConstant", "GetSlot","GetSlot","SetSlot","LoadConstant","SetSlot",
"SetSlot","LoadConstant","SetSlot","RegisterTransfer","FunctionCall", "LoadConstant","SetSlot","LoadConstant","SetSlot","LoadConstant",
"Label","SaveReturn","GetSlot","LoadConstant","OperatorInstruction", "SetSlot","RegisterTransfer","FunctionCall","Label","GetSlot",
"IsZero","GetSlot","LoadConstant","SetSlot","LoadConstant", "LoadConstant","OperatorInstruction","IsZero","GetSlot","LoadConstant",
"SetSlot","LoadConstant","SetSlot","RegisterTransfer","FunctionCall", "SetSlot","LoadConstant","SetSlot","LoadConstant","SetSlot",
"Label","SaveReturn","GetSlot","RegisterTransfer","Syscall", "LoadConstant","SetSlot","RegisterTransfer","FunctionCall","Label",
"RegisterTransfer","RegisterTransfer","SetSlot","Label","RegisterTransfer", "GetSlot","RegisterTransfer","Syscall","RegisterTransfer","RegisterTransfer",
"GetSlot","FunctionReturn","GetSlot","Branch","Label", "SetSlot","Label","RegisterTransfer","GetSlot","FunctionReturn",
"Label","RegisterTransfer","GetSlot","FunctionReturn","GetSlot", "GetSlot","Branch","Label","Label","RegisterTransfer",
"Label","RegisterTransfer","GetSlot","FunctionReturn","RegisterTransfer", "GetSlot","FunctionReturn","GetSlot","Label","RegisterTransfer",
"Syscall","NilClass"].each_with_index do |name , index| "GetSlot","FunctionReturn","RegisterTransfer","Syscall","NilClass"].each_with_index do |name , index|
got = ticks(1) got = ticks(1)
assert got.class.name.index(name) , "Wrong class for #{index+1}, expect #{name} , got #{got}" assert got.class.name.index(name) , "Wrong class for #{index+1}, expect #{name} , got #{got}"
end end

53
test/interpreter/test_puti.rb
View File

@ -54,39 +54,38 @@ HERE
#puts parts.inspect #puts parts.inspect
Soml.compile( parts ) Soml.compile( parts )
machine.collect machine.collect
# statements = Register.machine.boot.parse_and_compile @string_input
# Soml::Compiler.compile( statements , Register.machine.space.get_main )
@interpreter = Interpreter::Interpreter.new @interpreter = Interpreter::Interpreter.new
@interpreter.start Register.machine.init @interpreter.start Register.machine.init
#show_ticks # get output of what is #show_ticks # get output of what is
["Branch","Label","LoadConstant","GetSlot","SetSlot", ["Branch","Label","LoadConstant","GetSlot","SetSlot",
"RegisterTransfer","FunctionCall","Label","SaveReturn","GetSlot", "LoadConstant","SetSlot","RegisterTransfer","FunctionCall","Label",
"LoadConstant","SetSlot","LoadConstant","SetSlot","LoadConstant", "GetSlot","LoadConstant","SetSlot","LoadConstant","SetSlot",
"SetSlot","RegisterTransfer","FunctionCall","Label","SaveReturn", "LoadConstant","SetSlot","LoadConstant","SetSlot","RegisterTransfer",
"LoadConstant","GetSlot","SetSlot","GetSlot","GetSlot", "FunctionCall","Label","LoadConstant","GetSlot","SetSlot",
"SetSlot","LoadConstant","SetSlot","LoadConstant","SetSlot", "GetSlot","GetSlot","SetSlot","LoadConstant","SetSlot",
"GetSlot","GetSlot","SetSlot","RegisterTransfer","FunctionCall", "LoadConstant","SetSlot","GetSlot","GetSlot","SetSlot",
"Label","SaveReturn","GetSlot","LoadConstant","OperatorInstruction", "LoadConstant","SetSlot","RegisterTransfer","FunctionCall","Label",
"GetSlot","SetSlot","GetSlot","GetSlot","GetSlot", "GetSlot","LoadConstant","OperatorInstruction","GetSlot","SetSlot",
"OperatorInstruction","GetSlot","SetSlot","GetSlot","GetSlot", "GetSlot","GetSlot","GetSlot","OperatorInstruction","GetSlot",
"IsNotzero","Label","GetSlot","GetSlot","SetSlot", "SetSlot","GetSlot","GetSlot","IsNotzero","Label",
"LoadConstant","SetSlot","LoadConstant","SetSlot","GetSlot", "GetSlot","GetSlot","SetSlot","LoadConstant","SetSlot",
"GetSlot","SetSlot","RegisterTransfer","FunctionCall","Label", "LoadConstant","SetSlot","GetSlot","GetSlot","SetSlot",
"SaveReturn","GetSlot","LoadConstant","OperatorInstruction","IsZero", "LoadConstant","SetSlot","RegisterTransfer","FunctionCall","Label",
"Branch","Label","GetSlot","LoadConstant","OperatorInstruction", "GetSlot","LoadConstant","OperatorInstruction","IsZero","Branch",
"Label","GetSlot","LoadConstant","OperatorInstruction","IsZero",
"Label","LoadConstant","SetSlot","Label","GetSlot",
"LoadConstant","OperatorInstruction","IsZero","Label","LoadConstant",
"SetSlot","Label","GetSlot","LoadConstant","OperatorInstruction",
"IsZero","Label","LoadConstant","SetSlot","Label", "IsZero","Label","LoadConstant","SetSlot","Label",
"GetSlot","LoadConstant","OperatorInstruction","IsZero","Label", "GetSlot","LoadConstant","OperatorInstruction","IsZero","Label",
"LoadConstant","SetSlot","Label","GetSlot","LoadConstant", "LoadConstant","SetSlot","Label","Label","RegisterTransfer",
"OperatorInstruction","IsZero","Label","LoadConstant","SetSlot", "GetSlot","FunctionReturn","GetSlot","GetSlot","SetSlot",
"Label","GetSlot","LoadConstant","OperatorInstruction","IsZero", "GetSlot","GetSlot","GetSlot","OperatorInstruction","SetSlot",
"Label","LoadConstant","SetSlot","Label","Label", "Label","GetSlot","SetSlot","Label","RegisterTransfer",
"RegisterTransfer","GetSlot","FunctionReturn","GetSlot","GetSlot", "GetSlot","FunctionReturn","GetSlot","SetSlot","Label",
"SetSlot","GetSlot","GetSlot","GetSlot","OperatorInstruction", "RegisterTransfer","GetSlot","FunctionReturn","GetSlot","Label",
"SetSlot","Label","GetSlot","SetSlot","Label", "RegisterTransfer","GetSlot","FunctionReturn","RegisterTransfer","Syscall",
"RegisterTransfer","GetSlot","FunctionReturn","GetSlot","SetSlot", "NilClass"].each_with_index do |name , index|
"Label","RegisterTransfer","GetSlot","FunctionReturn","GetSlot",
"Label","RegisterTransfer","GetSlot","FunctionReturn","RegisterTransfer",
"Syscall","NilClass"].each_with_index do |name , index|
got = ticks(1) got = ticks(1)
assert got.class.name.index(name) , "Wrong class for #{index+1}, expect #{name} , got #{got}" assert got.class.name.index(name) , "Wrong class for #{index+1}, expect #{name} , got #{got}"
end end

32
test/interpreter/test_puts.rb
View File

@ -41,30 +41,24 @@ class TestPuts < MiniTest::Test
assert @interpreter.get_register( :r1 ).is_a? Integer assert @interpreter.get_register( :r1 ).is_a? Integer
end end
def test_transfer def test_transfer
transfer = ticks 6 transfer = ticks 8
assert_equal Register::RegisterTransfer , transfer.class assert_equal Register::RegisterTransfer , transfer.class
assert_equal @interpreter.get_register(transfer.to) , @interpreter.get_register(transfer.from) assert_equal @interpreter.get_register(transfer.to) , @interpreter.get_register(transfer.from)
end end
def test_call def test_call
assert_equal Register::FunctionCall , ticks(7).class assert_equal Register::FunctionCall , ticks(9).class
assert @interpreter.link
end
def test_save
done = ticks(9)
assert_equal Register::SaveReturn , done.class
assert @interpreter.get_register done.register.symbol
end end
def test_chain def test_chain
#show_ticks # get output of what is #show_ticks # get output of what is
[ "Branch","Label","LoadConstant","GetSlot","SetSlot", ["Branch","Label","LoadConstant","GetSlot","SetSlot",
"RegisterTransfer","FunctionCall","Label","SaveReturn","GetSlot", "LoadConstant","SetSlot","RegisterTransfer","FunctionCall","Label",
"LoadConstant","SetSlot","LoadConstant","SetSlot","LoadConstant", "GetSlot","LoadConstant","SetSlot","LoadConstant","SetSlot",
"SetSlot","RegisterTransfer","FunctionCall","Label","SaveReturn", "LoadConstant","SetSlot","LoadConstant","SetSlot","RegisterTransfer",
"GetSlot","RegisterTransfer","Syscall","RegisterTransfer","RegisterTransfer", "FunctionCall","Label","GetSlot","RegisterTransfer","Syscall",
"SetSlot","Label","RegisterTransfer","GetSlot","FunctionReturn", "RegisterTransfer","RegisterTransfer","SetSlot","Label","RegisterTransfer",
"GetSlot","Label","RegisterTransfer","GetSlot","FunctionReturn", "GetSlot","FunctionReturn","GetSlot","Label","RegisterTransfer",
"RegisterTransfer","Syscall","NilClass"].each_with_index do |name , index| "GetSlot","FunctionReturn","RegisterTransfer","Syscall","NilClass"].each_with_index do |name , index|
got = ticks(1) got = ticks(1)
#puts "TICK #{index}" #puts "TICK #{index}"
assert got.class.name.index(name) , "Wrong class for #{index+1}, expect #{name} , got #{got}" assert got.class.name.index(name) , "Wrong class for #{index+1}, expect #{name} , got #{got}"
@ -72,20 +66,20 @@ class TestPuts < MiniTest::Test
end end
def test_putstring def test_putstring
done = ticks(23) done = ticks(25)
assert_equal Register::Syscall , done.class assert_equal Register::Syscall , done.class
assert_equal "Hello again" , @interpreter.stdout assert_equal "Hello again" , @interpreter.stdout
end end
def test_return def test_return
done = ticks(30) done = ticks(32)
assert_equal Register::FunctionReturn , done.class assert_equal Register::FunctionReturn , done.class
assert Register::Label , @interpreter.instruction.class assert Register::Label , @interpreter.instruction.class
assert @interpreter.instruction.is_a?(Register::Instruction) , "not instruction #{@interpreter.instruction}" assert @interpreter.instruction.is_a?(Register::Instruction) , "not instruction #{@interpreter.instruction}"
end end
def test_exit def test_exit
done = ticks(38) done = ticks(40)
assert_equal NilClass , done.class assert_equal NilClass , done.class
assert_equal "Hello again" , @interpreter.stdout assert_equal "Hello again" , @interpreter.stdout
end end