fix bug in slot_load and definition
move parfait helper for reuse
This commit is contained in:
@ -65,8 +65,8 @@ module Mom
|
||||
compiler.add_code const
|
||||
raise "Can't have slots into Constants" if slots.length > 0
|
||||
when Parfait::Object , Risc::Label
|
||||
const = Risc::SlotToReg.new( source , right ,index, right)
|
||||
compiler.add_code const Risc.load_constant(source, known_object , right)
|
||||
const = const = Risc.load_constant(source, known_object , right)
|
||||
compiler.add_code const
|
||||
if slots.length > 0
|
||||
# desctructively replace the existing value to be loaded if more slots
|
||||
compiler.add_code Risc.slot_to_reg( source , right ,slots[0], right)
|
||||
|
@ -39,7 +39,6 @@ module Mom
|
||||
end
|
||||
|
||||
def to_risc(compiler)
|
||||
#puts "RISC #{self}"
|
||||
const_reg = @right.to_register(compiler , original_source)
|
||||
left_slots = @left.slots
|
||||
case @left.known_object
|
||||
@ -48,7 +47,7 @@ module Mom
|
||||
when Parfait::CacheEntry
|
||||
left = compiler.use_reg( :CacheEntry )
|
||||
compiler.add_code Risc.load_constant(original_source, @left.known_object , left)
|
||||
compiler.add_code Risc.reg_to_slot(original_source, const.register , left, left_slots.first)
|
||||
compiler.add_code Risc.reg_to_slot(original_source, const_reg , left, left_slots.first)
|
||||
else
|
||||
raise "We have left #{@left.known_object}"
|
||||
end
|
||||
|
@ -21,10 +21,9 @@ module Risc
|
||||
@register = register
|
||||
@array = array
|
||||
@index = index
|
||||
# raise "index 0 " if index < 0
|
||||
raise "Not integer or reg #{index}" unless index.is_a?(Numeric) or RegisterValue.look_like_reg(index)
|
||||
raise "Not integer or reg index #{index}" unless index.is_a?(Numeric) or RegisterValue.look_like_reg(index)
|
||||
raise "Not register #{register}" unless RegisterValue.look_like_reg(register)
|
||||
raise "Not register #{array}" unless RegisterValue.look_like_reg(array)
|
||||
raise "Not slot/register #{array}" unless RegisterValue.look_like_reg(array)
|
||||
end
|
||||
attr_accessor :register , :array , :index
|
||||
|
||||
|
Reference in New Issue
Block a user