integer was wrong padded§ length
or rather right (2 as should be and will be) but currently we use next AND value + type means 3, rounded 4 because we can’t swap types at compile time (as is planned at runtime, we use next OR value)
This commit is contained in:
@ -27,47 +27,31 @@ module Parfait
|
||||
def self.integer_index
|
||||
type_length
|
||||
end
|
||||
def data_length
|
||||
raise "called #{self}"
|
||||
end
|
||||
def self.type_length
|
||||
raise "called #{self}"
|
||||
end
|
||||
def padded_length
|
||||
self.class.memory_size * 4
|
||||
end
|
||||
def data_length
|
||||
self.class.memory_size
|
||||
end
|
||||
end
|
||||
|
||||
class Data4 < DataObject
|
||||
def self.memory_size
|
||||
4
|
||||
end
|
||||
def data_length
|
||||
4
|
||||
end
|
||||
def padded_length
|
||||
2 * 4
|
||||
end
|
||||
end
|
||||
|
||||
class Data8 < DataObject
|
||||
def self.memory_size
|
||||
8
|
||||
end
|
||||
def data_length
|
||||
8
|
||||
end
|
||||
def padded_length
|
||||
8 * 4
|
||||
end
|
||||
end
|
||||
class Data16 < DataObject
|
||||
def self.memory_size
|
||||
16
|
||||
end
|
||||
def data_length
|
||||
16
|
||||
end
|
||||
def padded_length
|
||||
16 * 4
|
||||
end
|
||||
end
|
||||
class Data32 < DataObject
|
||||
def self.memory_size
|
||||
|
@ -91,6 +91,8 @@ module Risc
|
||||
write_String obj
|
||||
when Parfait::BinaryCode
|
||||
write_BinaryCode obj
|
||||
when Parfait::Integer
|
||||
write_integer obj
|
||||
when Parfait::Data4
|
||||
write_data4 obj
|
||||
else
|
||||
@ -143,7 +145,17 @@ module Risc
|
||||
written
|
||||
end
|
||||
|
||||
def write_integer( int )
|
||||
write_ref_for( int.get_type )
|
||||
write_ref_for( int.next_integer )
|
||||
@stream.write_signed_int_32( int.value )
|
||||
@stream.write_signed_int_32( 0 )
|
||||
log.debug "Integer witten stream 0x#{@stream.length.to_s(16)}"
|
||||
end
|
||||
|
||||
def write_data4( code )
|
||||
write_ref_for( code.get_type )
|
||||
write_ref_for( code.get_type )
|
||||
write_ref_for( code.get_type )
|
||||
write_ref_for( code.get_type )
|
||||
log.debug "Data4 witten stream 0x#{@stream.length.to_s(16)}"
|
||||
@ -179,7 +191,7 @@ module Risc
|
||||
write_ref_for( string.get_type ) #ref
|
||||
@stream.write_signed_int_32( str.length ) #int
|
||||
@stream.write str
|
||||
pad_after(str.length + 8 ) # type , length
|
||||
pad_after(str.length + 8 ) # type , length
|
||||
log.debug "String (0x#{string.length.to_s(16)}) stream 0x#{@stream.length.to_s(16)}"
|
||||
end
|
||||
|
||||
|
Reference in New Issue
Block a user