fold last of the virtual into register

test/compiler/expressions/compiler_helper.rb

@@ -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

test/compiler/expressions/test_call.rb

@@ -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

test/compiler/expressions/test_field_access.rb

@@ -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

test/compiler/expressions/test_ops.rb

@@ -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

test/compiler/fragments/helper.rb

@@ -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

test/compiler/fragments/test_foo.rb

@@ -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
 

test/compiler/fragments/test_functions.rb

@@ -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
 

test/compiler/fragments/test_hello.rb

@@ -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

test/compiler/fragments/test_putint.rb

@@ -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

test/compiler/fragments/test_recursive_fibo.rb

@@ -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

test/compiler/fragments/test_while_fibo.rb

@@ -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]

test/compiler/statements/helper.rb

@@ -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|

test/compiler/statements/test_assign.rb

@@ -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)

test/elf/test_hello.rb

@@ -3,7 +3,7 @@ require_relative "../helper"
 class HelloTest < MiniTest::Test
 
   def check
-    machine = Virtual.machine.boot
+    machine = Register.machine.boot
     Parfait::Space.object_space.get_class_by_name(:Integer).remove_instance_method :plus
     #TODO remove this hack: write proper aliases
     statements = machine.parse_and_compile @string_input

test/helper.rb

@@ -19,7 +19,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'test'))
 
 require 'salama'
 
-module Virtual
+module Register
   # Functions to generate parfait objects
   def self.new_word( string )
     string = string.to_s if string.is_a? Symbol

test/interpreter/test_add.rb

@@ -5,7 +5,7 @@ class AddTest < MiniTest::Test
   include Ticker
 
   def setup
-    machine = Virtual.machine.boot
+    machine = Register.machine.boot
     code  =   s(:class, :Object,
                 s(:derives, nil),
                   s(:statements,
@@ -21,7 +21,7 @@ class AddTest < MiniTest::Test
     Phisol::Compiler.compile( code  )
     machine.collect
     @interpreter = Interpreter::Interpreter.new
-    @interpreter.start Virtual.machine.init
+    @interpreter.start Register.machine.init
   end
 
   def test_branch
@@ -31,7 +31,7 @@ class AddTest < MiniTest::Test
   end
   def test_load
     assert_equal Register::LoadConstant ,  ticks(2).class
-    assert_equal Parfait::Space ,  Virtual.machine.objects[ @interpreter.get_register(:r2)].class
+    assert_equal Parfait::Space ,  Register.machine.objects[ @interpreter.get_register(:r2)].class
     assert_equal :r2,  @interpreter.instruction.array.symbol
   end
   def test_get

test/interpreter/test_if.rb

@@ -20,16 +20,16 @@ class Object
   end
 end
 HERE
-      machine = Virtual.machine.boot
+      machine = Register.machine.boot
       syntax  = Parser::Salama.new.parse_with_debug(@string_input)
       parts = Parser::Transform.new.apply(syntax)
       #puts parts.inspect
       Phisol::Compiler.compile( parts )
       machine.collect
-  #    statements = Virtual.machine.boot.parse_and_compile @string_input
-  #    Phisol::Compiler.compile( statements , Virtual.machine.space.get_main )
+  #    statements = Register.machine.boot.parse_and_compile @string_input
+  #    Phisol::Compiler.compile( statements , Register.machine.space.get_main )
       @interpreter = Interpreter::Interpreter.new
-      @interpreter.start Virtual.machine.init
+      @interpreter.start Register.machine.init
       #show_ticks # get output of what is
       ["Branch","LoadConstant","GetSlot","SetSlot","RegisterTransfer",
      "FunctionCall","SaveReturn","GetSlot","GetSlot","SetSlot",

test/interpreter/test_puti.rb

@@ -48,16 +48,16 @@ class Object
   end
 end
 HERE
-    machine = Virtual.machine.boot
+    machine = Register.machine.boot
     syntax  = Parser::Salama.new.parse_with_debug(@string_input)
     parts = Parser::Transform.new.apply(syntax)
     #puts parts.inspect
     Phisol::Compiler.compile( parts )
     machine.collect
-#    statements = Virtual.machine.boot.parse_and_compile @string_input
-#    Phisol::Compiler.compile( statements , Virtual.machine.space.get_main )
+#    statements = Register.machine.boot.parse_and_compile @string_input
+#    Phisol::Compiler.compile( statements , Register.machine.space.get_main )
     @interpreter = Interpreter::Interpreter.new
-    @interpreter.start Virtual.machine.init
+    @interpreter.start Register.machine.init
     #show_ticks # get output of what is
     ["Branch","LoadConstant","GetSlot","SetSlot","RegisterTransfer",
      "FunctionCall","SaveReturn","GetSlot","LoadConstant","SetSlot",

test/interpreter/test_puts.rb

@@ -4,7 +4,7 @@ class TestPuts < MiniTest::Test
   include AST::Sexp
   include Ticker
   def setup
-    machine = Virtual.machine.boot
+    machine = Register.machine.boot
     code =   s(:class, :Object,
                         s(:derives, nil),
                           s(:statements,
@@ -21,7 +21,7 @@ class TestPuts < MiniTest::Test
     Phisol::Compiler.compile( code )
     machine.collect
     @interpreter = Interpreter::Interpreter.new
-    @interpreter.start Virtual.machine.init
+    @interpreter.start Register.machine.init
   end
 
   def test_branch
@@ -31,7 +31,7 @@ class TestPuts < MiniTest::Test
   end
   def test_load
     assert_equal Register::LoadConstant ,  ticks(2).class
-    assert_equal Parfait::Space ,  Virtual.machine.objects[ @interpreter.get_register(:r2)].class
+    assert_equal Parfait::Space ,  Register.machine.objects[ @interpreter.get_register(:r2)].class
     assert_equal :r2,  @interpreter.instruction.array.symbol
   end
   def test_get
@@ -78,7 +78,7 @@ class TestPuts < MiniTest::Test
   def test_return
     done = ticks(24)
     assert_equal Register::FunctionReturn ,  done.class
-    assert @interpreter.block.is_a?(Virtual::Block)
+    assert @interpreter.block.is_a?(Register::Block)
     assert @interpreter.instruction.is_a?(Register::Instruction) , "not instruction #{@interpreter.instruction}"
   end
 

test/parfait/test_attributes.rb

@@ -3,7 +3,7 @@ require_relative "../helper"
 class TestAttributes < MiniTest::Test
 
   def setup
-    @mess = Virtual.machine.boot.space.first_message
+    @mess = Register.machine.boot.space.first_message
     @layout = @mess.get_layout
   end
 

test/parfait/test_dictionary.rb

@@ -1,7 +1,7 @@
 require_relative "../helper"
 
 class TestDictionary < MiniTest::Test
-  Virtual.machine.boot  #have to book, otherwise layouts etc not set
+  Register.machine.boot  #have to book, otherwise layouts etc not set
 
   def setup
     @lookup = ::Parfait::Dictionary.new

test/parfait/test_layout.rb

@@ -3,7 +3,7 @@ require_relative "../helper"
 class TestLayout < MiniTest::Test
 
   def setup
-    @mess = Virtual.machine.boot.space.first_message
+    @mess = Register.machine.boot.space.first_message
   end
 
   def test_message_layout
@@ -46,7 +46,7 @@ class TestLayout < MiniTest::Test
   end
 
   def test_class_layout
-    oc = Virtual.machine.boot.space.get_class_by_name( :Object )
+    oc = Register.machine.boot.space.get_class_by_name( :Object )
     assert_equal Parfait::Class , oc.class
     layout = oc.object_layout
     assert_equal Parfait::Layout , layout.class

test/parfait/test_list.rb

@@ -3,14 +3,14 @@ require_relative "../helper"
 class TestList < MiniTest::Test
 
   def setup
-    Virtual.machine.boot unless Virtual.machine.booted
+    Register.machine.boot unless Register.machine.booted
     @list = ::Parfait::List.new
   end
   def test_old_layout
-    assert_equal Parfait::Layout , Virtual.machine.space.classes.keys.get_layout.class
+    assert_equal Parfait::Layout , Register.machine.space.classes.keys.get_layout.class
   end
   def test_old_layout_push
-    list = Virtual.machine.space.classes.keys
+    list = Register.machine.space.classes.keys
     list.push(1)
     assert_equal Parfait::Layout , list.get_layout.class
   end
@@ -26,7 +26,7 @@ class TestList < MiniTest::Test
     assert_equal 1 , layout.variable_index(:layout)
   end
   def notest_layout_is_first_old
-    layout =  Virtual.machine.space.classes.keys.get_layout
+    layout =  Register.machine.space.classes.keys.get_layout
     assert_equal 1 , layout.variable_index(:layout)
   end
 

test/parfait/test_method.rb

@@ -3,8 +3,8 @@ require_relative "../helper"
 class TestMethod < MiniTest::Test
 
   def setup
-    obj = Virtual.machine.boot.space.get_class_by_name(:Object)
-    args = Virtual.new_list [ Parfait::Variable.new(:Integer , :bar )]
+    obj = Register.machine.boot.space.get_class_by_name(:Object)
+    args = Register.new_list [ Parfait::Variable.new(:Integer , :bar )]
     @method = ::Parfait::Method.new obj , :foo , args
   end
 

test/parfait/test_space.rb

@@ -3,7 +3,7 @@ require_relative "../helper"
 class TestSpace < MiniTest::Test
 
   def setup
-    @machine = Virtual.machine.boot
+    @machine = Register.machine.boot
   end
   def classes
     [:Kernel,:Word,:List,:Message,:Frame,:Layout,:Object,:Class,:Dictionary,:Method , :Integer]

test/parfait/test_word.rb

@@ -3,7 +3,7 @@ require_relative "../helper"
 class TestEmptyWord < MiniTest::Test
 
   def setup
-    Virtual.machine.boot unless Virtual.machine.booted
+    Register.machine.boot unless Register.machine.booted
     @word = ::Parfait::Word.new(0)
   end
   def test_word_create

test/register/test_compat.rb

@@ -4,19 +4,19 @@ require_relative "../helper"
 class TestCompat < MiniTest::Test
 
   def setup
-    Virtual.machine.boot unless Virtual.machine.booted
+    Register.machine.boot unless Register.machine.booted
   end
 
   def test_list_create_from_array
     array = [1,2,3]
-    list = Virtual.new_list(array)
+    list = Register.new_list(array)
     assert_equal array , list.to_a
   end
 
   def test_word_create_from_string
     string = "something"
-    word = Virtual.new_word(string)
-    assert_equal word , Virtual.new_word(string)
+    word = Register.new_word(string)
+    assert_equal word , Register.new_word(string)
     assert_equal string , word.to_string
   end
 end

test/register/test_positioning.rb

@@ -2,15 +2,15 @@ require_relative "../helper"
 
 class TestPositioning < MiniTest::Test
   def setup
-    Virtual.machine.boot unless Virtual.machine.booted
+    Register.machine.boot unless Register.machine.booted
   end
   def test_list1
-    list = Virtual.new_list([1])
+    list = Register.new_list([1])
     list.set_layout( Parfait::Layout.new Object)
     assert_equal 32 , list.word_length
   end
   def test_list5
-    list = Virtual.new_list([1,2,3,4,5])
+    list = Register.new_list([1,2,3,4,5])
     list.set_layout( Parfait::Layout.new Object)
     # TODO check why this is 64 and not 32
     assert_equal 32 , list.word_length

test/test_all.rb

@@ -4,6 +4,6 @@ require_relative "elf/test_all"
 
 require_relative "parfait/test_all"
 
-require_relative "virtual/test_all"
+require_relative "register/test_all"
 
 require_relative "interpreter/test_all"