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

small assembler fix

Browse Source
This commit is contained in:
Torsten Ruger 2018-03-25 20:02:51 +03:00
parent 279fdcc1e2
commit 865a116f47
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/risc/assembler.rb
View File

@ -38,7 +38,7 @@ module Risc
objekt.create_binary if objekt.is_a? Parfait::TypedMethod objekt.create_binary if objekt.is_a? Parfait::TypedMethod
binary = objekt.binary binary = objekt.binary
Positioned.set_position(binary,at) Positioned.set_position(binary,at)
objekt.risc_instructions.set_position( at + 12) # BinaryCode header objekt.cpu_instructions.set_position( at + 12) # BinaryCode header
len = 4 * 14 len = 4 * 14
at += binary.padded_length at += binary.padded_length
nekst = binary.next nekst = binary.next

3
test/risc/test_assembler.rb
View File

@ -14,10 +14,9 @@ module Risc
@assembler = Assembler.new(@machine , Collector.collect_space) @assembler = Assembler.new(@machine , Collector.collect_space)
assert @machine.translate_arm assert @machine.translate_arm
end end
def test_write_fails def test_write_fails
@assembler = Assembler.new(@machine , {}) @assembler = Assembler.new(@machine , {})
assert_raises{ @assembler.assemble} #must translate first assert_raises{ @assembler.write_as_string} #must translate first
end end
def test_assemble_no_objects def test_assemble_no_objects
@assembler = Assembler.new(@machine , {}) @assembler = Assembler.new(@machine , {})