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

remove MethodEnter Instructions

Browse Source 
only resolved to SaveReturn anyway
also Halt instruction wasn’t used, gone
passes changed to start at register
This commit is contained in:
Torsten Ruger
2015-10-18 17:39:35 +03:00
parent 8bf1337043
commit fa4949fc80
20 changed files with 35 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

6
test/compiler/fragments/test_if.rb
View File

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

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

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

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

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

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

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

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

@ -17,7 +17,7 @@ class Object
end
end
HERE
@expect = [[Virtual::MethodEnter,LoadConstant,SetSlot] , [RegisterTransfer,GetSlot,FunctionReturn]]
@expect = [[SaveReturn,LoadConstant,SetSlot] , [RegisterTransfer,GetSlot,FunctionReturn]]
check
end
@ -29,7 +29,7 @@ class Object
end
end
HERE
@expect = [[Virtual::MethodEnter,LoadConstant,GetSlot,SetSlot] , [RegisterTransfer,GetSlot,FunctionReturn]]
@expect = [[SaveReturn,LoadConstant,GetSlot,SetSlot] , [RegisterTransfer,GetSlot,FunctionReturn]]
check
end
@ -41,7 +41,7 @@ int main()
end
end
HERE
@expect = [[Virtual::MethodEnter,LoadConstant,LoadConstant,
@expect = [[SaveReturn,LoadConstant,LoadConstant,
OperatorInstruction,GetSlot,SetSlot],[RegisterTransfer,GetSlot,FunctionReturn]]
check
end
@ -55,7 +55,7 @@ class Object
end
end
HERE
@expect = [[Virtual::MethodEnter,LoadConstant,GetSlot,SetSlot] , [RegisterTransfer,GetSlot,FunctionReturn]]
@expect = [[SaveReturn,LoadConstant,GetSlot,SetSlot] , [RegisterTransfer,GetSlot,FunctionReturn]]
check
end
@ -67,7 +67,7 @@ class Object
end
end
HERE
@expect = [[Virtual::MethodEnter,LoadConstant, GetSlot,SetSlot] , [RegisterTransfer,GetSlot,FunctionReturn]]
@expect = [[SaveReturn,LoadConstant, GetSlot,SetSlot] , [RegisterTransfer,GetSlot,FunctionReturn]]
check
end
@ -79,7 +79,7 @@ class Object
end
end
HERE
@expect = [[Virtual::MethodEnter,GetSlot,GetSlot,SetSlot, LoadConstant,SetSlot,
@expect = [[SaveReturn,GetSlot,GetSlot,SetSlot, LoadConstant,SetSlot,
Virtual::MethodCall,GetSlot,GetSlot,SetSlot] , [RegisterTransfer,GetSlot,FunctionReturn]]
check
end

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

@ -17,7 +17,7 @@ class Object
end
end
HERE
@expect = [[Virtual::MethodEnter,GetSlot,LoadConstant,
@expect = [[SaveReturn,GetSlot,LoadConstant,
SetSlot,LoadConstant,SetSlot,Virtual::MethodCall,GetSlot] ,
[RegisterTransfer,GetSlot,FunctionReturn]]
check
@ -37,7 +37,7 @@ class Object
end
end
HERE
@expect = [[Virtual::MethodEnter,GetSlot,LoadConstant,
@expect = [[SaveReturn,GetSlot,LoadConstant,
SetSlot,LoadConstant,SetSlot,Virtual::MethodCall,GetSlot] ,
[RegisterTransfer,GetSlot,FunctionReturn]]
check
@ -57,7 +57,7 @@ class Object
end
end
HERE
@expect = [ [Virtual::MethodEnter,LoadConstant,GetSlot,SetSlot,GetSlot,
@expect = [ [SaveReturn,LoadConstant,GetSlot,SetSlot,GetSlot,
GetSlot,GetSlot,SetSlot,LoadConstant,SetSlot,Virtual::MethodCall,
GetSlot] ,[RegisterTransfer,GetSlot,FunctionReturn] ]
check
@ -77,7 +77,7 @@ class Object
end
end
HERE
@expect = [ [Virtual::MethodEnter,GetSlot,GetSlot,GetSlot,SetSlot,
@expect = [ [SaveReturn,GetSlot,GetSlot,GetSlot,SetSlot,
LoadConstant,SetSlot,Virtual::MethodCall,
GetSlot] ,[RegisterTransfer,GetSlot,FunctionReturn] ]
check
@ -94,7 +94,7 @@ int main()
end
end
HERE
@expect = [ [Virtual::MethodEnter , GetSlot,GetSlot,SetSlot,LoadConstant,SetSlot,LoadConstant,
@expect = [ [SaveReturn , GetSlot,GetSlot,SetSlot,LoadConstant,SetSlot,LoadConstant,
SetSlot,Virtual::MethodCall,GetSlot],
[RegisterTransfer,GetSlot,FunctionReturn]]
check

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

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

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

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

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

@ -15,7 +15,7 @@ class Object
end
end
HERE
@expect = [[Virtual::MethodEnter],[LoadConstant,IsZeroBranch,LoadConstant,AlwaysBranch],
@expect = [[SaveReturn],[LoadConstant,IsZeroBranch,LoadConstant,AlwaysBranch],
[],[RegisterTransfer,GetSlot,FunctionReturn]]
check
end
@ -31,7 +31,7 @@ class Object
end
end
HERE
@expect = [[Virtual::MethodEnter,LoadConstant,GetSlot,SetSlot],[GetSlot,GetSlot,LoadConstant,OperatorInstruction,
@expect = [[SaveReturn,LoadConstant,GetSlot,SetSlot],[GetSlot,GetSlot,LoadConstant,OperatorInstruction,
IsZeroBranch,GetSlot,GetSlot,LoadConstant,OperatorInstruction,GetSlot,SetSlot,AlwaysBranch],
[],[RegisterTransfer,GetSlot,FunctionReturn]]
check
@ -50,7 +50,7 @@ class Object
end
end
HERE
@expect = [[Virtual::MethodEnter,LoadConstant,GetSlot,SetSlot],
@expect = [[SaveReturn,LoadConstant,GetSlot,SetSlot],
[GetSlot,GetSlot,LoadConstant,OperatorInstruction,IsZeroBranch,GetSlot,
GetSlot,LoadConstant,OperatorInstruction,GetSlot,SetSlot,GetSlot,
GetSlot,AlwaysBranch] ,