rips 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e4896a53632a2c27fb558be1aff1d7d8091771b
-  data.tar.gz: 7024219596467dca132f8fb4c2dfe283e32d4a7e
+  metadata.gz: 0ba8ac0a5eaa357455a6e03c2a68780872c13e52
+  data.tar.gz: dadbb4848036104eccb883594f6ebc55242e2f8e
 SHA512:
-  metadata.gz: 82e18c0c6144ee40e2d1cbbfbad0fd6d53c28c46e1714faf8ba896c0a4e1bade33d5c451a614ee9ff65abaca04e8677e70dfcd8c4d27df2bc155747ac5571db6
-  data.tar.gz: 6d05c42a402851adbffbfb36c94914cf1148399064bf5379f1160f1fc3e767c2944372eee1580d69c63a38c7e0abf554e9d0aa53b425e61565f903ab31f7a8e2
+  metadata.gz: bea3e6aa10a9688867818db06eb00cd1ea57259c1346fe3784ebcf1f7c3eb639db7b8e14556b8ee0cf3c05574aab69187fd9a8fb7d1e08c7825c6c3b4f991dbb
+  data.tar.gz: 4df51297c08a6e4460327b78aeab6856e619a0f773baf6e5b7e8ad95d1b9d716bcd167fb5389fbab79995fefc16300d54cc4e73e2111ffe9ee330ea6398638ae

data/example.rips

@@ -2,9 +2,27 @@
 #    Example    #
 #***************#
 
-# Output in: progfile.dat
+# Output in progfile.dat
 
-li $1, 12 # Load 12 in Register 1
-li $2, -5 # Load -5 in Register 2
+main:
 
-add $3, $1, $2 # Reg3 = Reg1 + Reg2
+  li $14, 2
+  li $15, 1  
+  li $1, 0  
+  li $2, 0
+
+ajal:
+
+  jal adder
+  j increment
+
+adder:
+
+  add $3, $1, $2 # Reg3 = Reg1 + Reg2
+  jr
+
+increment:
+
+  add $1, $1, $14
+  sub $2, $2, $15
+  j ajal  # Repeat process

data/lib/rips/assembler.rb

@@ -8,6 +8,8 @@ module Rips
     # @output: array with coded instructions
     # @cmd: line split on tokens (name + arguments)
     # @instruction: instruction instance
+    # @instructions: array with line for each instruction
+    # @labels: name and number line of label
     # @line: number of file's line
     def initialize (debug)
       @debug = debug
@@ -15,7 +17,37 @@ module Rips
       @output = []
       @cmd = {}
       @instruction
-      @line = 1      
+      @instructions = [] 
+      @labels = {}
+      @line = 1  
+    end
+
+    # Store labels and number line 
+    def find_labels
+
+      @input.each_with_index do |line, i|
+        if !line.empty?
+          label = line.scan(/\w+:/)
+          if (label.size == 1)
+            
+            if !@labels.include?(label[0].to_s.split(":").first)
+              @labels[label[0].to_s.split(":").first] = [*@instructions.each_with_index].bsearch{|x, _| x >= i}.last
+            else
+              Error::message(7, i+1, label[0].to_s.split(":").first) 
+            end
+          end
+        end
+      end
+    end
+
+    # Store number line for each instruction
+    def find_instructions
+
+      @input.each_with_index do |line,i|
+        if (!line.empty?) && (line.scan(/\w+:/).empty?) && (line[0] != "#")
+          @instructions << i+1
+        end
+      end
     end
 
     # Stores each new line of file
@@ -26,10 +58,24 @@ module Rips
     # Analyze and translate each instruction
     def run
 
+      find_instructions
+      find_labels
+
+      puts "instructions...."
+      @instructions.each do |k|
+        puts "#{k}"
+      end      
+
+      puts "labels...."
+      @labels.each do |k,v|
+        puts "#{k}:#{v}"
+      end
+
       @input.each do |line|
 
         # If line is empty -> next line
-        if !line.empty?
+        # Or if not is a label
+        if (!line.empty?) && (line.scan(/\w+:/).empty?)
 
           parse_input(line)
           @instruction = nil
@@ -39,6 +85,8 @@ module Rips
 
             exists_instruction
             @instruction = get_instruction
+
+            parse_label
             
             argument_size
             argument_syntax
@@ -85,14 +133,30 @@ module Rips
         @cmd[:comments] = line
       else
         @cmd[:name] = line.split("#").first.split(" ").first.downcase
-        @cmd[:arguments] = line.split("#").first.split(@cmd[:name])
+        @cmd[:arguments] = line.split("#").first.split("#{@cmd[:name]} ")
         if !@cmd[:arguments].empty?
           @cmd[:arguments] = @cmd[:arguments].pop.split("#").first.delete(" ").split(",")
         end
+        if @cmd[:arguments].first == "jr" ||
+           @cmd[:arguments].first == "nop"
+           @cmd[:arguments] = []
+        end
         @cmd[:comments] = line.split("#").slice(1..-1).join
         @cmd[:comments].insert(0,"#") if !@cmd[:comments].empty?
       end
+    end
 
+    # Translate label's name to instruction's number
+    def parse_label
+      if (@instruction.is_a? Rips::Instructions::Bez) ||
+         (@instruction.is_a? Rips::Instructions::Bnez) ||
+         (@instruction.is_a? Rips::Instructions::J) ||
+         (@instruction.is_a? Rips::Instructions::Jal)
+
+          puts @cmd[:arguments]
+          @cmd[:arguments] = [@labels[@cmd[:arguments].first].to_s]
+          puts "Salto a: #{@cmd[:arguments]}"
+      end
     end
 
     # Obtain instruction's instance object

data/lib/rips/error.rb

@@ -8,7 +8,9 @@ module Rips
         "RIPS ERROR (3). Permission denied to read file.",
         "RIPS ERROR (4). In line %d: doesn't exist `%s` instruction in Instruction Set.",
         "RIPS ERROR (5). In line %d: for `%s` instruction wrong number of arguments (%d for %d).",
-        "RIPS ERROR (6). In line %d: syntax error, %s." ]
+        "RIPS ERROR (6). In line %d: syntax error, %s.",
+        "RIPS ERROR (7). In line %d: There is already a label called `%s`.",
+        "RIPS ERROR (8). In line %d: Unknown syntax for label `%s` (try `labelname:`)." ]
 
     def self.message (num, *args)
       puts MESSAGES[num] % args

data/lib/rips/variables/address.rb

@@ -12,24 +12,20 @@ module Rips
       def initialize(size = 10)
         super(size)
         @range = [0, 2**@length-1]
-        @syntax = "#{@range[0]}..{@range[1]}"
+        @syntax = "#{@range[0]}..#{@range[1]} | label"
       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
+        if (number?(value)) && (between?(value, @range))
+          true
+        elsif value.is_a?(String)
+          true
         else
-          return true
-        end       
+          false
+        end
       end
-      
     end
   end
 end

data/lib/rips/variables/inmediate.rb

@@ -12,22 +12,18 @@ module Rips
       def initialize(size = 8)
         super(size)
         @range = [-2**(@length-1), 2**(@length-1)-1]
-        @syntax = "#{@range[0]}..{@range[1]}"
+        @syntax = "#{@range[0]}..#{@range[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
+        if number?(value) && between?(value, @range)
+          true
         else
-          return true
-        end     
+          false
+        end
       end
       
     end

data/lib/rips/variables/port.rb

@@ -13,22 +13,18 @@ module Rips
         super(size)
         @syntax = "@0-3"
         @range = [0, 2**@length-1]
-        @syntax = "@#{@range[0]}-{@range[1]}"
+        @syntax = "@#{@range[0]}-#{@range[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
+        if port?(value) && between?(value, @range)
+          true
         else
-          return true
-        end         
+          false
+        end       
       end
       
     end

data/lib/rips/variables/register.rb

@@ -12,22 +12,18 @@ module Rips
       def initialize(size = 4)
         super(size)
         @range = [0, 2**@length-1]
-        @syntax = "$#{@range[0]}-{@range[1]}"
+        @syntax = "$#{@range[0]}-#{@range[1]}"
       end
 
       # Check input variable syntax
       def syntax? (value)
 
-        if !register?(value)
-          return false
-        end
-
         # It should be between syntax range
-        if !between?(value, @range)
-          return false
+        if register?(value) && between?(value, @range)
+          true
         else
-          return true
-        end  
+          false
+        end 
       end
       
     end

data/lib/rips/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rips
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Madh93
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler