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

fold last of the virtual into register

Browse Source
This commit is contained in:
Torsten Ruger
2015-10-22 18:16:29 +03:00
parent f658ecf425
commit dcbd3c7091
67 changed files with 161 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/compiler/expressions/compiler_helper.rb
View File

@ -3,7 +3,7 @@ require 'parslet/convenience'
Phisol::Compiler.class_eval do
def set_main main
@clazz = Virtual.machine.space.get_class_by_name :Object
@clazz = Register.machine.space.get_class_by_name :Object
@method = main
end
end
@ -11,10 +11,10 @@ end
module CompilerHelper
def set_main compiler
compiler.set_main Virtual.machine.space.get_main
compiler.set_main Register.machine.space.get_main
end
def check
machine = Virtual.machine
machine = Register.machine
machine.boot unless machine.booted
parser = Parser::Salama.new
parser = parser.send @root

6
test/compiler/expressions/test_call.rb
View File

@ -1,11 +1,11 @@
require_relative "compiler_helper"
module Virtual
module Register
class TestCall < MiniTest::Test
include CompilerHelper
def setup
Virtual.machine.boot
Register.machine.boot
@root = :call_site
@output = Register::RegisterValue
end
@ -31,7 +31,7 @@ module Virtual
end
def test_call_main_op
Virtual.machine.space.get_main.ensure_local(:bar , :Integer)
Register.machine.space.get_main.ensure_local(:bar , :Integer)
@string_input = 'main( bar )'
check
end

10
test/compiler/expressions/test_field_access.rb
View File

@ -1,11 +1,11 @@
require_relative "compiler_helper"
module Virtual
module Register
class TestFields < MiniTest::Test
include CompilerHelper
def setup
Virtual.machine.boot
Register.machine.boot
end
def test_field_not_defined
@ -17,7 +17,7 @@ HERE
end
def test_field
Virtual.machine.space.get_class_by_name(:Object).object_layout.add_instance_variable(:bro)
Register.machine.space.get_class_by_name(:Object).object_layout.add_instance_variable(:bro)
@root = :field_access
@string_input = <<HERE
self.bro
@ -27,7 +27,7 @@ HERE
end
def test_local
Virtual.machine.space.get_main.ensure_local(:bar , :Integer)
Register.machine.space.get_main.ensure_local(:bar , :Integer)
@root = :name
@string_input = 'bar '
@output = Register::RegisterValue
@ -35,7 +35,7 @@ HERE
end
def test_args
Virtual.machine.space.get_main.arguments.push Parfait::Variable.new(:Integer , :bar)
Register.machine.space.get_main.arguments.push Parfait::Variable.new(:Integer , :bar)
@root = :name
@string_input = 'bar '
@output = Register::RegisterValue

12
test/compiler/expressions/test_ops.rb
View File

@ -1,11 +1,11 @@
require_relative "compiler_helper"
module Virtual
module Register
class TestOps < MiniTest::Test
include CompilerHelper
def setup
Virtual.machine.boot
Register.machine.boot
@root = :operator_value
@output = Register::RegisterValue
end
@ -20,24 +20,24 @@ module Virtual
end
end
def test_local_int
Virtual.machine.space.get_main.ensure_local(:bar , :Integer)
Register.machine.space.get_main.ensure_local(:bar , :Integer)
@string_input = 'bar + 3'
check
end
def test_int_local
Virtual.machine.space.get_main.ensure_local(:bar , :Integer)
Register.machine.space.get_main.ensure_local(:bar , :Integer)
@string_input = '3 + bar'
check
end
def test_field_int
Virtual.machine.space.get_class_by_name(:Object).object_layout.add_instance_variable(:bro)
Register.machine.space.get_class_by_name(:Object).object_layout.add_instance_variable(:bro)
@string_input = "self.bro + 3"
check
end
def test_int_field
Virtual.machine.space.get_class_by_name(:Object).object_layout.add_instance_variable(:bro)
Register.machine.space.get_class_by_name(:Object).object_layout.add_instance_variable(:bro)
@string_input = "3 + self.bro"
check
end

2
test/compiler/fragments/helper.rb
View File

@ -13,7 +13,7 @@ module Fragments
@stdout = ""
end
def check
machine = Virtual.machine.boot
machine = Register.machine.boot
machine.parse_and_compile @string_input
machine.collect
interpreter = Interpreter::Interpreter.new

4
test/compiler/fragments/test_foo.rb
View File

@ -16,8 +16,8 @@ class Object
end
end
HERE
@expect = [ [SaveReturn,Register::GetSlot,Virtual::Set,Virtual::Set,
Virtual::Set,Virtual::Set,RegisterTransfer,FunctionCall] ,[RegisterTransfer,GetSlot,FunctionReturn] ]
@expect = [ [SaveReturn,Register::GetSlot,Register::Set,Register::Set,
Register::Set,Register::Set,RegisterTransfer,FunctionCall] ,[RegisterTransfer,GetSlot,FunctionReturn] ]
check
end

2
test/compiler/fragments/test_functions.rb
View File

@ -35,7 +35,7 @@ class Object
end
end
HERE
@expect = [[SaveReturn,Register::GetSlot,Virtual::Set,Virtual::Set,RegisterTransfer,FunctionCall] ,
@expect = [[SaveReturn,Register::GetSlot,Register::Set,Register::Set,RegisterTransfer,FunctionCall] ,
[RegisterTransfer,GetSlot,FunctionReturn]]
check

4
test/compiler/fragments/test_hello.rb
View File

@ -11,8 +11,8 @@ class Object
end
end
HERE
@expect = [[SaveReturn,Virtual::Set,Register::GetSlot,Virtual::Set,
Virtual::Set,RegisterTransfer,FunctionCall] ,[RegisterTransfer,GetSlot,FunctionReturn]]
@expect = [[SaveReturn,Register::Set,Register::GetSlot,Register::Set,
Register::Set,RegisterTransfer,FunctionCall] ,[RegisterTransfer,GetSlot,FunctionReturn]]
check
end
end

4
test/compiler/fragments/test_putint.rb
View File

@ -16,8 +16,8 @@ class Object
end
end
HERE
@expect = [ [SaveReturn,Virtual::Set,Register::GetSlot,Virtual::Set,
Virtual::Set,RegisterTransfer,FunctionCall] ,[RegisterTransfer,GetSlot,FunctionReturn] ]
@expect = [ [SaveReturn,Register::Set,Register::GetSlot,Register::Set,
Register::Set,RegisterTransfer,FunctionCall] ,[RegisterTransfer,GetSlot,FunctionReturn] ]
check
end
end

4
test/compiler/fragments/test_recursive_fibo.rb
View File

@ -27,8 +27,8 @@ class Object
end
end
HERE
@expect = [[SaveReturn,Register::GetSlot,Virtual::Set,Virtual::Set,
Virtual::Set,Virtual::Set,RegisterTransfer,FunctionCall] , [RegisterTransfer,GetSlot,FunctionReturn]]
@expect = [[SaveReturn,Register::GetSlot,Register::Set,Register::Set,
Register::Set,Register::Set,RegisterTransfer,FunctionCall] , [RegisterTransfer,GetSlot,FunctionReturn]]
check
end
end

8
test/compiler/fragments/test_while_fibo.rb
View File

@ -24,20 +24,20 @@ class Object
end
end
HERE
@expect = [ [SaveReturn,Register::GetSlot,Virtual::Set,Virtual::Set,
Virtual::Set,Virtual::Set,RegisterTransfer,FunctionCall] ,[RegisterTransfer,GetSlot,FunctionReturn] ]
@expect = [ [SaveReturn,Register::GetSlot,Register::Set,Register::Set,
Register::Set,Register::Set,RegisterTransfer,FunctionCall] ,[RegisterTransfer,GetSlot,FunctionReturn] ]
check
end
# a hand coded version of the fibonachi numbers (moved to kernel to be able to call it)
# not my hand off course, found in the net from a basic introduction
def ttest_kernel_fibo
int = Register::Integer.new(Virtual::RegisterMachine.instance.receiver_register)
int = Register::Integer.new(Register::RegisterMachine.instance.receiver_register)
fibo = @object_space.get_class_by_name(:Object).resolve_method(:fibo)
main = @object_space.main
main.mov int , 10
main.call( fibo )
main.mov( Virtual::RegisterMachine.instance.receiver_register , Virtual::RegisterMachine.instance.return_register )
main.mov( Register::RegisterMachine.instance.receiver_register , Register::RegisterMachine.instance.return_register )
putint = @object_space.get_class_by_name(:Object).resolve_method(:putint)
main.call( putint )
@should = [0x0,0x40,0x2d,0xe9,0x1,0x0,0x52,0xe3,0x2,0x0,0xa0,0xd1,0x7,0x0,0x0,0xda,0x1,0x30,0xa0,0xe3,0x0,0x40,0xa0,0xe3,0x4,0x30,0x83,0xe0,0x4,0x40,0x43,0xe0,0x1,0x20,0x42,0xe2,0x1,0x0,0x52,0xe3,0xfa,0xff,0xff,0x1a,0x3,0x0,0xa0,0xe1,0x0,0x80,0xbd,0xe8]

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

@ -4,10 +4,10 @@ require_relative '../../helper'
module Statements
def check
machine = Virtual.machine
machine = Register.machine
machine.boot unless machine.booted
machine.parse_and_compile @string_input
produced = Virtual.machine.space.get_main.source
produced = Register.machine.space.get_main.source
assert @expect , "No output given"
assert_equal @expect.length , produced.blocks.length , "Block length"
produced.blocks.each_with_index do |b,i|

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

@ -5,7 +5,7 @@ class TestAssignStatement < MiniTest::Test
include Statements
def setup
Virtual.machine.boot
Register.machine.boot
end
def test_assign_op
@ -77,7 +77,7 @@ HERE
end
def test_assign_arg
Virtual.machine.space.get_main.arguments.push Parfait::Variable.new(:Integer , :bar)
Register.machine.space.get_main.arguments.push Parfait::Variable.new(:Integer , :bar)
@string_input = <<HERE
class Object
int main(int bar)
@ -109,7 +109,7 @@ HERE
def test_arg_get
# have to define bar externally, just because redefining main. Otherwise that would be automatic
Virtual.machine.space.get_main.arguments.push Parfait::Variable.new(:Integer , :bar)
Register.machine.space.get_main.arguments.push Parfait::Variable.new(:Integer , :bar)
@string_input = <<HERE
class Object
int main(int bar)