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

fix arm indexes

Browse Source 
needs rethought
fixed for static use, but what about dynamic
This commit is contained in:
Torsten Ruger 2015-11-15 00:35:12 +02:00
parent cc9b515752
commit b30cf21bbd
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/arm/translator.rb
View File

@ -15,18 +15,27 @@ module Arm
nil nil
end end
# arm indexes are
# in bytes, so *4
# 0 based , so -1
# if an instruction is passed in we ge the index with inex function
def arm_index index
index = index.index if index.is_a?(Register::Instruction)
raise "index error 0" if index == 0
(index - 1) * 4
end
# Arm stores the return address in a register (not on the stack) # Arm stores the return address in a register (not on the stack)
# The register is called link , or lr for short . # The register is called link , or lr for short .
# Maybe because it provides the "link" back to the caller # Maybe because it provides the "link" back to the caller
# the vm defines a register for the location, so we store it there. # the vm defines a register for the location, so we store it there.
def translate_SaveReturn code def translate_SaveReturn code
ArmMachine.str( :lr , code.register , 4 * code.index ) ArmMachine.str( :lr , code.register , arm_index(code) )
end end
def translate_GetSlot code def translate_GetSlot code
# times 4 because arm works in bytes, but vm in words # times 4 because arm works in bytes, but vm in words
if(code.index.is_a? Numeric) if(code.index.is_a? Numeric)
ArmMachine.ldr( code.register , code.array , 4 * code.index ) ArmMachine.ldr( code.register , code.array , arm_index(code) )
else else
ArmMachine.ldr( code.register , code.array , code.index ) ArmMachine.ldr( code.register , code.array , code.index )
end end
@ -41,18 +50,18 @@ module Arm
def translate_SetSlot code def translate_SetSlot code
# times 4 because arm works in bytes, but vm in words # times 4 because arm works in bytes, but vm in words
if(code.index.is_a? Numeric) if(code.index.is_a? Numeric)
ArmMachine.str( code.register , code.array , 4 * code.index ) ArmMachine.str( code.register , code.array , arm_index(code) )
else else
ArmMachine.str( code.register , code.array , code.index ) ArmMachine.str( code.register , code.array , code.index )
end end
end end
def translate_FunctionCall code def translate_FunctionCall code
ArmMachine.call( code.method ) ArmMachine.b( code.method.instructions )
end end
def translate_FunctionReturn code def translate_FunctionReturn code
ArmMachine.ldr( :pc , code.register , 4 * code.index ) ArmMachine.ldr( :pc , code.register , arm_index(code) )
end end
def translate_LoadConstant code def translate_LoadConstant code
@ -120,7 +129,7 @@ module Arm
end end
def putstring int_code def putstring int_code
codes = ArmMachine.ldr( :r1 , Register.message_reg, 4 * Register.resolve_index(:message , :receiver)) codes = ArmMachine.ldr( :r1 , Register.message_reg, 4 * Register.resolve_index(:message , :receiver) - 4)
codes.append ArmMachine.add( :r1 , :r1 , 8 ) codes.append ArmMachine.add( :r1 , :r1 , 8 )
codes.append ArmMachine.mov( :r0 , 1 ) codes.append ArmMachine.mov( :r0 , 1 )
codes.append ArmMachine.mov( :r2 , 12 ) # String length, obvious TODO codes.append ArmMachine.mov( :r2 , 12 ) # String length, obvious TODO