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

text writer working

Browse Source 
adjusted ordering as psoitioning, ie
methods in order of the assemblers of the linker
(not the object space)
This commit is contained in:
Torsten Ruger 2018-07-02 17:05:02 +03:00
parent 4b33d1c056
commit 6af651a886
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/risc/text_writer.rb
View File

@ -3,7 +3,7 @@ module Risc
# #
# Binary code is already created by the Machine (by translating risc to arm to binary) # Binary code is already created by the Machine (by translating risc to arm to binary)
# #
# This class serves to write all the objects of the machine (wich also contain the code) # This class serves to write all the objects of the linker (wich also contain the code)
# into one stream or binary text object. This is then written to an ELF text section. # into one stream or binary text object. This is then written to an ELF text section.
# #
# A word about positions: The c world has a thing called position independent code, and # A word about positions: The c world has a thing called position independent code, and
@ -16,17 +16,18 @@ module Risc
include Util::Logging include Util::Logging
log_level :info log_level :info
def initialize(machine) def initialize(linker)
@machine = machine @linker = linker
raise "may not me nil" if linker.nil?
end end
# objects must be written in same order as positioned by the machine, namely # objects must be written in same order as positioned by the linker, namely
# - intial jump # - intial jump
# - all objects # - all objects
# - all BinaryCode # - all BinaryCode
def write_as_string def write_as_string
@stream = StringIO.new @stream = StringIO.new
write_init(@machine.cpu_init) write_init(@linker.cpu_init)
write_debug write_debug
write_objects write_objects
write_code write_code
@ -35,7 +36,7 @@ module Risc
end end
def sorted_objects def sorted_objects
@machine.object_positions.keys.sort do |left , right| @linker.object_positions.keys.sort do |left , right|
Position.get(left).at <=> Position.get(right).at Position.get(left).at <=> Position.get(right).at
end end
end end
@ -58,11 +59,9 @@ module Risc
# Write the BinaryCode objects of all methods to stream. # Write the BinaryCode objects of all methods to stream.
# Really like any other object, it's just about the ordering # Really like any other object, it's just about the ordering
def write_code def write_code
Parfait.object_space.each_type do |type| @linker.assemblers.each do |asm|
type.each_method do |method| asm.method.each_binary do |code|
method.each_binary do |code| write_any(code)
write_any(code)
end
end end
end end
end end
@ -139,7 +138,7 @@ module Risc
def write_return_address( addr ) def write_return_address( addr )
write_ref_for( addr.get_type ) write_ref_for( addr.get_type )
write_ref_for( addr.next_integer ) write_ref_for( addr.next_integer )
write_ref_for( addr.value + @machine.platform.loaded_at ) write_ref_for( addr.value + @linker.platform.loaded_at )
write_ref_for( 0 ) write_ref_for( 0 )
log.debug "Integer witten stream 0x#{@stream.length.to_s(16)}" log.debug "Integer witten stream 0x#{@stream.length.to_s(16)}"
end end
@ -163,7 +162,7 @@ module Risc
# first jump, # first jump,
def write_init( cpu_init ) def write_init( cpu_init )
cpu_init.assemble(@stream) cpu_init.assemble(@stream)
@stream.write_unsigned_int_8(0) until @machine.platform.padding == stream_position @stream.write_unsigned_int_8(0) until @linker.platform.padding == stream_position
log.debug "Init witten stream 0x#{@stream.length.to_s(16)}" log.debug "Init witten stream 0x#{@stream.length.to_s(16)}"
end end
@ -209,7 +208,7 @@ module Risc
when Fixnum when Fixnum
@stream.write_signed_int_32(object) @stream.write_signed_int_32(object)
else else
@stream.write_signed_int_32(Position.get(object) + @machine.platform.loaded_at) @stream.write_signed_int_32(Position.get(object) + @linker.platform.loaded_at)
end end
end end