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

fix an issue where instruction was in wrong code

Browse Source 
embarrassingly used instance variable where it should have been local
This commit is contained in:
Torsten Ruger
2018-05-25 19:16:13 +03:00
parent 6f0fad0957
commit c0cd1e0740
5 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/risc/position/instruction_position.rb
View File

@ -24,20 +24,22 @@ module Risc
end
def init(at, binary)
return if at == 0 and binary.nil?
raise "faux pas" if Position.get(instruction).at < Position.get(binary).at
return unless @instruction.next
@binary = binary
nekst = at + @instruction.byte_length
diff = nekst - Position.get(@binary).at
Position.log.debug "Diff: #{diff.to_s(16)} , next #{nekst.to_s(16)} , binary #{Position.get(@binary)}"
raise "Invalid position #{diff.to_s(16)} , next #{nekst.to_s(16)} #{self}" if diff < 8
next_binary = @binary
if( (diff % (@binary.padded_length - @instruction.byte_length)) == 0 )
@binary.extend_one unless @binary.next
@binary = @binary.next
raise "end of line " unless @binary
nekst = Position.get(@binary).at + Parfait::BinaryCode.offset
next_binary.extend_one unless next_binary.next
next_binary = next_binary.next
raise "end of line " unless next_binary
nekst = Position.get(next_binary).at + Parfait::BinaryCode.offset
Position.log.debug "Jump to: #{nekst.to_s(16)}"
end
Position.set(@instruction.next, nekst , @binary)
Position.set(@instruction.next, nekst , next_binary)
end
def reset_to(pos , binary)