rips 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf8c8bebaebfc51d045b029332f2cd2e061a88bf
-  data.tar.gz: 308c2b211e7feb112d7bbe80e3532771004efbf1
+  metadata.gz: 2e4896a53632a2c27fb558be1aff1d7d8091771b
+  data.tar.gz: 7024219596467dca132f8fb4c2dfe283e32d4a7e
 SHA512:
-  metadata.gz: efa9aa5de99297bee011ab544cf5d19d7759750141f022fa14c73a3d89b799fe77cba869fc1fa1e8302a0d924bb2ba8bbad267226043aca648940e28e622b6e5
-  data.tar.gz: ebb7b52fae71dfa37e44ae6ba8bccca459343567fbda81d5354c5eec09a653a07019afdb8946611f7faa4af933b70b53a1bc9a5c9e48abc513753123784dd349
+  metadata.gz: 82e18c0c6144ee40e2d1cbbfbad0fd6d53c28c46e1714faf8ba896c0a4e1bade33d5c451a614ee9ff65abaca04e8677e70dfcd8c4d27df2bc155747ac5571db6
+  data.tar.gz: 6d05c42a402851adbffbfb36c94914cf1148399064bf5379f1160f1fc3e767c2944372eee1580d69c63a38c7e0abf554e9d0aa53b425e61565f903ab31f7a8e2

data/lib/rips/instructions.rb

@@ -1,3 +1,18 @@
 require "rips/instructions/add"
+require "rips/instructions/and"
+require "rips/instructions/bez"
+require "rips/instructions/bnez"
+require "rips/instructions/j"
+require "rips/instructions/jal"
+require "rips/instructions/ji"
+require "rips/instructions/jr"
+require "rips/instructions/lesr"
 require "rips/instructions/li"
+require "rips/instructions/move"
+require "rips/instructions/nop"
+require "rips/instructions/neg"
+require "rips/instructions/not"
+require "rips/instructions/or"
+require "rips/instructions/sesm"
+require "rips/instructions/sesr"
 require "rips/instructions/sub"

data/lib/rips/instructions/add.rb

@@ -12,7 +12,7 @@ module Rips
       def initialize
         super("add",Formats::DFormat.new(0b0010))
         @variables = [Variables::Register.new, Variables::Register.new, Variables::Register.new]
-        @length = {r3:4, r2:4, r1:4}
+        @length = {r3:4, r2:4, r1:4, op:4}
       end
     end
   end  

data/lib/rips/instructions/and.rb

@@ -0,0 +1,19 @@
+require "rips/instructions/instruction"
+
+module Rips
+  module Instructions
+
+    class And < Instruction
+
+      attr_reader :variables, :length
+
+      # @variables: types of instruction's variables
+      # @length: length in bits for each variable
+      def initialize
+        super("and",Formats::DFormat.new(0b0100))
+        @variables = [Variables::Register.new, Variables::Register.new, Variables::Register.new]
+        @length = {r3:4, r2:4, r1:4, op:4}
+      end
+    end
+  end  
+end

data/lib/rips/instructions/bez.rb

@@ -0,0 +1,19 @@
+require "rips/instructions/instruction"
+
+module Rips
+  module Instructions
+
+    class Bez < Instruction
+
+      attr_reader :variables, :length
+
+      # @variables: types of instruction's variables
+      # @length: length in bits for each variable
+      def initialize
+        super("bez",Formats::BFormat.new(0b001111))
+        @variables = [Variables::Address.new]
+        @length = {r1:10, op:6}
+      end
+    end
+  end  
+end

data/lib/rips/instructions/bnez.rb

@@ -0,0 +1,19 @@
+require "rips/instructions/instruction"
+
+module Rips
+  module Instructions
+
+    class Bnez < Instruction
+
+      attr_reader :variables, :length
+
+      # @variables: types of instruction's variables
+      # @length: length in bits for each variable
+      def initialize
+        super("bnez",Formats::BFormat.new(0b011111))
+        @variables = [Variables::Address.new]
+        @length = {r1:10, op:6}
+      end
+    end
+  end  
+end

data/lib/rips/instructions/instruction.rb

@@ -9,9 +9,11 @@ module Rips
 
       # @name: mnemonic name
       # @format: instruction format
+      # @output: array with coded instruction
       def initialize (name, format)
         @name,@format = name,format
         @opcode = format.opcode
+        @output = []
       end
 
       # Return number of arguments
@@ -24,18 +26,34 @@ module Rips
         @format.set_arguments(args)
       end
 
+      # Add blanks (0 values) for instructions with free space
+      def add_blank
+        if @variables.empty?
+          @output.push(0.to_bin(@length[:blank]))
+        elsif @variables.size == 1
+          @output.insert(-2,0.to_bin(@length[:blank]))
+        else
+          @output.insert(-@variables.size,0.to_bin(@length[:blank]))
+        end
+      end
+
       # Coding to Machine Code
       def code
 
-        output = [@opcode.to_bin(@opcode.size)]
+        # Add opcode
+        @output = [@opcode.to_bin(@length[:op])]
 
+        # Add arguments
         @format.args.each do |key,value|
-          output << value.to_bin(@length[key])
+          @output << value.to_bin(@length[key])
         end
 
-        output.insert(-2,@length[:blank]) if (@length.key? :blank)
+        # Add blanks
+        if (@length.key? :blank)
+          add_blank
+        end
 
-        output.reverse.join.to_s
+        @output.reverse.join.to_s
       end      
 
     end

data/lib/rips/instructions/j.rb

@@ -0,0 +1,19 @@
+require "rips/instructions/instruction"
+
+module Rips
+  module Instructions
+
+    class J < Instruction
+
+      attr_reader :variables, :length
+
+      # @variables: types of instruction's variables
+      # @length: length in bits for each variable
+      def initialize
+        super("j",Formats::BFormat.new(0b1001))
+        @variables = [Variables::Address.new]
+        @length = {r1:10, op:4, blank:2}
+      end
+    end
+  end  
+end

data/lib/rips/instructions/jal.rb

@@ -0,0 +1,19 @@
+require "rips/instructions/instruction"
+
+module Rips
+  module Instructions
+
+    class Jal < Instruction
+
+      attr_reader :variables, :length
+
+      # @variables: types of instruction's variables
+      # @length: length in bits for each variable
+      def initialize
+        super("jal",Formats::BFormat.new(0b101000))
+        @variables = [Variables::Address.new]
+        @length = {r1:10, op:6}
+      end
+    end
+  end  
+end

data/lib/rips/instructions/ji.rb

@@ -0,0 +1,19 @@
+require "rips/instructions/instruction"
+
+module Rips
+  module Instructions
+
+    class Ji < Instruction
+
+      attr_reader :variables, :length
+
+      # @variables: types of instruction's variables
+      # @length: length in bits for each variable
+      def initialize
+        super("ji",Formats::BFormat.new(0b011000))
+        @variables = [Variables::Inmediate.new(10)]
+        @length = {r1:10, op:6}
+      end
+    end
+  end  
+end

data/lib/rips/instructions/jr.rb

@@ -0,0 +1,19 @@
+require "rips/instructions/instruction"
+
+module Rips
+  module Instructions
+
+    class Jr < Instruction
+
+      attr_reader :variables, :length
+
+      # @variables: types of instruction's variables
+      # @length: length in bits for each variable
+      def initialize
+        super("jr",Formats::AFormat.new(0b111000))
+        @variables = []
+        @length = {op:6, blank:10}
+      end
+    end
+  end  
+end

data/lib/rips/instructions/lesr.rb

@@ -0,0 +1,19 @@
+require "rips/instructions/instruction"
+
+module Rips
+  module Instructions
+
+    class Lesr < Instruction
+
+      attr_reader :variables, :length
+
+      # @variables: types of instruction's variables
+      # @length: length in bits for each variable
+      def initialize
+        super("lesr",Formats::CFormat.new(0b1011))
+        @variables = [Variables::Register.new, Variables::Port.new]
+        @length = {r2:4, r1:2, op:4, blank:6}
+      end
+    end
+  end  
+end

data/lib/rips/instructions/li.rb

@@ -12,7 +12,7 @@ module Rips
       def initialize
         super("li",Formats::CFormat.new(0b1010))
         @variables = [Variables::Register.new, Variables::Inmediate.new]
-        @length = {r2:4, r1:8}
+        @length = {r2:4, r1:8, op:4}
       end
     end
   end  

data/lib/rips/instructions/move.rb

@@ -0,0 +1,19 @@
+require "rips/instructions/instruction"
+
+module Rips
+  module Instructions
+
+    class Move < Instruction
+
+      attr_reader :variables, :length
+
+      # @variables: types of instruction's variables
+      # @length: length in bits for each variable
+      def initialize
+        super("move",Formats::CFormat.new(0b0000))
+        @variables = [Variables::Register.new, Variables::Register.new]
+        @length = {r2:4, r1:4, op:4, blank:4}
+      end
+    end
+  end  
+end

data/lib/rips/instructions/neg.rb

@@ -0,0 +1,19 @@
+require "rips/instructions/instruction"
+
+module Rips
+  module Instructions
+
+    class Neg < Instruction
+
+      attr_reader :variables, :length
+
+      # @variables: types of instruction's variables
+      # @length: length in bits for each variable
+      def initialize
+        super("neg",Formats::CFormat.new(0b0110))
+        @variables = [Variables::Register.new, Variables::Register.new]
+        @length = {r2:4, r1:4, op:4, blank:4}
+      end
+    end
+  end  
+end

data/lib/rips/instructions/nop.rb

@@ -0,0 +1,19 @@
+require "rips/instructions/instruction"
+
+module Rips
+  module Instructions
+
+    class Nop < Instruction
+
+      attr_reader :variables, :length
+
+      # @variables: types of instruction's variables
+      # @length: length in bits for each variable
+      def initialize
+        super("nop",Formats::AFormat.new(0b111111))
+        @variables = []
+        @length = {op:6, blank:10}
+      end
+    end
+  end  
+end

data/lib/rips/instructions/not.rb

@@ -0,0 +1,19 @@
+require "rips/instructions/instruction"
+
+module Rips
+  module Instructions
+
+    class Not < Instruction
+
+      attr_reader :variables, :length
+
+      # @variables: types of instruction's variables
+      # @length: length in bits for each variable
+      def initialize
+        super("not",Formats::CFormat.new(0b0001))
+        @variables = [Variables::Register.new, Variables::Register.new]
+        @length = {r2:4, r1:4, op:4, blank:4}
+      end
+    end
+  end  
+end

data/lib/rips/instructions/or.rb

@@ -0,0 +1,19 @@
+require "rips/instructions/instruction"
+
+module Rips
+  module Instructions
+
+    class Or < Instruction
+
+      attr_reader :variables, :length
+
+      # @variables: types of instruction's variables
+      # @length: length in bits for each variable
+      def initialize
+        super("or",Formats::DFormat.new(0b0101))
+        @variables = [Variables::Register.new, Variables::Register.new, Variables::Register.new]
+        @length = {r3:4, r2:4, r1:4, op:4}
+      end
+    end
+  end  
+end

data/lib/rips/instructions/sesm.rb

@@ -0,0 +1,19 @@
+require "rips/instructions/instruction"
+
+module Rips
+  module Instructions
+
+    class Sesm < Instruction
+
+      attr_reader :variables, :length
+
+      # @variables: types of instruction's variables
+      # @length: length in bits for each variable
+      def initialize
+        super("sesm",Formats::CFormat.new(0b1110))
+        @variables = [Variables::Port.new, Variables::Inmediate.new]
+        @length = {r2:2, r1:8, op:4, blank:2}
+      end
+    end
+  end  
+end

data/lib/rips/instructions/sesr.rb

@@ -0,0 +1,19 @@
+require "rips/instructions/instruction"
+
+module Rips
+  module Instructions
+
+    class Sesr < Instruction
+
+      attr_reader :variables, :length
+
+      # @variables: types of instruction's variables
+      # @length: length in bits for each variable
+      def initialize
+        super("sesr",Formats::CFormat.new(0b1101))
+        @variables = [Variables::Port.new, Variables::Register.new]
+        @length = {r2:2, r1:4, op:4, blank:6}
+      end
+    end
+  end  
+end

data/lib/rips/instructions/set.rb

@@ -1,6 +1,24 @@
 module Rips
   module Instructions
 
-    SET = ["add", "li", "sub"]
+    SET = 
+      [ "add", 
+        "and",
+        "j", 
+        "jal", 
+        "ji", 
+        "jr", 
+        "bez", 
+        "bnez", 
+        "lesr", 
+        "li", 
+        "move",
+        "nop",
+        "neg",
+        "not",
+        "or",
+        "sesm",
+        "sesr",
+        "sub" ]
   end
 end

data/lib/rips/instructions/sub.rb

@@ -12,8 +12,14 @@ module Rips
       def initialize
         super("sub",Formats::DFormat.new(0b0011))
         @variables = [Variables::Register.new, Variables::Register.new, Variables::Register.new]
-        @length = {r3:4, r2:4, r1:4}
+        @length = {r3:4, r2:4, r1:4, op:4}
       end
+
+      # Swap subtractor
+      def set_arguments (args)
+        args[1], args[2] = args[2], args[1]
+        super
+      end      
     end
   end  
 end

data/lib/rips/variables/address.rb

@@ -9,10 +9,10 @@ module Rips
 
       # @syntax: example syntax
       # @range: bit's range for variable
-      def initialize
-        super(10)
-        @syntax = "0..1023"
+      def initialize(size = 10)
+        super(size)
         @range = [0, 2**@length-1]
+        @syntax = "#{@range[0]}..{@range[1]}"
       end
 
       # Check input variable syntax

data/lib/rips/variables/inmediate.rb

@@ -9,10 +9,10 @@ module Rips
 
       # @syntax: example syntax
       # @range: bit's range for variable
-      def initialize
-        super(8)
-        @syntax = "-128..127"
+      def initialize(size = 8)
+        super(size)
         @range = [-2**(@length-1), 2**(@length-1)-1]
+        @syntax = "#{@range[0]}..{@range[1]}"
       end
 
       # Check input variable syntax

data/lib/rips/variables/port.rb

@@ -9,10 +9,11 @@ module Rips
 
       # @syntax: example syntax
       # @range: bit's range for variable
-      def initialize
-        super(2)
+      def initialize(size = 2)
+        super(size)
         @syntax = "@0-3"
         @range = [0, 2**@length-1]
+        @syntax = "@#{@range[0]}-{@range[1]}"
       end
 
       # Check input variable syntax

data/lib/rips/variables/register.rb

@@ -9,10 +9,10 @@ module Rips
 
       # @syntax: example syntax
       # @range: bit's range for variable
-      def initialize
-        super(4)
-        @syntax = "$0-15"
+      def initialize(size = 4)
+        super(size)
         @range = [0, 2**@length-1]
+        @syntax = "$#{@range[0]}-{@range[1]}"
       end
 
       # Check input variable syntax

data/lib/rips/version.rb

@@ -1,3 +1,3 @@
 module Rips
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rips
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Madh93
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,8 +79,23 @@ files:
 - lib/rips/formats/format.rb
 - lib/rips/instructions.rb
 - lib/rips/instructions/add.rb
+- lib/rips/instructions/and.rb
+- lib/rips/instructions/bez.rb
+- lib/rips/instructions/bnez.rb
 - lib/rips/instructions/instruction.rb
+- lib/rips/instructions/j.rb
+- lib/rips/instructions/jal.rb
+- lib/rips/instructions/ji.rb
+- lib/rips/instructions/jr.rb
+- lib/rips/instructions/lesr.rb
 - lib/rips/instructions/li.rb
+- lib/rips/instructions/move.rb
+- lib/rips/instructions/neg.rb
+- lib/rips/instructions/nop.rb
+- lib/rips/instructions/not.rb
+- lib/rips/instructions/or.rb
+- lib/rips/instructions/sesm.rb
+- lib/rips/instructions/sesr.rb
 - lib/rips/instructions/set.rb
 - lib/rips/instructions/sub.rb
 - lib/rips/utils.rb