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

fix slot constant access

Browse Source
This commit is contained in:
Torsten Ruger 2015-06-21 17:22:51 +03:00
parent cdf17a73b2
commit 3fe35e34ec
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/register/passes/call_implementation.rb
View File

@ -1,6 +1,6 @@
module Register module Register
# Defines the method call, ie # Defines the method call, ie
# - move the new_message to message # - move the new_message to message
# - unroll self and # - unroll self and
# - register call # - register call
@ -16,7 +16,7 @@ module Register
# move the current new_message to message # move the current new_message to message
new_codes << RegisterTransfer.new( slot::NEW_MESSAGE_REGISTER , slot::MESSAGE_REGISTER ) new_codes << RegisterTransfer.new( slot::NEW_MESSAGE_REGISTER , slot::MESSAGE_REGISTER )
# "roll out" self into its register # "roll out" self into its register
new_codes << GetSlot.new( slot::SELF_REGISTER ,slot::MESSAGE_REGISTER , slot::MESSAGE_SELF ) new_codes << GetSlot.new( slot::SELF_REGISTER ,slot::MESSAGE_REGISTER , Virtual::MESSAGE_SELF )
# do the register call # do the register call
new_codes << FunctionCall.new( code.method ) new_codes << FunctionCall.new( code.method )
block.replace(code , new_codes ) block.replace(code , new_codes )

10
lib/register/passes/return_implementation.rb
View File

@ -1,19 +1,19 @@
module Register module Register
class ReturnImplementation class ReturnImplementation
def run block def run block
slot = Virtual::Slot
block.codes.dup.each do |code| block.codes.dup.each do |code|
next unless code.is_a? Virtual::MethodReturn next unless code.is_a? Virtual::MethodReturn
new_codes = [] new_codes = []
slot = Virtual::Slot
# move the current message to new_message # move the current message to new_message
new_codes << RegisterTransfer.new( slot::MESSAGE_REGISTER , slot::NEW_MESSAGE_REGISTER ) new_codes << RegisterTransfer.new( slot::MESSAGE_REGISTER , slot::NEW_MESSAGE_REGISTER )
# and restore the message from saved value in new_message # and restore the message from saved value in new_message
new_codes << GetSlot.new( slot::MESSAGE_REGISTER , slot::NEW_MESSAGE_REGISTER , slot::MESSAGE_CALLER ) new_codes << GetSlot.new( slot::MESSAGE_REGISTER , slot::NEW_MESSAGE_REGISTER , Virtual::MESSAGE_CALLER )
# "roll out" self and frame into their registers # "roll out" self and frame into their registers
new_codes << GetSlot.new( slot::SELF_REGISTER ,slot::MESSAGE_REGISTER , slot::MESSAGE_SELF ) new_codes << GetSlot.new( slot::SELF_REGISTER ,slot::MESSAGE_REGISTER , Virtual::MESSAGE_SELF )
new_codes << GetSlot.new( slot::FRAME_REGISTER ,slot::MESSAGE_REGISTER , slot::MESSAGE_FRAME ) new_codes << GetSlot.new( slot::FRAME_REGISTER ,slot::MESSAGE_REGISTER , Virtual::MESSAGE_FRAME )
#load the return address into pc, affecting return. (other cpus have commands for this, but not arm) #load the return address into pc, affecting return. (other cpus have commands for this, but not arm)
new_codes << FunctionReturn.new( slot::MESSAGE_REGISTER , slot::MESSAGE_RETURN_ADDRESS ) new_codes << FunctionReturn.new( slot::MESSAGE_REGISTER , Virtual::MESSAGE_RETURN_ADDRESS )
block.replace(code , new_codes ) block.replace(code , new_codes )
end end
end end

2
lib/virtual.rb
View File

@ -16,7 +16,7 @@ require "virtual/passes/collector"
require "virtual/passes/send_implementation" require "virtual/passes/send_implementation"
require "virtual/passes/get_implementation" require "virtual/passes/get_implementation"
require "virtual/passes/enter_implementation" require "virtual/passes/enter_implementation"
require "virtual/passes/frame_implementation" require "virtual/passes/set_optimisation"
Sof::Volotile.add(Parfait::Object , [:memory]) Sof::Volotile.add(Parfait::Object , [:memory])
Sof::Volotile.add(Parfait::Method , [:memory]) Sof::Volotile.add(Parfait::Method , [:memory])

2
lib/virtual/passes/enter_implementation.rb
View File

@ -7,7 +7,7 @@ module Virtual
new_codes = [] new_codes = []
# save return register and create a new frame # save return register and create a new frame
# lr is link register, ie where arm stores the return address when call is issued # lr is link register, ie where arm stores the return address when call is issued
new_codes << Register::SaveReturn.new( Virtual::Slot::MESSAGE_REGISTER , Virtual::Slot::MESSAGE_RETURN_ADDRESS ) new_codes << Register::SaveReturn.new( Virtual::Slot::MESSAGE_REGISTER , Virtual::MESSAGE_RETURN_ADDRESS )
new_codes << Virtual::NewFrame.new new_codes << Virtual::NewFrame.new
block.replace(code , new_codes ) block.replace(code , new_codes )
end end