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

removes ArgNode which just served to make long names (unused)

Browse Source
This commit is contained in:
Torsten Ruger 2014-04-21 17:35:38 +03:00
parent fc3f5d5402
commit c87967c95d
7 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,12 +33,12 @@ class Asm::Arm::CodeGenerator
args.each { |arg| args.each { |arg|
if (arg.is_a?(Array)) if (arg.is_a?(Array))
if (arg[0] == :reg) if (arg[0] == :reg)
node.args << Asm::RegisterArgNode.new(arg[1]) node.args << Asm::RegisterNode.new(arg[1])
end end
elsif (arg.is_a?(Integer)) elsif (arg.is_a?(Integer))
node.args << Asm::NumLiteralArgNode.new(arg) node.args << Asm::NumLiteralNode.new(arg)
elsif (arg.is_a?(Symbol)) elsif (arg.is_a?(Symbol))
node.args << Asm::LabelRefArgNode.new(arg.to_s) node.args << Asm::LabelRefNode.new(arg.to_s)
elsif (arg.is_a?(Asm::Arm::GeneratorLabel) or arg.is_a?(Asm::Arm::GeneratorExternLabel)) elsif (arg.is_a?(Asm::Arm::GeneratorLabel) or arg.is_a?(Asm::Arm::GeneratorExternLabel))
node.args << arg node.args << arg
else else

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

@ -126,14 +126,14 @@ module Asm
builder.write io, as builder.write io, as
when :b, :bl when :b, :bl
arg = args[0] arg = args[0]
if (arg.is_a?(Asm::NumLiteralArgNode)) if (arg.is_a?(Asm::NumLiteralNode))
jmp_val = arg.value >> 2 jmp_val = arg.value >> 2
packed = [jmp_val].pack('l') packed = [jmp_val].pack('l')
# signed 32-bit, condense to 24-bit # signed 32-bit, condense to 24-bit
# TODO add check that the value fits into 24 bits # TODO add check that the value fits into 24 bits
io << packed[0,3] io << packed[0,3]
elsif (arg.is_a?(Asm::LabelObject) or arg.is_a?(Asm::LabelRefArgNode)) elsif (arg.is_a?(Asm::LabelObject) or arg.is_a?(Asm::LabelRefNode))
arg = @ast_asm.object_for_label(arg.label, self) if arg.is_a?(Asm::LabelRefArgNode) arg = @ast_asm.object_for_label(arg.label, self) if arg.is_a?(Asm::LabelRefNode)
as.add_relocation(io.tell, arg, Asm::Arm::R_ARM_PC24, RelocHandler) as.add_relocation(io.tell, arg, Asm::Arm::R_ARM_PC24, RelocHandler)
#write 0 "for now" and let relocation happen #write 0 "for now" and let relocation happen
io << "\x00\x00\x00" io << "\x00\x00\x00"
@ -147,7 +147,7 @@ module Asm
(COND_BITS[@cond] << 16+4+8) (COND_BITS[@cond] << 16+4+8)
when :swi when :swi
arg = args[0] arg = args[0]
if (arg.is_a?(Asm::NumLiteralArgNode)) if (arg.is_a?(Asm::NumLiteralNode))
packed = [arg.value].pack('L')[0,3] packed = [arg.value].pack('L')[0,3]
io << packed io << packed
io.write_uint8 0b1111 | (COND_BITS[@cond] << 4) 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 Arm
module InstructionTools module InstructionTools
def reg_ref(arg) def reg_ref(arg)
if (not arg.is_a?(Asm::RegisterArgNode)) if (not arg.is_a?(Asm::RegisterNode))
raise Asm::AssemblyError.new('argument must be a register', arg) raise Asm::AssemblyError.new('argument must be a register', arg)
end end

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

@ -33,10 +33,10 @@ module Asm
@pre_post_index = 0 @pre_post_index = 0
@w = 0 @w = 0
@operand = 0 @operand = 0
if (arg.is_a?(Asm::RegisterArgNode)) if (arg.is_a?(Asm::RegisterNode))
@rn = reg_ref(arg) @rn = reg_ref(arg)
if (false ) #argr.op and argr.right.is_a?(Asm::NumLiteralArgNode)) if (false ) #argr.op and argr.right.is_a?(Asm::NumLiteralNode))
# this if was buggy even before # this if was buggy even before
# but as mentioned here we'd have to implement the options # but as mentioned here we'd have to implement the options
@ -55,7 +55,7 @@ module Asm
else else
# raise Asm::AssemblyError.new(Asm::ERRSTR_INVALID_ARG, arg) # raise Asm::AssemblyError.new(Asm::ERRSTR_INVALID_ARG, arg)
end end
elsif (arg.is_a?(Asm::LabelRefArgNode) or arg.is_a?(Asm::NumLiteralArgNode)) elsif (arg.is_a?(Asm::LabelRefNode) or arg.is_a?(Asm::NumLiteralNode))
@pre_post_index = 1 @pre_post_index = 1
@rn = 15 # pc @rn = 15 # pc
@use_addrtable_reloc = true @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) (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) if (@use_addrtable_reloc)
# closest_addrtable = Asm::Arm.closest_addrtable(as) # closest_addrtable = Asm::Arm.closest_addrtable(as)
if (@addrtable_reloc_target.is_a?(Asm::LabelRefArgNode)) if (@addrtable_reloc_target.is_a?(Asm::LabelRefNode))
obj = ast_asm.object_for_label(@addrtable_reloc_target.label, inst) obj = ast_asm.object_for_label(@addrtable_reloc_target.label, inst)
ref_label = closest_addrtable.add_label(obj) ref_label = closest_addrtable.add_label(obj)
elsif (@addrtable_reloc_target.is_a?(Asm::NumLiteralArgNode)) elsif (@addrtable_reloc_target.is_a?(Asm::NumLiteralNode))
ref_label = closest_addrtable.add_const(@addrtable_reloc_target.value) ref_label = closest_addrtable.add_const(@addrtable_reloc_target.value)
end end
as.add_relocation io.tell, ref_label, Asm::Arm::R_ARM_PC12, as.add_relocation io.tell, ref_label, Asm::Arm::R_ARM_PC12,

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

@ -45,7 +45,7 @@ module Asm
# Build representation for source value # Build representation for source value
def build_operand(arg) def build_operand(arg)
if (arg.is_a?(Asm::NumLiteralArgNode)) if (arg.is_a?(Asm::NumLiteralNode))
if (arg.value.fits_u8?) if (arg.value.fits_u8?)
# no shifting needed # no shifting needed
@operand = arg.value @operand = arg.value
@ -56,7 +56,7 @@ module Asm
else else
raise Asm::AssemblyError.new(Asm::ERRSTR_NUMERIC_TOO_LARGE, arg) raise Asm::AssemblyError.new(Asm::ERRSTR_NUMERIC_TOO_LARGE, arg)
end end
elsif (arg.is_a?(Asm::RegisterArgNode)) elsif (arg.is_a?(Asm::RegisterNode))
@operand = reg_ref(arg) @operand = reg_ref(arg)
@i = 0 @i = 0
elsif (arg.is_a?(Asm::ShiftNode)) elsif (arg.is_a?(Asm::ShiftNode))
@ -70,12 +70,12 @@ module Asm
end end
arg1 = arg.value arg1 = arg.value
if (arg1.is_a?(Asm::NumLiteralArgNode)) if (arg1.is_a?(Asm::NumLiteralNode))
if (arg1.value >= 32) if (arg1.value >= 32)
raise Asm::AssemblyError.new('cannot shift by more than 31', arg1) raise Asm::AssemblyError.new('cannot shift by more than 31', arg1)
end end
shift_imm = arg1.value shift_imm = arg1.value
elsif (arg1.is_a?(Asm::RegisterArgNode)) elsif (arg1.is_a?(Asm::RegisterNode))
shift_op |= 0x1; shift_op |= 0x1;
shift_imm = reg_ref(arg1) << 1 shift_imm = reg_ref(arg1) << 1
elsif (arg.type == 'rrx') elsif (arg.type == 'rrx')

11
lib/asm/nodes.rb
View File

@ -7,9 +7,6 @@ module Asm
attr_accessor :opcode, :args attr_accessor :opcode, :args
end end
class ArgNode < Node
end
class ShiftNode < Node class ShiftNode < Node
attr_accessor :type, :value, :argument attr_accessor :type, :value, :argument
end end
@ -20,7 +17,7 @@ module Asm
alias_method :argument=, :left= alias_method :argument=, :left=
end end
class RegisterArgNode < ArgNode class RegisterNode < Node
attr_accessor :name attr_accessor :name
def initialize name def initialize name
@name = name @name = name
@ -29,21 +26,21 @@ module Asm
#maybe not used at all as code_gen::instruction raises if used. #maybe not used at all as code_gen::instruction raises if used.
# instead now using Arrays # instead now using Arrays
class RegisterListArgNode < ArgNode class RegisterListNode < Node
attr_accessor :registers attr_accessor :registers
def initialize regs def initialize regs
@registers = regs.collect{ |sym , reg| (sym == :reg) ? reg : "not a reg #{sym} , #{reg}" } @registers = regs.collect{ |sym , reg| (sym == :reg) ? reg : "not a reg #{sym} , #{reg}" }
end end
end end
class NumLiteralArgNode < ArgNode class NumLiteralNode < Node
attr_accessor :value attr_accessor :value
def initialize val def initialize val
@value = val @value = val
end end
end end
class LabelRefArgNode < ArgNode class LabelRefNode < Node
attr_accessor :label, :label_object attr_accessor :label, :label_object
def initialize label , object = nil def initialize label , object = nil
@label = label @label = label

14
unused/parser.rb
View File

@ -1,8 +1,8 @@
require_relative 'str_scanner' require_relative 'str_scanner'
require_relative 'nodes' require_relative 'nodes'
class NumEquivAddrArgNode < NumLiteralArgNode class NumEquivAddrNode < NumLiteralNode
end end
class LabelEquivAddrArgNode < LabelRefArgNode class LabelEquivAddrNode < LabelRefNode
end end
class ToplevelNode < Node class ToplevelNode < Node
attr_accessor :children attr_accessor :children
@ -154,7 +154,7 @@ module Asm
)) ))
def parse_register(s) def parse_register(s)
if (m = s.scan_str(REGISTER_REGEXP)) if (m = s.scan_str(REGISTER_REGEXP))
RegisterArgNode.new(s) { |n| RegisterNode.new(s) { |n|
n.name = m n.name = m
} }
end end
@ -162,7 +162,7 @@ module Asm
def parse_register_list(s) def parse_register_list(s)
if (m = s.scan(/\{/)) if (m = s.scan(/\{/))
node = RegisterListArgNode.new(s) do |n| node = RegisterListNode.new(s) do |n|
n.registers = [] n.registers = []
end end
loop do loop do
@ -185,7 +185,7 @@ module Asm
def parse_num_literal(s) def parse_num_literal(s)
if (m = s.scan(/(=?)#(-?(?:0x)?[0-9A-Fa-f]+)/)) if (m = s.scan(/(=?)#(-?(?:0x)?[0-9A-Fa-f]+)/))
(m[0] == '=' ? NumEquivAddrArgNode : NumLiteralArgNode).new(s) { |n| (m[0] == '=' ? NumEquivAddrNode : NumLiteralNode).new(s) { |n|
n.value = Integer(m[1]) n.value = Integer(m[1])
} }
end end
@ -193,7 +193,7 @@ module Asm
def parse_label_ref(s) def parse_label_ref(s)
if (m = s.scan(/(=?)(\/*\w+)/)) if (m = s.scan(/(=?)(\/*\w+)/))
(m[0] == '=' ? LabelEquivAddrArgNode : LabelRefArgNode).new(s) { |n| (m[0] == '=' ? LabelEquivAddrNode : LabelRefNode).new(s) { |n|
n.label = m[1] n.label = m[1]
} }
end end
@ -203,7 +203,7 @@ module Asm
if (m = s.scan(/\[/)) if (m = s.scan(/\[/))
arg = parse_arg(s) arg = parse_arg(s)
if (arg and s.scan(/\]/)) if (arg and s.scan(/\]/))
ReferenceArgNode.new(s) do |n| ReferenceNode.new(s) do |n|
n.argument = arg n.argument = arg
end end
end end