register access fixes

since the constants moved
This commit is contained in:
Torsten Ruger
2015-05-24 15:31:30 +03:00
parent 6f0ae51dc5
commit b58bba3fc4
3 changed files with 20 additions and 20 deletions

View File

@ -1,28 +1,28 @@
Virtual::MessageSlot.class_eval do
def reg
Register::RegisterReference.new(Virtual::Message::MESSAGE_REG )
Register::RegisterReference.message_reg
end
end
Virtual::FrameSlot.class_eval do
def reg
Register::RegisterReference.new(Virtual::Message::FRAME_REG )
Register::RegisterReference.frame_reg
end
end
Virtual::SelfSlot.class_eval do
def reg
Register::RegisterReference.new(Virtual::Message::SELF_REG )
Register::RegisterReference.self_reg
end
end
Virtual::NewMessageSlot.class_eval do
def reg
Register::RegisterReference.new(Virtual::Message::NEW_MESSAGE_REG )
Register::RegisterReference.new_message_reg
end
end
module Register
# This implements setting of the various slot variables the vm defines.
# This implements setting of the various slot variables the vm defines.
# Basic mem moves, but have to shuffle the type nibbles (TODO!)
class SetImplementation
def run block
block.codes.dup.each do |code|
@ -30,9 +30,9 @@ module Register
# resolve the register and offset that we need to move to
to = code.to.reg
# need a temporay place because of indexed load/store
tmp = RegisterReference.new(Virtual::Message::TMP_REG)
tmp = RegisterReference.tmp_reg
# for constants we have to "move" the constants value
if( code.from.is_a? Virtual::Constant)
if( code.from.is_a? Parfait::Value)
move1 = LoadConstant.new( tmp , code.from )
else # while otherwise we "load"
move1 = GetSlot.new( tmp , code.from.reg , code.from.index )

View File

@ -6,7 +6,9 @@ module Register
# In other words a simple level of indirection, or change from value to reference sematics.
class RegisterReference
attr_accessor :symbol
def initialize r
if( r.is_a? Fixnum)
r = "r#{r}".to_sym
@ -39,13 +41,13 @@ module Register
def self.self_reg
new SELF_REG
end
def self.messsage_reg
def self.message_reg
new MESSAGE_REG
end
def self.frame_reg
new FRAME_REG
end
def self.new_messsage_reg
def self.new_message_reg
new NEW_MESSAGE_REG
end
def self.tmp_reg