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

lift the nodes out of the parser

Browse Source
This commit is contained in:
Torsten Ruger
2014-04-16 12:03:39 +03:00
parent 1564f9b439
commit 69b0f7a0e3
8 changed files with 103 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/asm/arm/builder_a.rb
View File

@ -50,7 +50,7 @@ module Asm
# Build representation for source value
def build_operand(arg)
if (arg.is_a?(Asm::Parser::NumLiteralArgNode))
if (arg.is_a?(Asm::NumLiteralArgNode))
if (arg.value.fits_u8?)
# no shifting needed
@operand = arg.value
@ -61,10 +61,10 @@ module Asm
else
raise Asm::AssemblyError.new(Asm::ERRSTR_NUMERIC_TOO_LARGE, arg)
end
elsif (arg.is_a?(Asm::Parser::RegisterArgNode))
elsif (arg.is_a?(Asm::RegisterArgNode))
@operand = reg_ref(arg)
@i = 0
elsif (arg.is_a?(Asm::Parser::ShiftNode))
elsif (arg.is_a?(Asm::ShiftNode))
rm_ref = reg_ref(arg.argument)
@i = 0
shift_op = {'lsl' => 0b000, 'lsr' => 0b010, 'asr' => 0b100,
@ -75,12 +75,12 @@ module Asm
end
arg1 = arg.value
if (arg1.is_a?(Asm::Parser::NumLiteralArgNode))
if (arg1.is_a?(Asm::NumLiteralArgNode))
if (arg1.value >= 32)
raise Asm::AssemblyError.new('cannot shift by more than 31', arg1)
end
shift_imm = arg1.value
elsif (arg1.is_a?(Asm::Parser::RegisterArgNode))
elsif (arg1.is_a?(Asm::RegisterArgNode))
shift_op |= 0x1;
shift_imm = reg_ref(arg1) << 1
elsif (arg.type == 'rrx')

16
lib/asm/arm/builder_b.rb
View File

@ -31,13 +31,13 @@ module Asm
a
end
class MathReferenceArgNode < Asm::Parser::ReferenceArgNode
class MathReferenceArgNode < Asm::ReferenceArgNode
attr_accessor :op, :right
end
def simplify_reference(arg)
node = MathReferenceArgNode.new
if (arg.is_a?(Asm::Parser::MathNode))
if (arg.is_a?(Asm::MathNode))
node.argument = arg.left
node.op = arg.op
node.right = arg.right
@ -50,17 +50,17 @@ module Asm
# Build representation for target address
def build_operand(arg1)
if (arg1.is_a?(Asm::Parser::ReferenceArgNode))
if (arg1.is_a?(Asm::ReferenceArgNode))
argr = simplify_reference(arg1.argument)
arg = argr.argument
if (arg.is_a?(Asm::Parser::RegisterArgNode))
if (arg.is_a?(Asm::RegisterArgNode))
@i = 0
@pre_post_index = 1
@w = 0
@rn = reg_ref(arg)
@operand = 0
if (argr.op and argr.right.is_a?(Asm::Parser::NumLiteralArgNode))
if (argr.op and argr.right.is_a?(Asm::NumLiteralArgNode))
val = argr.right.value
if (val < 0)
@add_offset = 0
@ -78,7 +78,7 @@ module Asm
else
raise Asm::AssemblyError.new(Asm::ERRSTR_INVALID_ARG, arg)
end
elsif (arg1.is_a?(Asm::Parser::LabelEquivAddrArgNode) or arg1.is_a?(Asm::Parser::NumEquivAddrArgNode))
elsif (arg1.is_a?(Asm::LabelEquivAddrArgNode) or arg1.is_a?(Asm::NumEquivAddrArgNode))
@i = 0
@pre_post_index = 1
@w = 0
@ -99,10 +99,10 @@ module Asm
(inst_class << 12+4+4+1+1+1+1+1+1) | (cond << 12+4+4+1+1+1+1+1+1+2)
if (@use_addrtable_reloc)
closest_addrtable = Asm::Arm.closest_addrtable(as)
if (@addrtable_reloc_target.is_a?(Asm::Parser::LabelEquivAddrArgNode))
if (@addrtable_reloc_target.is_a?(Asm::LabelEquivAddrArgNode))
obj = ast_asm.object_for_label(@addrtable_reloc_target.label, inst)
ref_label = closest_addrtable.add_label(obj)
elsif (@addrtable_reloc_target.is_a?(Asm::Parser::NumEquivAddrArgNode))
elsif (@addrtable_reloc_target.is_a?(Asm::NumEquivAddrArgNode))
ref_label = closest_addrtable.add_const(@addrtable_reloc_target.value)
end
as.add_relocation io.tell, ref_label, Asm::Arm::R_ARM_PC12,

2
lib/asm/arm/builder_d.rb
View File

@ -29,7 +29,7 @@ module Asm
# Build representation for source value
def build_operand(arg)
if (arg.is_a?(Asm::Parser::RegisterListArgNode))
if (arg.is_a?(Asm::RegisterListArgNode))
@operand = 0
arg.registers.each do |reg_node|
reg = reg_ref(reg_node)

8
lib/asm/arm/instruction.rb
View File

@ -121,14 +121,14 @@ module Asm
a.write io, as
when :b, :bl
arg = args[0]
if (arg.is_a?(Asm::Parser::NumLiteralArgNode))
if (arg.is_a?(Asm::NumLiteralArgNode))
jmp_val = arg.value >> 2
packed = [jmp_val].pack('l')
# signed 32-bit, condense to 24-bit
# TODO add check that the value fits into 24 bits
io << packed[0,3]
elsif (arg.is_a?(Asm::LabelObject) or arg.is_a?(Asm::Parser::LabelRefArgNode))
arg = @ast_asm.object_for_label(arg.label, self) if arg.is_a?(Asm::Parser::LabelRefArgNode)
elsif (arg.is_a?(Asm::LabelObject) or arg.is_a?(Asm::LabelRefArgNode))
arg = @ast_asm.object_for_label(arg.label, self) if arg.is_a?(Asm::LabelRefArgNode)
as.add_relocation(io.tell, arg, Asm::Arm::R_ARM_PC24, RelocHandler)
io << "\x00\x00\x00"
end
@ -139,7 +139,7 @@ module Asm
(COND_BITS[@cond] << 16+4+8)
when :swi
arg = args[0]
if (arg.is_a?(Asm::Parser::NumLiteralArgNode))
if (arg.is_a?(Asm::NumLiteralArgNode))
packed = [arg.value].pack('L')[0,3]
io << packed
io.write_uint8 0b1111 | (COND_BITS[@cond] << 4)

2
lib/asm/arm/instruction_tools.rb
View File

@ -2,7 +2,7 @@ module Asm
module Arm
module Asm::Arm::InstructionTools
def reg_ref(arg)
if (not arg.is_a?(Asm::Parser::RegisterArgNode))
if (not arg.is_a?(Asm::RegisterArgNode))
raise Asm::AssemblyError.new('argument must be a register', arg)
end