a spirited effort to make assembly repeatable
This commit is contained in:
@@ -23,13 +23,18 @@ module Arm
|
||||
4
|
||||
end
|
||||
|
||||
def build
|
||||
def assemble(io)
|
||||
# don't overwrite instance variables, to make assembly repeatable
|
||||
rn = @rn
|
||||
operand = @operand
|
||||
immediate = @immediate
|
||||
|
||||
right = @from
|
||||
if right.is_a?(Vm::StringConstant)
|
||||
# do pc relative addressing with the difference to the instuction
|
||||
# 8 is for the funny pipeline adjustment (ie oc pointing to fetch and not execute)
|
||||
right = Vm::IntegerConstant.new( right.position - self.position - 8 )
|
||||
@rn = :pc
|
||||
rn = :pc
|
||||
end
|
||||
if( right.is_a? Fixnum )
|
||||
right = Vm::IntegerConstant.new( right )
|
||||
@@ -37,34 +42,30 @@ module Arm
|
||||
if (right.is_a?(Vm::IntegerConstant))
|
||||
if (right.integer.fits_u8?)
|
||||
# no shifting needed
|
||||
@operand = right.integer
|
||||
@immediate = 1
|
||||
operand = right.integer
|
||||
immediate = 1
|
||||
elsif (op_with_rot = calculate_u8_with_rr(right))
|
||||
@operand = op_with_rot
|
||||
@immediate = 1
|
||||
operand = op_with_rot
|
||||
immediate = 1
|
||||
raise "hmm"
|
||||
else
|
||||
raise "cannot fit numeric literal argument in operand #{right.inspect}"
|
||||
end
|
||||
elsif (right.is_a?(Symbol) or right.is_a?(Vm::Integer))
|
||||
@operand = reg_code(right) #integer means the register the integer is in (otherwise constant)
|
||||
@immediate = 0 # ie not immediate is register
|
||||
operand = reg_code(right) #integer means the register the integer is in (otherwise constant)
|
||||
immediate = 0 # ie not immediate is register
|
||||
else
|
||||
raise "invalid operand argument #{right.inspect} , #{inspect}"
|
||||
end
|
||||
end
|
||||
|
||||
def assemble(io)
|
||||
build
|
||||
op = shift_handling
|
||||
instuction_class = 0b00 # OPC_DATA_PROCESSING
|
||||
val = shift(@operand , 0)
|
||||
val = shift(operand , 0)
|
||||
val |= shift(op , 0) # any barral action, is already shifted
|
||||
val |= shift(reg_code(@to) , 12)
|
||||
val |= shift(reg_code(@rn) , 12+4)
|
||||
val |= shift(reg_code(rn) , 12+4)
|
||||
val |= shift(@attributes[:update_status] , 12+4+4)#20
|
||||
val |= shift(op_bit_code , 12+4+4 +1)
|
||||
val |= shift(@immediate , 12+4+4 +1+4)
|
||||
val |= shift(immediate , 12+4+4 +1+4)
|
||||
val |= shift(instuction_class , 12+4+4 +1+4+1)
|
||||
val |= shift(cond_bit_code , 12+4+4 +1+4+1+2)
|
||||
io.write_uint32 val
|
||||
|
Reference in New Issue
Block a user