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

fix putstring and puts 

using syscall regs
This commit is contained in:
Torsten 2020-03-16 17:32:24 +02:00
parent 17a7f29b0c
commit 3ce6ed5263
6 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/risc/register_value.rb
View File

@ -203,10 +203,6 @@ module Risc
end
end
# The register we use to store the current message object is :r0
def self.message_reg
RegisterValue.new :r0 , :Message
end
# a named version of the message register, called :message
def self.message_named_reg
RegisterValue.new :message , :Message

2
lib/risc/risc_collection.rb
View File

@ -39,7 +39,7 @@ module Risc
# and then translating all methods
def translate( platform_sym )
platform_sym = platform_sym.to_s.capitalize
platform = Risc::Platform.for(platform_sym)
platform = Platform.for(platform_sym)
assemblers = []
@method_compilers.each_compiler do |compiler|
compiler.translate_method( platform.translator , assemblers)

43
test/risc/interpreter/calling/test_puts.rb
View File

@ -14,16 +14,17 @@ module Risc
#show_main_ticks # get output of what is
check_main_chain [LoadConstant, SlotToReg, RegToSlot, LoadConstant, SlotToReg, #5
RegToSlot, LoadConstant, SlotToReg, RegToSlot, SlotToReg, #10
FunctionCall, LoadConstant, SlotToReg, LoadConstant, OperatorInstruction, #15
FunctionCall, LoadConstant, LoadConstant, SlotToReg, OperatorInstruction, #15
IsNotZero, SlotToReg, RegToSlot, RegToSlot, SlotToReg, #20
SlotToReg, Transfer, Syscall, Transfer, Transfer, #25
SlotToReg, RegToSlot, Branch, SlotToReg, RegToSlot, #30
Branch, SlotToReg, SlotToReg, RegToSlot, SlotToReg, #35
SlotToReg, SlotToReg, FunctionReturn, SlotToReg, RegToSlot, #40
Branch, SlotToReg, SlotToReg, RegToSlot, SlotToReg, #45
SlotToReg, Transfer, Transfer, Transfer, Syscall, #25
Transfer, Transfer, SlotToReg, Branch, RegToSlot, #30
SlotToReg, RegToSlot, Branch, SlotToReg, SlotToReg, #35
RegToSlot, SlotToReg, SlotToReg, FunctionReturn, SlotToReg, #40
RegToSlot, Branch, SlotToReg, SlotToReg, RegToSlot, #45
SlotToReg, SlotToReg, FunctionReturn, Transfer, SlotToReg, #50
SlotToReg, Syscall, NilClass,] #55
assert_equal "Hello again" , @interpreter.stdout
assert_equal Integer , get_return.class
assert_equal 11 , get_return #bytes written
end
def test_call
@ -32,27 +33,27 @@ module Risc
assert_equal :putstring , cal.method.name
end
def test_putstring_sys
done = main_ticks(23)
def test_pre_sys
done = main_ticks(24)
assert_equal Parfait::Word , @interpreter.get_register(:syscall_1).class
assert_equal "Hello again" , @interpreter.get_register(:syscall_1).to_string
assert_equal 11 , @interpreter.get_register(:syscall_2)
end
def test_sys
done = main_ticks(25)
assert_equal Syscall , done.class
assert_equal "Hello again" , @interpreter.stdout
assert_equal 11 , @interpreter.get_register(:r0)
assert_equal Parfait::Word , @interpreter.get_register(:r1).class
assert_equal "Hello again" , @interpreter.get_register(:r1).to_string
assert_equal 11 , @interpreter.get_register(:syscall_1)
end
def test_move_sys_return
sl = main_ticks(23)
assert_transfer(sl, :r0 ,:r3)
assert_equal 11 , @interpreter.get_register(:r3)
assert_transfer(26, :syscall_1 ,:integer_tmp)
assert_equal 11 , @interpreter.get_register(:integer_tmp)
end
def test_restore_message
sl = main_ticks(25)
assert_transfer(sl, :r8 ,:r0)
assert_equal Parfait::Message , @interpreter.get_register(:r0).class
end
def test_move_sys_return
sl = main_ticks(34)
assert_reg_to_slot( sl , :r1 ,:r2 , 5)
assert_transfer(27, :saved_message ,:message)
assert_equal Parfait::Message , @interpreter.get_register(:message).class
end
def test_return
done = main_ticks(48)

16
test/risc/interpreter/calling/test_set_byte.rb
View File

@ -5,7 +5,7 @@ module Risc
include Ticker
def setup
@preload = "Word.set"
@preload = "Word.set_byte"
@string_input = as_main("return 'Hello'.set_internal_byte(0,75)")
super
end
@ -15,17 +15,17 @@ module Risc
check_main_chain [LoadConstant, SlotToReg, RegToSlot, LoadConstant, SlotToReg, #5
RegToSlot, LoadConstant, SlotToReg, RegToSlot, LoadConstant, #10
SlotToReg, RegToSlot, LoadConstant, SlotToReg, RegToSlot, #15
SlotToReg, FunctionCall, SlotToReg, SlotToReg, RegToSlot, #20
SlotToReg, SlotToReg, SlotToReg, RegToByte, SlotToReg, #25
RegToSlot, Branch, SlotToReg, SlotToReg, RegToSlot, #30
SlotToReg, SlotToReg, SlotToReg, FunctionReturn, SlotToReg, #35
SlotToReg, FunctionCall, SlotToReg, RegToSlot, SlotToReg, #20
SlotToReg, SlotToReg, SlotToReg, SlotToReg, RegToByte, #25
SlotToReg, RegToSlot, Branch, SlotToReg, SlotToReg, #30
RegToSlot, SlotToReg, SlotToReg, FunctionReturn, SlotToReg, #35
RegToSlot, Branch, SlotToReg, SlotToReg, RegToSlot, #40
SlotToReg, SlotToReg, SlotToReg, FunctionReturn, Transfer, #45
SlotToReg, SlotToReg, Syscall, NilClass,] #50
SlotToReg, SlotToReg, FunctionReturn, Transfer, SlotToReg, #45
SlotToReg, Transfer, Syscall, NilClass,] #50
assert_equal "K".ord , get_return
end
def test_reg_to_byte
done = main_ticks(24)
done = main_ticks(25)
assert_equal RegToByte , done.class
assert_equal "K".ord , @interpreter.get_register(done.register)
end

2
test/risc/test_interpreter.rb
View File

@ -75,7 +75,7 @@ module Risc
end
def test_tick_26_exit
# 26.times { @interpreter.tick ;puts @interpreter.instruction.class}
ticks(27)
ticks(26)
assert_equal Syscall , @interpreter.instruction.class
assert_equal :exit , @interpreter.instruction.name
end

24
test/slot_machine/macro/test_putstring.rb
View File

@ -14,7 +14,7 @@ module SlotMachine
assert_equal Risc::MethodCompiler , @method.to_risc.class
end
def test_risc_length
assert_equal 42 , @method.to_risc.risc_instructions.length
assert_equal 44 , @method.to_risc.risc_instructions.length
end
def test_allocate
assert_allocate
@ -24,19 +24,21 @@ module SlotMachine
assert_reg_to_slot s + 1 , "id_factory_.next_object" , :message , 5
assert_slot_to_reg s + 2 ,:message , 2 , "message.receiver"
assert_slot_to_reg s + 3 ,"message.receiver" , 1 , "id_factory_.next_object"
assert_transfer s + 4 , :message , :saved_message
assert_syscall s + 5 , :putstring
assert_transfer s + 6 , :message , :integer_tmp
assert_transfer s + 7 , :saved_message , :message
assert_slot_to_reg s + 8 ,:message , 5 , "message.return_value"
assert_reg_to_slot s + 9 , :integer_tmp , "message.return_value" , 2
assert_transfer s + 4 , :"message.receiver" , :syscall_1
assert_transfer s + 5 , "id_factory_.next_object" , :syscall_2
assert_transfer s + 6 , :message , :saved_message
assert_syscall s + 7 , :putstring
assert_transfer s + 8 , :syscall_1 , :integer_tmp
assert_transfer s + 9 , :saved_message , :message
assert_slot_to_reg s + 10 ,:message , 5 , "message.return_value"
assert_reg_to_slot s + 11 , "message.return_value" , :message , 5
assert_branch s + 12 , "return_label"
assert_label s + 13 , "return_label"
assert_reg_to_slot s + 11 , :integer_tmp , "message.return_value" , 2
assert_slot_to_reg s + 12 ,:message , 5 , "message.return_value"
assert_reg_to_slot s + 13 , "message.return_value" , :message , 5
assert_branch s + 14 , "return_label"
assert_label s + 15 , "return_label"
end
def test_return
assert_return(34)
assert_return(36)
end
end
end