From 95c7e443424e9b49bb8202096f52e69951e10eb5 Mon Sep 17 00:00:00 2001 From: Torsten Ruger Date: Wed, 17 Sep 2014 12:11:34 +0300 Subject: [PATCH] at least it assembles again --- lib/elf/object_writer.rb | 2 +- lib/register/assembler.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/elf/object_writer.rb b/lib/elf/object_writer.rb index 0ee3ce1b..dc00ad9b 100644 --- a/lib/elf/object_writer.rb +++ b/lib/elf/object_writer.rb @@ -31,7 +31,7 @@ module Elf end end assembler.objects.values.each do |slot| - add_symbol "#{slot.objekt.class.name}::#{slot.position.to_s(16)}" , slot.position + add_symbol "#{slot.class.name}::#{slot.position.to_s(16)}" , slot.position end end attr_reader :text diff --git a/lib/register/assembler.rb b/lib/register/assembler.rb index 405460b6..b5d0ec0b 100644 --- a/lib/register/assembler.rb +++ b/lib/register/assembler.rb @@ -81,6 +81,7 @@ module Register @stream.write_uint32( type ) write_ref_for(object.layout[:names] ) variables.each do |var| + raise object.class.name unless var write_ref_for(var) end pad_after( variables.length * 4 ) @@ -100,7 +101,7 @@ module Register def assemble_Hash hash # so here we can be sure to have _identical_ keys/values arrays - assemble_self( hash , [ hash.layout[:keys] , hash.layout[:values] ] ) + assemble_self( hash , [ hash.keys , hash.values ] ) end def assemble_BootSpace(space)