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

remove some of the node mess

Browse Source
This commit is contained in:
Torsten Ruger
2014-04-21 17:34:24 +03:00
parent ff38bde44e
commit fc3f5d5402
4 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/asm/arm/memory_access_builder.rb
View File

@ -55,7 +55,7 @@ module Asm
else
# raise Asm::AssemblyError.new(Asm::ERRSTR_INVALID_ARG, arg)
end
elsif (arg.is_a?(Asm::LabelRefArgNode) or arg.is_a?(Asm::NumEquivAddrArgNode))
elsif (arg.is_a?(Asm::LabelRefArgNode) or arg.is_a?(Asm::NumLiteralArgNode))
@pre_post_index = 1
@rn = 15 # pc
@use_addrtable_reloc = true
@ -78,10 +78,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::LabelEquivAddrArgNode))
if (@addrtable_reloc_target.is_a?(Asm::LabelRefArgNode))
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::NumEquivAddrArgNode))
elsif (@addrtable_reloc_target.is_a?(Asm::NumLiteralArgNode))
ref_label = closest_addrtable.add_const(@addrtable_reloc_target.value)
end
as.add_relocation io.tell, ref_label, Asm::Arm::R_ARM_PC12,