rips 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9d9774b257b7691b23c8eeb4fcd0b9de10f2515
-  data.tar.gz: 9fff56fe4e0eacebfd306b9d4cb4b1dc9a954fe0
+  metadata.gz: cf8c8bebaebfc51d045b029332f2cd2e061a88bf
+  data.tar.gz: 308c2b211e7feb112d7bbe80e3532771004efbf1
 SHA512:
-  metadata.gz: cfd2de7a53fe4840c1b66c9002c59b8e04f75473471b6fe80020c9b82f79c0c320dd33a8ba9d3f2860804eb1aef16837802c3991647d3e4ec3b7517c3d59a5a0
-  data.tar.gz: aef9b647fd23285e73e1de83dff021551a2fe042fa2af82c38e4f81c20ee0cd053fe3c4368221a7fe5151dbfdd95294453b1be16ef4a9b696eeda742210bb281
+  metadata.gz: efa9aa5de99297bee011ab544cf5d19d7759750141f022fa14c73a3d89b799fe77cba869fc1fa1e8302a0d924bb2ba8bbad267226043aca648940e28e622b6e5
+  data.tar.gz: ebb7b52fae71dfa37e44ae6ba8bccca459343567fbda81d5354c5eec09a653a07019afdb8946611f7faa4af933b70b53a1bc9a5c9e48abc513753123784dd349

data/.gitignore

@@ -12,3 +12,5 @@
 *.o
 *.a
 mkmf.log
+*.input
+*.dat

data/example.rips

@@ -1,3 +1,10 @@
-li $1, 12
-li $2, 5
-li $2, 1
+#***************#
+#    Example    #
+#***************#
+
+# Output in: progfile.dat
+
+li $1, 12 # Load 12 in Register 1
+li $2, -5 # Load -5 in Register 2
+
+add $3, $1, $2 # Reg3 = Reg1 + Reg2

data/lib/rips.rb

@@ -4,16 +4,27 @@ require "rips/error"
 
 module Rips
 
+  debug=false
+
+  # Check arguments
+  if ARGV.include?("-d")
+    debug = true
+    ARGV.delete("-d")
+  elsif ARGV.include?("--debug")
+    debug = true
+    ARGV.delete("--debug")
+  end
+  
+  Error::message(1) if ARGV.empty?
+
   # Check for a valid file
-  if ARGV.empty?
-    Error::message(1)
-  elsif !File.exist? ARGV[0]
+  if !File.exist? ARGV[0]
     Error::message(2)
   elsif !File.readable? ARGV[0]
     Error::message(3)
   end
 
-  rips = Assembler.new
+  rips = Assembler.new(debug)
 
   File.open(ARGV[0], "r") do |f|
     f.each_line do |line|

data/lib/rips/assembler.rb

@@ -3,15 +3,17 @@ require "rips/instructions"
 module Rips
   class Assembler
     
+    # @debug: switch to show trace in console
     # @input: array with assembly instructions
     # @output: array with coded instructions
     # @cmd: line split on tokens (name + arguments)
     # @instruction: instruction instance
     # @line: number of file's line
-    def initialize
+    def initialize (debug)
+      @debug = debug
       @input = []
       @output = []
-      @cmd
+      @cmd = {}
       @instruction
       @line = 1      
     end
@@ -26,18 +28,26 @@ module Rips
 
       @input.each do |line|
 
-        parse_input(line)
-        exists_instruction
+        # If line is empty -> next line
+        if !line.empty?
 
-        @instruction = get_instruction
-        
-        argument_size
-        argument_syntax
+          parse_input(line)
+          @instruction = nil
 
-        @instruction.set_arguments(@cmd[:arguments])
+          # If it's a comment -> show but not work with it
+          if line[0] != "#"
 
-        show
-        @output << @instruction.code
+            exists_instruction
+            @instruction = get_instruction
+            
+            argument_size
+            argument_syntax
+
+            @instruction.set_arguments(@cmd[:arguments])
+            @output << @instruction.code
+          end
+          show if @debug
+        end        
         @line += 1
       end
       
@@ -46,8 +56,17 @@ module Rips
 
     # Codification log of instruction
     def show
-      # Show code with '_' separator
-      puts "Code Instruction: " << @instruction.code.scan(/.{4}|.+/).join("_")
+
+      # If line was a comment -> @instruction should be nil
+      if @instruction.nil?
+        codification = ""
+      else
+        codification = @instruction.code.scan(/.{4}|.+/).join("_")
+      end
+
+      puts  "@#{@line}:" \
+            "\t#{codification}" \
+            "\t#{@cmd[:comments]}"
     end
 
     # Generate output in "progfile.dat"
@@ -61,8 +80,19 @@ module Rips
 
     # Split on tokens
     def parse_input (line)
-      @cmd = {  name: line.split(' ').first.downcase,
-                arguments: line.split(' ',2).pop.delete(' ').split(',') }      
+
+      if line[0] == "#"
+        @cmd[:comments] = line
+      else
+        @cmd[:name] = line.split("#").first.split(" ").first.downcase
+        @cmd[:arguments] = line.split("#").first.split(@cmd[:name])
+        if !@cmd[:arguments].empty?
+          @cmd[:arguments] = @cmd[:arguments].pop.split("#").first.delete(" ").split(",")
+        end
+        @cmd[:comments] = line.split("#").slice(1..-1).join
+        @cmd[:comments].insert(0,"#") if !@cmd[:comments].empty?
+      end
+
     end
 
     # Obtain instruction's instance object

data/lib/rips/formats.rb

@@ -1 +1,4 @@
-require "rips/formats/cformat"
+require "rips/formats/aformat"
+require "rips/formats/bformat"
+require "rips/formats/cformat"
+require "rips/formats/dformat"

data/lib/rips/formats/aformat.rb

@@ -0,0 +1,18 @@
+require "rips/formats/format"  
+
+module Rips
+  module Formats
+
+    class AFormat < Format
+      
+      attr_reader :args
+      
+      # @args: all instruction's arguments
+      def initialize (opcode)
+        super(opcode,0)
+        @args = {}
+      end
+      
+    end
+  end
+end

data/lib/rips/formats/bformat.rb

@@ -0,0 +1,22 @@
+require "rips/formats/format"  
+
+module Rips
+  module Formats
+
+    class BFormat < Format
+      
+      attr_reader :args
+      
+      # @args: all instruction's arguments
+      def initialize (opcode)
+        super(opcode,1)
+        @args = {}
+      end
+      
+      # Pass all arguments at once
+      def set_arguments (args)
+        @args[:r1] = args[0]
+      end
+    end
+  end
+end

data/lib/rips/formats/dformat.rb

@@ -0,0 +1,22 @@
+require "rips/formats/format"  
+
+module Rips
+  module Formats
+
+    class DFormat < Format
+      
+      attr_reader :args
+      
+      # @args: all instruction's arguments
+      def initialize (opcode)
+        super(opcode,3)
+        @args = {}
+      end
+      
+      # Pass all arguments at once
+      def set_arguments (args)
+        @args[:r1], @args[:r2], @args[:r3] = args[2], args[1], args[0]
+      end
+    end
+  end
+end

data/lib/rips/formats/format.rb

@@ -12,6 +12,11 @@ module Rips
       def initialize (opcode, args_number)
         @opcode, @args_number = opcode, args_number
       end
+
+      # Pass all arguments at once 
+      def set_arguments (args)
+      end
+      
     end
   end
 end

data/lib/rips/instructions.rb

@@ -1 +1,3 @@
-require "rips/instructions/li"
+require "rips/instructions/add"
+require "rips/instructions/li"
+require "rips/instructions/sub"

data/lib/rips/instructions/add.rb

@@ -0,0 +1,19 @@
+require "rips/instructions/instruction"
+
+module Rips
+  module Instructions
+
+    class Add < Instruction
+
+      attr_reader :variables, :length
+
+      # @variables: types of instruction's variables
+      # @length: length in bits for each variable
+      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}
+      end
+    end
+  end  
+end

data/lib/rips/instructions/set.rb

@@ -1,6 +1,6 @@
 module Rips
   module Instructions
 
-    SET = ["li"]
+    SET = ["add", "li", "sub"]
   end
 end

data/lib/rips/instructions/sub.rb

@@ -0,0 +1,19 @@
+require "rips/instructions/instruction"
+
+module Rips
+  module Instructions
+
+    class Sub < Instruction
+
+      attr_reader :variables, :length
+
+      # @variables: types of instruction's variables
+      # @length: length in bits for each variable
+      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}
+      end
+    end
+  end  
+end

data/lib/rips/utils.rb

@@ -1,6 +1,9 @@
 class Integer
   def to_bin(width)
-    num = '%0*b' % [width, self]
-    num.gsub('.','1')
+    if self < 0
+      '%0*b' % [width, (2**width-1) - ~self]
+    else
+      '%0*b' % [width, self]
+    end
   end
 end

data/lib/rips/variables.rb

@@ -1,2 +1,4 @@
-require "rips/variables/register"
-require "rips/variables/inmediate"
+require "rips/variables/address"
+require "rips/variables/inmediate"
+require "rips/variables/port"
+require "rips/variables/register"

data/lib/rips/variables/address.rb

@@ -0,0 +1,35 @@
+require "rips/variables/variable"
+
+module Rips
+  module Variables
+ 
+    class Address < Variable 
+
+      attr_reader :syntax
+
+      # @syntax: example syntax
+      # @range: bit's range for variable
+      def initialize
+        super(10)
+        @syntax = "0..1023"
+        @range = [0, 2**@length-1]
+      end
+
+      # Check input variable syntax
+      def syntax? (value)
+
+        if !number?(value)
+          return false
+        end      
+
+        # It should be between syntax range
+        if !between?(value, @range)
+          return false
+        else
+          return true
+        end       
+      end
+      
+    end
+  end
+end

data/lib/rips/variables/inmediate.rb

@@ -8,26 +8,26 @@ module Rips
       attr_reader :syntax
 
       # @syntax: example syntax
+      # @range: bit's range for variable
       def initialize
         super(8)
-        @syntax = "-128...127"
+        @syntax = "-128..127"
+        @range = [-2**(@length-1), 2**(@length-1)-1]
       end
 
       # Check input variable syntax
       def syntax? (value)
 
-        if !number? (value)
+        if !number?(value)
           return false
         end      
 
-        value = value.to_i
-
         # It should be between syntax range
-        if !value.to_i.between?(-2**(@length-1),2**(@length-1)-1)
+        if !between?(value, @range)
           return false
         else
           return true
-        end        
+        end     
       end
       
     end

data/lib/rips/variables/port.rb

@@ -0,0 +1,35 @@
+require "rips/variables/variable"
+
+module Rips
+  module Variables
+ 
+    class Port < Variable 
+
+      attr_reader :syntax
+
+      # @syntax: example syntax
+      # @range: bit's range for variable
+      def initialize
+        super(2)
+        @syntax = "@0-3"
+        @range = [0, 2**@length-1]
+      end
+
+      # Check input variable syntax
+      def syntax? (value)
+
+        if !port?(value)
+          return false
+        end
+
+        # It should be between syntax range
+        if !between?(value, @range)
+          return false
+        else
+          return true
+        end         
+      end
+      
+    end
+  end
+end

data/lib/rips/variables/register.rb

@@ -8,36 +8,26 @@ module Rips
       attr_reader :syntax
 
       # @syntax: example syntax
+      # @range: bit's range for variable
       def initialize
         super(4)
         @syntax = "$0-15"
+        @range = [0, 2**@length-1]
       end
 
       # Check input variable syntax
       def syntax? (value)
 
-          if !register? (value)
-            return false
-          end
+        if !register?(value)
+          return false
+        end
 
-          # Get integer part
-          value = value.split('$',2).last
-
-          # If contains more "$"
-          if value.include? "$"
-            return false
-          # It should have only 1 or 2 digits
-          elsif !value.size.between?(1,2) 
-            return false
-          # If it have 2 digits, first digit doesn't be zero or negative
-          elsif (value.size == 2) && (!value[0].match(/-|0/).nil?)
-            return false
-          # It should be between syntax range
-          elsif !value.to_i.between?(0, 2**@length-1)
-            return false
-          else
-            return true
-          end        
+        # It should be between syntax range
+        if !between?(value, @range)
+          return false
+        else
+          return true
+        end  
       end
       
     end

data/lib/rips/variables/variable.rb

@@ -10,19 +10,29 @@ module Rips
         @length = length
       end
 
-      # Check if value is a register ($?)
+      # Check if value is a register ($0..15)
       def register? (value)
-        value[0] == "$"
+        (value[0] == "$") && number?(value.slice(1..-1))
       end
 
+      # Check if value is a port (@0..3)
+      def port? (value)
+        (value[0] == "@") && number?(value.slice(1..-1))
+      end      
+
       # Check if value is a valid number (...,-1,0,1...)
       def number? (value)
         /\A[-]?\d+\z/ === value
       end
 
+      # Check if value is between in permitted range
+      def between? (value, range)
+        to_i(value).between?(range[0], range[1])
+      end      
+
       # Return integer part of value
       def to_i (value)
-        value.split('$',2).last.to_i
+        number?(value) ? value.to_i : value.slice(1..-1).to_i
       end
 
       # Return error message about incorrent syntax

data/lib/rips/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rips
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Madh93
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-05 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,15 +72,22 @@ files:
 - lib/rips/assembler.rb
 - lib/rips/error.rb
 - lib/rips/formats.rb
+- lib/rips/formats/aformat.rb
+- lib/rips/formats/bformat.rb
 - lib/rips/formats/cformat.rb
+- lib/rips/formats/dformat.rb
 - lib/rips/formats/format.rb
 - lib/rips/instructions.rb
+- lib/rips/instructions/add.rb
 - lib/rips/instructions/instruction.rb
 - lib/rips/instructions/li.rb
 - lib/rips/instructions/set.rb
+- lib/rips/instructions/sub.rb
 - lib/rips/utils.rb
 - lib/rips/variables.rb
+- lib/rips/variables/address.rb
 - lib/rips/variables/inmediate.rb
+- lib/rips/variables/port.rb
 - lib/rips/variables/register.rb
 - lib/rips/variables/variable.rb
 - lib/rips/version.rb