voodoo 0.6.2 → 0.6.3

data/lib/voodoo/generators/mips_gas_generator.rb

@@ -163,6 +163,11 @@ module Voodoo
       [:div, :mod, :sub].member?(op)
     end
 
+    # Test if a value is an at-expression
+    def at_expr? value
+      value.respond_to?(:[]) && value[0] == :'@'
+    end
+
     # Emit function prologue and declare _formals_ as function arguments
     def begin_function formals, nlocals
       if @environment != @top_level
@@ -530,6 +535,13 @@ module Voodoo
       end
     end
 
+    # Load the value at the given address.
+    def load_at address, register = @TEMPORARY
+      load_value_into_register address, register
+      emit "lw #{register}, 0(#{register})\n"
+      register
+    end
+
     # Load a value into a register.
     # Returns the name of the register.
     # If the value was already in a register, the name of that
@@ -573,6 +585,8 @@ module Voodoo
           emit "addiu #{register}, %lo(#{x})\n"
           return register
         end
+      elsif at_expr? x
+        load_at x[1], register
       else
         raise "Don't know how to load #{x.inspect}"
       end
@@ -728,7 +742,9 @@ module Voodoo
     def string value
       code = ''
       value.each_byte do |b|
-        if b >= 32 && b < 128
+        if b == 92
+          code << "\\\\"
+        elsif b >= 32 && b < 127 && b != 34
           code << b.chr
         else
           code << sprintf("\\%03o", b)

data/lib/voodoo/generators/nasm_elf_generator.rb

@@ -31,29 +31,38 @@ module Voodoo
       end
       
       Tempfile.open(base + '.asm') do |nasmfile|
-        Tempfile.open(base + '.o') do |elffile|
-          elffile.close
-          # Write NASM code to nsamfile
-          @nasmgenerator.write nasmfile
-          nasmfile.close
-          # Find out the name of the nasm executable
-          if ENV.has_key? 'NASM'
-            nasm = ENV['NASM']
-          elsif ENV.has_key? 'YASM'
-            nasm = ENV['YASM']
-          else
-            nasm = Voodoo::Config.nasm_command
+        begin
+          Tempfile.open(base + '.o') do |elffile|
+            begin
+              elffile.close
+              # Write NASM code to nsamfile
+              @nasmgenerator.write nasmfile
+              nasmfile.close
+              # Find out the name of the nasm executable
+              if ENV.has_key? 'NASM'
+                nasm = ENV['NASM']
+              elsif ENV.has_key? 'YASM'
+                nasm = ENV['YASM']
+              else
+                nasm = Voodoo::Config.nasm_command
+              end
+              # Invoke nasm on nasmfile
+              command = "#{nasm} #{@nasm_extra_args}" +
+                " -o #{shell_encode elffile.path}" +
+                " #{shell_encode nasmfile.path}"
+              if system(command)
+                write_file_to_io elffile.path, io
+              else
+                raise "Command (#{command}) failed " +
+                  " with status #{$?.exitstatus}"
+              end
+            ensure
+              elffile.unlink
+            end
           end
-          # Invoke nasm on nasmfile
-          command = "#{nasm} #{@nasm_extra_args}" +
-            " -o #{shell_encode elffile.path}" +
-            " #{shell_encode nasmfile.path}"
-          if system(command)
-            write_file_to_io elffile.path, io
-          end
-          elffile.unlink
+        ensure
+          nasmfile.unlink
         end
-        nasmfile.unlink
       end
     end
   end

data/lib/voodoo/generators/nasm_generator.rb

@@ -88,7 +88,7 @@ module Voodoo
       code = ''
       in_quote = false
       value.each_byte do |b|
-        if b >= 32 && b < 128
+        if b >= 32 && b < 127 && b != 39 
           if in_quote
             code << b.chr
           else
@@ -185,6 +185,11 @@ module Voodoo
     # == Value Classification
     #
 
+    # Test if a value is an at-expression
+    def at_expr? value
+      value.respond_to?(:[]) && value[0] == :'@'
+    end
+
     # Test if op is a binary operation
     def binop? op
       [:div, :mod, :sub].member?(op) || symmetric_operation?(op)
@@ -271,6 +276,17 @@ module Voodoo
       end
     end
 
+    # Load the value at the given address.
+    # Invoking this code may clobber @BX.
+    def load_at address, reg = @SCRATCH_REG
+      if integer?(address) || global?(address)
+        "[#{address}]"
+      else
+        load_value_into_register address, @BX
+        "[#{@BX}]"
+      end
+    end
+
     # Load the value associated with the given symbol.
     # Returns a string that can be used to refer to the loaded value.
     def load_symbol symbol, reg = @SCRATCH_REG
@@ -298,6 +314,20 @@ module Voodoo
         value
       elsif symbol? value
         load_symbol value, reg
+      elsif at_expr? value
+        load_at value[1], reg
+      else
+        raise "Don't know how to load #{value.inspect}"
+      end
+    end
+
+    # Load a value into a register.
+    def load_value_into_register value, register
+      load_code = load_value(value), register
+      if load_code == register.to_s
+        load_code
+      else
+        "mov #{register}, #{load_code}\n"
       end
     end
 

data/lib/voodoo/parser.rb

@@ -108,8 +108,23 @@ module Voodoo
         when /\s/
           # Skip whitespace
           consume
+        when '@'
+          # Parse at-expression.
+          # '@' must be followed by a number or symbol.
+          consume
+          case lookahead
+          when /\d|-/
+            expr = parse_number
+          when /\w|\\/
+            expr = parse_symbol
+          else
+            raise "Invalid character (#{@lookahead.chr.inspect})" +
+              " at #{@line}:#{@char}; expecting number or symbol"
+          end
+          words << [:'@', expr]
         else
-          raise "Invalid character (#{@lookahead}) at #{@line}:#{@char}"
+          raise "Invalid character (#{@lookahead.chr.inspect})" +
+            " at #{@line}:#{@char}"
         end
       end
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: voodoo
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  hash: 1
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Robbert Haarman
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-05 00:00:00 +02:00
+date: 2010-11-21 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -29,7 +35,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- bin/ast.rb
 - bin/voodooc
 - lib/voodoo.rb
 - lib/voodoo/parser.rb
@@ -61,21 +66,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: voodoo
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Compiler for the Voodoo programming language

data/bin/ast.rb

@@ -1,47 +0,0 @@
-module Ast
-  # A program consists of zero or more elements,
-  # each one of which can be a label, an action,
-  # a function definition, or a comment
-  class Program
-    def initialize elements
-      @elements = elements
-    end
-    attr_accessor :elements
-  end
-
-  # A comment contains text
-  class Comment
-    def initialize text
-      @text = text
-    end
-    attr_accessor :text
-  end
-
-  # A label contains text
-  class Label
-    def initialize text
-      @text = text
-    end
-    attr_accessor :text
-  end
-
-  # A function definition has an argument list and contains
-  # a number of actions and/or comments
-  class Function
-    def initialize args, actions
-      @args = args
-      @statements = actions
-    end
-    attr_accessor :args, :actions
-  end
-
-  # An action contains an operation and zero or more
-  # arguments
-  class Action
-    def initialize op, args
-      @op = op
-      @args = args
-    end
-    attr_accessor :op, :args
-  end
-end