rename RiscTransfer to Transfer

lib/arm/translator.rb

@@ -31,7 +31,7 @@ module Arm
       ArmMachine.str( :lr ,  code.register , arm_index(code) )
     end
 
-    def translate_RiscTransfer( code )
+    def translate_Transfer( code )
       # Risc machine convention is from => to
       # But arm has the receiver/result as the first
       ArmMachine.mov( code.to , code.from)

lib/risc/instructions/reg_to_slot.rb

@@ -7,7 +7,7 @@ module Risc
   # This is because that is what cpu's can do. In programming terms this would be accessing
   #  an element in an array, in the case of RegToSlot setting the register in the array.
 
-  # btw: to move data between registers, use RiscTransfer
+  # btw: to move data between registers, use Transfer
 
   class RegToSlot < Setter
 

lib/risc/instructions/slot_to_reg.rb

@@ -7,7 +7,7 @@ module Risc
   # This is because that is what cpu's can do. In programming terms this would be accessing
   #  an element in an array, in the case of SlotToReg setting the value in the array.
 
-  # btw: to move data between registers, use RiscTransfer
+  # btw: to move data between registers, use Transfer
 
   class SlotToReg < Getter
 

lib/risc/instructions/transfer.rb

@@ -1,6 +1,6 @@
 module Risc
 
-  # transfer the constents of one register to another.
+  # Transfer the constents of one register to another.
   # possibly called move in some cpus
 
   # There are other instructions to move data from / to memory, namely SlotToReg and RegToSlot
@@ -10,13 +10,13 @@ module Risc
   # Also it is used for moving temorary data
   #
 
-  class RiscTransfer < Instruction
+  class Transfer < Instruction
     # initialize with from and to registers.
     # First argument from
     # second argument to
     #
     # Note: this may be reversed from some assembler notations (also arm)
-    def initialize source , from , to
+    def initialize( source , from , to )
       super(source)
       @from = from
       @to = to
@@ -26,10 +26,10 @@ module Risc
     attr_reader :from, :to
 
     def to_s
-      "RiscTransfer: #{from} -> #{to}"
+      "Transfer: #{from} -> #{to}"
     end
   end
   def self.transfer( source , from , to)
-    RiscTransfer.new( source , from , to)
+    Transfer.new( source , from , to)
   end
 end

lib/risc/interpreter.rb

@@ -184,7 +184,7 @@ module Risc
       true
     end
 
-    def execute_RiscTransfer
+    def execute_Transfer
       value = get_register @instruction.from
       set_register @instruction.to , value
       true

stash/fragments/test_hello.rb

@@ -22,11 +22,11 @@ module Rubyx
              LoadConstant, RegToSlot, FunctionCall, Label, LoadConstant,
              SlotToReg, RegToSlot, SlotToReg, LoadConstant, RegToSlot,
              LoadConstant, RegToSlot, LoadConstant, SlotToReg, RegToSlot,
-             LoadConstant, RegToSlot, RiscTransfer, FunctionCall, Label,
+             LoadConstant, RegToSlot, Transfer, FunctionCall, Label,
              LoadConstant, SlotToReg, RegToSlot, SlotToReg, SlotToReg,
-             RiscTransfer, Syscall, RiscTransfer, RiscTransfer, RegToSlot,
-             Label, FunctionReturn, RiscTransfer, SlotToReg, SlotToReg,
-             Label, FunctionReturn, RiscTransfer, Syscall, NilClass]
+             Transfer, Syscall, Transfer, Transfer, RegToSlot,
+             Label, FunctionReturn, Transfer, SlotToReg, SlotToReg,
+             Label, FunctionReturn, Transfer, Syscall, NilClass]
     end
 
     def test_overflow

test/risc/interpreter/test_add.rb

@@ -21,7 +21,7 @@ HERE
       check_chain [Branch, Label, LoadConstant, SlotToReg, RegToSlot,
              LoadConstant, RegToSlot, FunctionCall, Label, LoadConstant,
              LoadConstant, OperatorInstruction, RegToSlot, LoadConstant, SlotToReg,
-             RegToSlot, Label, FunctionReturn, RiscTransfer, Syscall,
+             RegToSlot, Label, FunctionReturn, Transfer, Syscall,
              NilClass]
     end
 
@@ -32,7 +32,7 @@ HERE
     end
     def pest_transfer
       transfer = ticks 19
-      assert_equal RiscTransfer ,  transfer.class
+      assert_equal Transfer ,  transfer.class
       assert_equal @interpreter.get_register(transfer.to) , @interpreter.get_register(transfer.from)
     end
 

test/risc/interpreter/test_byte_to_reg.rb

@@ -26,11 +26,11 @@ HERE
              LoadConstant, RegToSlot, LoadConstant, RegToSlot, LoadConstant,
              SlotToReg, RegToSlot, LoadConstant, SlotToReg, RegToSlot,
              LoadConstant, SlotToReg, RegToSlot, LoadConstant, RegToSlot,
-             RiscTransfer, FunctionCall, Label, LoadConstant, SlotToReg,
+             Transfer, FunctionCall, Label, LoadConstant, SlotToReg,
              RegToSlot, SlotToReg, SlotToReg, SlotToReg, SlotToReg,
-             SlotToReg, RegToByte, Label, FunctionReturn, RiscTransfer,
+             SlotToReg, RegToByte, Label, FunctionReturn, Transfer,
              SlotToReg, SlotToReg, LoadConstant, SlotToReg, RegToSlot,
-             Label, FunctionReturn, RiscTransfer, Syscall, NilClass]
+             Label, FunctionReturn, Transfer, Syscall, NilClass]
     end
 
     def pest_branch

test/risc/interpreter/test_called_if.rb

@@ -38,17 +38,17 @@ HERE
              LoadConstant, RegToSlot, FunctionCall, Label, SlotToReg,
              SlotToReg, RegToSlot, LoadConstant, RegToSlot, LoadConstant,
              SlotToReg, RegToSlot, LoadConstant, SlotToReg, RegToSlot,
-             LoadConstant, RegToSlot, RiscTransfer, FunctionCall, Label,
+             LoadConstant, RegToSlot, Transfer, FunctionCall, Label,
              LoadConstant, SlotToReg, RegToSlot, SlotToReg, SlotToReg,
              LoadConstant, OperatorInstruction, IsZero, SlotToReg, LoadConstant,
              RegToSlot, LoadConstant, RegToSlot, LoadConstant, SlotToReg,
-             RegToSlot, LoadConstant, RegToSlot, RiscTransfer, FunctionCall,
+             RegToSlot, LoadConstant, RegToSlot, Transfer, FunctionCall,
              Label, LoadConstant, SlotToReg, RegToSlot, SlotToReg,
-             SlotToReg, RiscTransfer, Syscall, RiscTransfer, RiscTransfer,
-             RegToSlot, Label, FunctionReturn, RiscTransfer, SlotToReg,
+             SlotToReg, Transfer, Syscall, Transfer, Transfer,
+             RegToSlot, Label, FunctionReturn, Transfer, SlotToReg,
              SlotToReg, Branch, Label, Label, FunctionReturn,
-             RiscTransfer, SlotToReg, SlotToReg, LoadConstant, SlotToReg,
-             RegToSlot, Label, FunctionReturn, RiscTransfer, Syscall,
+             Transfer, SlotToReg, SlotToReg, LoadConstant, SlotToReg,
+             RegToSlot, Label, FunctionReturn, Transfer, Syscall,
              NilClass]
     end
   end

test/risc/interpreter/test_change.rb

@@ -40,7 +40,7 @@ module Risc
       check_chain [Branch, Label, LoadConstant, SlotToReg, RegToSlot,
              LoadConstant, RegToSlot, FunctionCall, Label, LoadConstant,
              LoadConstant, OperatorInstruction, RegToSlot, LoadConstant, SlotToReg,
-             RegToSlot, Label, FunctionReturn, RiscTransfer, Syscall,
+             RegToSlot, Label, FunctionReturn, Transfer, Syscall,
              NilClass]
     end
 

test/risc/interpreter/test_mult.rb

@@ -22,7 +22,7 @@ HERE
       check_chain [Branch, Label, LoadConstant, SlotToReg, RegToSlot,
              LoadConstant, RegToSlot, FunctionCall, Label, LoadConstant,
              LoadConstant, OperatorInstruction, RegToSlot, LoadConstant, SlotToReg,
-             RegToSlot, Label, FunctionReturn, RiscTransfer, Syscall,
+             RegToSlot, Label, FunctionReturn, Transfer, Syscall,
              NilClass]
        check_return 0
     end

test/risc/interpreter/test_plus.rb

@@ -21,7 +21,7 @@ HERE
       check_chain [Branch, Label, LoadConstant, SlotToReg, RegToSlot,
              LoadConstant, RegToSlot, FunctionCall, Label, LoadConstant,
              LoadConstant, OperatorInstruction, RegToSlot, LoadConstant, SlotToReg,
-             RegToSlot, Label, FunctionReturn, RiscTransfer, Syscall,
+             RegToSlot, Label, FunctionReturn, Transfer, Syscall,
              NilClass]
       check_return 0
     end

test/risc/interpreter/test_puts.rb

@@ -21,12 +21,12 @@ HERE
       check_chain [Branch, Label, LoadConstant, SlotToReg, RegToSlot,
              LoadConstant, RegToSlot, FunctionCall, Label, SlotToReg,
              LoadConstant, RegToSlot, LoadConstant, RegToSlot, LoadConstant,
-             SlotToReg, RegToSlot, LoadConstant, RegToSlot, RiscTransfer,
+             SlotToReg, RegToSlot, LoadConstant, RegToSlot, Transfer,
              FunctionCall, Label, LoadConstant, SlotToReg, RegToSlot,
-             SlotToReg, SlotToReg, RiscTransfer, Syscall, RiscTransfer,
-             RiscTransfer, RegToSlot, Label, FunctionReturn, RiscTransfer,
+             SlotToReg, SlotToReg, Transfer, Syscall, Transfer,
+             Transfer, RegToSlot, Label, FunctionReturn, Transfer,
              SlotToReg, SlotToReg, LoadConstant, SlotToReg, RegToSlot,
-             Label, FunctionReturn, RiscTransfer, Syscall, NilClass]
+             Label, FunctionReturn, Transfer, Syscall, NilClass]
     end
 
     def pest_branch

test/risc/interpreter/test_reg_to_byte.rb

@@ -25,11 +25,11 @@ HERE
              LoadConstant, RegToSlot, FunctionCall, Label, SlotToReg,
              LoadConstant, RegToSlot, LoadConstant, RegToSlot, LoadConstant,
              SlotToReg, RegToSlot, LoadConstant, SlotToReg, RegToSlot,
-             LoadConstant, RegToSlot, RiscTransfer, FunctionCall, Label,
+             LoadConstant, RegToSlot, Transfer, FunctionCall, Label,
              LoadConstant, SlotToReg, RegToSlot, SlotToReg, SlotToReg,
              SlotToReg, ByteToReg, RegToSlot, Label, FunctionReturn,
-             RiscTransfer, SlotToReg, SlotToReg, LoadConstant, SlotToReg,
-             RegToSlot, Label, FunctionReturn, RiscTransfer, Syscall,
+             Transfer, SlotToReg, SlotToReg, LoadConstant, SlotToReg,
+             RegToSlot, Label, FunctionReturn, Transfer, Syscall,
              NilClass]
     end
 

test/risc/interpreter/test_simple_if.rb

@@ -30,12 +30,12 @@ HERE
              LoadConstant, RegToSlot, FunctionCall, Label, LoadConstant,
              LoadConstant, OperatorInstruction, IsZero, SlotToReg, LoadConstant,
              RegToSlot, LoadConstant, RegToSlot, LoadConstant, SlotToReg,
-             RegToSlot, LoadConstant, RegToSlot, RiscTransfer, FunctionCall,
+             RegToSlot, LoadConstant, RegToSlot, Transfer, FunctionCall,
              Label, LoadConstant, SlotToReg, RegToSlot, SlotToReg,
-             SlotToReg, RiscTransfer, Syscall, RiscTransfer, RiscTransfer,
-             RegToSlot, Label, FunctionReturn, RiscTransfer, SlotToReg,
+             SlotToReg, Transfer, Syscall, Transfer, Transfer,
+             RegToSlot, Label, FunctionReturn, Transfer, SlotToReg,
              SlotToReg, Branch, Label, LoadConstant, SlotToReg,
-             RegToSlot, Label, FunctionReturn, RiscTransfer, Syscall,
+             RegToSlot, Label, FunctionReturn, Transfer, Syscall,
              NilClass]
     end
   end