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

don't pass machine around, its global

Browse Source
This commit is contained in:
Torsten Ruger 2015-11-12 20:02:44 +02:00
parent 6f0d6d831e
commit a5afca10f6
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/elf/object_writer.rb
View File

@ -7,9 +7,8 @@ require_relative 'string_table_section'
module Elf module Elf
class ObjectWriter class ObjectWriter
def initialize(machine , target = Elf::Constants::TARGET_ARM ) def initialize(target = Elf::Constants::TARGET_ARM )
@object = Elf::ObjectFile.new(target) @object = Elf::ObjectFile.new(target)
@object_machine = machine
sym_strtab = Elf::StringTableSection.new(".strtab") sym_strtab = Elf::StringTableSection.new(".strtab")
@object.add_section sym_strtab @object.add_section sym_strtab
@symbol_table = Elf::SymbolTableSection.new(".symtab", sym_strtab) @symbol_table = Elf::SymbolTableSection.new(".symtab", sym_strtab)
@ -18,11 +17,11 @@ module Elf
@text = Elf::TextSection.new(".text") @text = Elf::TextSection.new(".text")
@object.add_section @text @object.add_section @text
assembler = Register::Assembler.new(@object_machine) assembler = Register::Assembler.new(Register.machine)
set_text assembler.write_as_string set_text assembler.write_as_string
# for debug add labels to the block positions # for debug add labels to the block positions
@object_machine.space.classes.values.each do |clazz| Register.machine.space.classes.values.each do |clazz|
clazz.instance_methods.each do |f| clazz.instance_methods.each do |f|
f.instructions.each_label do |label| f.instructions.each_label do |label|
add_symbol "#{clazz.name}::#{f.name}:#{label.name}" , label.position add_symbol "#{clazz.name}::#{f.name}:#{label.name}" , label.position
@ -30,7 +29,7 @@ module Elf
end end
end end
@object_machine.objects.each do |id,slot| Register.machine.objects.each do |id,slot|
if( slot.respond_to? :sof_reference_name ) if( slot.respond_to? :sof_reference_name )
label = "#{slot.sof_reference_name}" label = "#{slot.sof_reference_name}"
else else

2
test/elf/test_hello.rb
View File

@ -7,7 +7,7 @@ class HelloTest < MiniTest::Test
machine.parse_and_compile @string_input machine.parse_and_compile @string_input
machine.collect machine.collect
machine.translate_arm machine.translate_arm
writer = Elf::ObjectWriter.new(machine) writer = Elf::ObjectWriter.new
writer.save "hello.o" writer.save "hello.o"
end end

2
test/parfait/test_all.rb
View File

@ -1,3 +1,3 @@
require_relative "test_layout"
require_relative "test_integer" require_relative "test_integer"
require_relative "test_layout"
require_relative "test_word" require_relative "test_word"