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

fix return sequence

Browse Source 
logic error of swapping messages too soon
simplify by folding message unto itself
thus only need one extra register for the address
This commit is contained in:
Torsten Ruger 2018-03-23 18:58:42 +02:00
parent a306c464b7
commit 6721153456
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/mom/instruction/return_sequence.rb
View File

@ -20,17 +20,15 @@ module Mom
# #
class ReturnSequence < Instruction class ReturnSequence < Instruction
def to_risc(compiler) def to_risc(compiler)
return_move = SlotLoad.new( [:message ,:return_value] , [:message , :next_message, :return_value],self) return_move = SlotLoad.new( [:message ,:return_value] , [:message , :caller, :return_value],self)
moves = return_move.to_risc(compiler) moves = return_move.to_risc(compiler)
caller_reg = compiler.use_reg(:int) return_address = compiler.use_reg(:int)
return_reg = compiler.use_reg(:int)
compiler.reset_regs compiler.reset_regs
caller_index = Risc.resolve_to_index(:message , :caller) caller_index = Risc.resolve_to_index(:message , :caller)
return_index = Risc.resolve_to_index(:message , :return_address) return_index = Risc.resolve_to_index(:message , :return_address)
moves << Risc::SlotToReg.new(self, Risc.message_reg , caller_index , caller_reg) moves << Risc::SlotToReg.new(self, Risc.message_reg, return_index , return_address)
moves << Risc::Transfer.new(self, caller_reg , Risc.message_reg) moves << Risc::SlotToReg.new(self, Risc.message_reg , caller_index , Risc.message_reg)
moves << Risc::SlotToReg.new(self, Risc.message_reg, return_index , return_reg) moves << Risc::FunctionReturn.new(self, return_address)
moves << Risc::FunctionReturn.new(self, return_reg)
end end
end end