Remove MethodReturn instruction

and pass
and fix all tests
move towards removing all vm instructions

test/compiler/fragments/test_class.rb

@@ -11,7 +11,7 @@ class Bar
   end
 end
 HERE
-    @expect =  [ [Virtual::MethodEnter] ,[Virtual::MethodReturn]]
+    @expect =  [ [Virtual::MethodEnter] ,[RegisterTransfer,GetSlot,FunctionReturn]]
     check
   end
 

test/compiler/fragments/test_foo.rb

@@ -17,7 +17,7 @@ class Object
 end
 HERE
     @expect =  [ [Virtual::MethodEnter,Register::GetSlot,Virtual::Set,Virtual::Set,
-                  Virtual::Set,Virtual::Set,Virtual::MethodCall] ,[Virtual::MethodReturn] ]
+                  Virtual::Set,Virtual::Set,Virtual::MethodCall] ,[RegisterTransfer,GetSlot,FunctionReturn] ]
     check
   end
 

test/compiler/fragments/test_functions.rb

@@ -36,7 +36,7 @@ class Object
 end
 HERE
   @expect =  [[Virtual::MethodEnter,Register::GetSlot,Virtual::Set,Virtual::Set,Virtual::MethodCall] ,
-          [Virtual::MethodReturn]]
+          [RegisterTransfer,GetSlot,FunctionReturn]]
   check
 
   end

test/compiler/fragments/test_hello.rb

@@ -12,7 +12,7 @@ class Object
 end
 HERE
     @expect = [[Virtual::MethodEnter,Virtual::Set,Register::GetSlot,Virtual::Set,
-                Virtual::Set,Virtual::MethodCall] ,[Virtual::MethodReturn]]
+                Virtual::Set,Virtual::MethodCall] ,[RegisterTransfer,GetSlot,FunctionReturn]]
     check
   end
 end

test/compiler/fragments/test_if.rb

@@ -18,7 +18,7 @@ end
 HERE
   @expect =  [[Virtual::MethodEnter,Virtual::Set,Virtual::Set,Register::GetSlot,
                 Register::GetSlot,Register::OperatorInstruction,Register::IsZeroBranch] ,
-                [Virtual::Set,Register::AlwaysBranch] ,[Virtual::Set] ,[] ,[Virtual::MethodReturn] ]
+                [Virtual::Set,Register::AlwaysBranch] ,[Virtual::Set] ,[] ,[RegisterTransfer,GetSlot,FunctionReturn] ]
   check
   end
 
@@ -30,7 +30,7 @@ class Object
   end
 end
 HERE
-  @expect =  [[Virtual::MethodEnter,Virtual::Set] , [Virtual::MethodReturn]]
+  @expect =  [[Virtual::MethodEnter,Virtual::Set] , [RegisterTransfer,GetSlot,FunctionReturn]]
   check
   end
 
@@ -52,7 +52,7 @@ class Object
 end
 HERE
     @expect =  [ [Virtual::MethodEnter,Register::GetSlot,Virtual::Set,Virtual::Set,
-                  Virtual::Set,Virtual::Set,Virtual::MethodCall] ,[Virtual::MethodReturn] ]
+                  Virtual::Set,Virtual::Set,Virtual::MethodCall] ,[RegisterTransfer,GetSlot,FunctionReturn] ]
   check
   end
 end

test/compiler/fragments/test_putint.rb

@@ -17,7 +17,7 @@ class Object
 end
 HERE
     @expect =  [ [Virtual::MethodEnter,Virtual::Set,Register::GetSlot,Virtual::Set,
-                  Virtual::Set,Virtual::MethodCall] ,[Virtual::MethodReturn] ]
+                  Virtual::Set,Virtual::MethodCall] ,[RegisterTransfer,GetSlot,FunctionReturn] ]
     check
   end
 end

test/compiler/fragments/test_recursive_fibo.rb

@@ -28,7 +28,7 @@ class Object
 end
 HERE
   @expect =  [[Virtual::MethodEnter,Register::GetSlot,Virtual::Set,Virtual::Set,
-            Virtual::Set,Virtual::Set,Virtual::MethodCall] , [Virtual::MethodReturn]]
+            Virtual::Set,Virtual::Set,Virtual::MethodCall] , [RegisterTransfer,GetSlot,FunctionReturn]]
   check
   end
 end

test/compiler/fragments/test_while_fibo.rb

@@ -25,7 +25,7 @@ class Object
 end
 HERE
   @expect =  [ [Virtual::MethodEnter,Register::GetSlot,Virtual::Set,Virtual::Set,
-                Virtual::Set,Virtual::Set,Virtual::MethodCall] ,[Virtual::MethodReturn] ]
+                Virtual::Set,Virtual::Set,Virtual::MethodCall] ,[RegisterTransfer,GetSlot,FunctionReturn] ]
     check
   end
 

test/compiler/statements/test_assign.rb

@@ -17,7 +17,7 @@ class Object
   end
 end
 HERE
-  @expect =  [[Virtual::MethodEnter,LoadConstant,SetSlot] , [Virtual::MethodReturn]]
+  @expect =  [[Virtual::MethodEnter,LoadConstant,SetSlot] , [RegisterTransfer,GetSlot,FunctionReturn]]
   check
   end
 
@@ -29,7 +29,7 @@ class Object
   end
 end
 HERE
-  @expect =  [[Virtual::MethodEnter,LoadConstant,GetSlot,SetSlot] , [Virtual::MethodReturn]]
+  @expect =  [[Virtual::MethodEnter,LoadConstant,GetSlot,SetSlot] , [RegisterTransfer,GetSlot,FunctionReturn]]
   check
   end
 
@@ -42,7 +42,7 @@ end
 end
 HERE
     @expect = [[Virtual::MethodEnter,LoadConstant,LoadConstant,
-                OperatorInstruction,GetSlot,SetSlot],[Virtual::MethodReturn]]
+                OperatorInstruction,GetSlot,SetSlot],[RegisterTransfer,GetSlot,FunctionReturn]]
     check
   end
 
@@ -55,7 +55,7 @@ class Object
   end
 end
 HERE
-  @expect =  [[Virtual::MethodEnter,LoadConstant,GetSlot,SetSlot] , [Virtual::MethodReturn]]
+  @expect =  [[Virtual::MethodEnter,LoadConstant,GetSlot,SetSlot] , [RegisterTransfer,GetSlot,FunctionReturn]]
   check
   end
 
@@ -67,7 +67,7 @@ class Object
   end
 end
 HERE
-    @expect =  [[Virtual::MethodEnter,LoadConstant, GetSlot,SetSlot] , [Virtual::MethodReturn]]
+    @expect =  [[Virtual::MethodEnter,LoadConstant, GetSlot,SetSlot] , [RegisterTransfer,GetSlot,FunctionReturn]]
   check
   end
 
@@ -80,7 +80,7 @@ class Object
 end
 HERE
   @expect =  [[Virtual::MethodEnter,GetSlot,GetSlot,SetSlot, LoadConstant,SetSlot,
-                  Virtual::MethodCall,GetSlot,GetSlot,SetSlot] , [Virtual::MethodReturn]]
+                  Virtual::MethodCall,GetSlot,GetSlot,SetSlot] , [RegisterTransfer,GetSlot,FunctionReturn]]
   check
   end
 end

test/compiler/statements/test_call.rb

@@ -19,7 +19,7 @@ end
 HERE
     @expect =  [[Virtual::MethodEnter,GetSlot,LoadConstant,
                   SetSlot,LoadConstant,SetSlot,Virtual::MethodCall,GetSlot] ,
-                  [Virtual::MethodReturn]]
+                  [RegisterTransfer,GetSlot,FunctionReturn]]
     check
   end
 
@@ -39,7 +39,7 @@ end
 HERE
     @expect =  [[Virtual::MethodEnter,GetSlot,LoadConstant,
                   SetSlot,LoadConstant,SetSlot,Virtual::MethodCall,GetSlot] ,
-                  [Virtual::MethodReturn]]
+                  [RegisterTransfer,GetSlot,FunctionReturn]]
     check
   end
 
@@ -59,7 +59,7 @@ end
 HERE
     @expect =  [ [Virtual::MethodEnter,LoadConstant,GetSlot,SetSlot,GetSlot,
                   GetSlot,GetSlot,SetSlot,LoadConstant,SetSlot,Virtual::MethodCall,
-                  GetSlot] ,[Virtual::MethodReturn] ]
+                  GetSlot] ,[RegisterTransfer,GetSlot,FunctionReturn] ]
   check
   end
 
@@ -79,7 +79,7 @@ end
 HERE
     @expect =  [ [Virtual::MethodEnter,GetSlot,GetSlot,GetSlot,SetSlot,
                   LoadConstant,SetSlot,Virtual::MethodCall,
-                  GetSlot] ,[Virtual::MethodReturn] ]
+                  GetSlot] ,[RegisterTransfer,GetSlot,FunctionReturn] ]
   check
   end
 
@@ -96,7 +96,7 @@ end
 HERE
     @expect = [ [Virtual::MethodEnter , GetSlot,GetSlot,SetSlot,LoadConstant,SetSlot,LoadConstant,
                  SetSlot,Virtual::MethodCall,GetSlot],
-                [Virtual::MethodReturn]]
+                [RegisterTransfer,GetSlot,FunctionReturn]]
     check
   end
 

test/compiler/statements/test_if.rb

@@ -19,7 +19,7 @@ HERE
   @expect =  [[Virtual::MethodEnter,LoadConstant,LoadConstant,
                 OperatorInstruction,IsZeroBranch] ,
                 [LoadConstant,AlwaysBranch] ,[LoadConstant]  ,[] ,
-                [Virtual::MethodReturn]]
+                [RegisterTransfer,GetSlot,FunctionReturn]]
   check
   end
 
@@ -37,7 +37,7 @@ HERE
   @expect =  [[Virtual::MethodEnter,LoadConstant,LoadConstant,
                 OperatorInstruction,IsZeroBranch] ,
                 [AlwaysBranch] ,[LoadConstant]  ,[] ,
-                [Virtual::MethodReturn]]
+                [RegisterTransfer,GetSlot,FunctionReturn]]
   check
   end
 
@@ -56,7 +56,7 @@ end
 HERE
     @expect =  [ [Virtual::MethodEnter,GetSlot,SetSlot,LoadConstant,
                   SetSlot,LoadConstant,SetSlot,Virtual::MethodCall,
-                  GetSlot] ,[Virtual::MethodReturn] ]
+                  GetSlot] ,[RegisterTransfer,GetSlot,FunctionReturn] ]
   check
   end
 end

test/compiler/statements/test_return.rb

@@ -13,7 +13,7 @@ class Object
   end
 end
 HERE
-  @expect =  [[Virtual::MethodEnter,LoadConstant] , [Virtual::MethodReturn]]
+  @expect =  [[Virtual::MethodEnter,LoadConstant] , [RegisterTransfer,GetSlot,FunctionReturn]]
   check
   end
 
@@ -26,7 +26,7 @@ class Object
   end
 end
 HERE
-  @expect =  [[Virtual::MethodEnter,GetSlot,GetSlot] , [Virtual::MethodReturn]]
+  @expect =  [[Virtual::MethodEnter,GetSlot,GetSlot] , [RegisterTransfer,GetSlot,FunctionReturn]]
   check
   end
 
@@ -39,7 +39,8 @@ class Object
   end
 end
 HERE
-    @expect =  [[Virtual::MethodEnter,LoadConstant,GetSlot,SetSlot,GetSlot,GetSlot] , [Virtual::MethodReturn]]
+    @expect =  [[Virtual::MethodEnter,LoadConstant,GetSlot,SetSlot,GetSlot,GetSlot] ,
+                [RegisterTransfer,GetSlot,FunctionReturn]]
   check
   end
 
@@ -52,7 +53,7 @@ class Object
   end
 end
 HERE
-  @expect =  [[Virtual::MethodEnter,GetSlot,GetSlot] , [Virtual::MethodReturn]]
+  @expect =  [[Virtual::MethodEnter,GetSlot,GetSlot] , [RegisterTransfer,GetSlot,FunctionReturn]]
   check
   end
 
@@ -65,7 +66,7 @@ class Object
 end
 HERE
   @expect =  [[Virtual::MethodEnter,GetSlot,GetSlot,SetSlot, LoadConstant,
-                SetSlot,Virtual::MethodCall,GetSlot] , [Virtual::MethodReturn]]
+                SetSlot,Virtual::MethodCall,GetSlot] , [RegisterTransfer,GetSlot,FunctionReturn]]
   check
   end
 end

test/compiler/statements/test_while.rb

@@ -16,7 +16,7 @@ class Object
 end
 HERE
       @expect = [[Virtual::MethodEnter],[LoadConstant,IsZeroBranch,LoadConstant,AlwaysBranch],
-                  [],[Virtual::MethodReturn]]
+                  [],[RegisterTransfer,GetSlot,FunctionReturn]]
       check
     end
 
@@ -33,7 +33,7 @@ end
 HERE
       @expect = [[Virtual::MethodEnter,LoadConstant,GetSlot,SetSlot],[GetSlot,GetSlot,LoadConstant,OperatorInstruction,
                   IsZeroBranch,GetSlot,GetSlot,LoadConstant,OperatorInstruction,GetSlot,SetSlot,AlwaysBranch],
-                  [],[Virtual::MethodReturn]]
+                  [],[RegisterTransfer,GetSlot,FunctionReturn]]
       check
     end
 
@@ -54,7 +54,7 @@ HERE
                  [GetSlot,GetSlot,LoadConstant,OperatorInstruction,IsZeroBranch,GetSlot,
                    GetSlot,LoadConstant,OperatorInstruction,GetSlot,SetSlot,GetSlot,
                    GetSlot,AlwaysBranch] ,
-                   [],[Virtual::MethodReturn]]
+                   [],[RegisterTransfer,GetSlot,FunctionReturn]]
       check
     end
   end