voodoo 1.1.1 → 1.1.2

data/bin/voodooc

@@ -81,7 +81,7 @@ def handle_error error
   if error.kind_of? Voodoo::Compiler::Error
     error.errors.each do |e|
       message = ''
-      if e.start_line != nil
+      if e.respond_to?(:start_line) && e.start_line != nil
         message << "#{e.start_line}: "
         if e.input_name != nil
           message = "#{e.input_name}:#{message}"
@@ -91,7 +91,7 @@ def handle_error error
       end
       message << e.message
       $stderr.puts message
-      if e.text != nil
+      if e.respond_to?(:text) && e.text != nil
         $stderr.print "\n  #{e.text.gsub("\n", "\n  ")}\n"
       end
     end

data/lib/voodoo/compiler.rb

@@ -67,6 +67,13 @@ module Voodoo
         end
       end
 
+      undefined_symbols = @generator.undefined_symbols
+      unless undefined_symbols.empty?
+        msg = "The following symbols are used, but have not been defined" +
+          " or imported:\n" + undefined_symbols.to_a.sort!.join(" ")
+        errors << RuntimeError.new(msg)
+      end
+
       if errors.empty?
         @generator.write @output
       else

data/lib/voodoo/config.rb

@@ -2,15 +2,15 @@ module Voodoo
   # Methods to get and set configuration parameters
   module Config
     IMPLEMENTATION_NAME = 'Voodoo Compiler'
-    IMPLEMENTATION_VERSION = '1.1.1'
+    IMPLEMENTATION_VERSION = '1.1.2'
 
     # Class that holds configuration parameters
     class Configuration
       def initialize
         @default_architecture = :auto
         @default_format = :elf
-        @gas_command = "/usr/bin/as"
-        @nasm_command = ""
+        @gas_command = "as"
+        @nasm_command = "nasm"
       end
 
       attr_accessor :default_format,

data/lib/voodoo/generators/amd64_nasm_generator.rb

@@ -166,6 +166,7 @@ module Voodoo
         emit "xor rax, rax\n"
         # If value_ref is a symbol, use PLT-relative addressing
         if global?(func)
+          @symbol_tracker.use func
           emit "call #{value_ref} wrt ..plt\n"
         else
           emit "call #{value_ref}\n"

data/lib/voodoo/generators/arm_gas_generator.rb

@@ -49,15 +49,26 @@ module Voodoo
   #   saved r14
   #   saved r11
   #   :
-  #   saved r4   <-- r13 points here
+  #   saved r4
+  #   local6
+  #   :
+  #   localn     <-- r13 points here
   #
   # == Register Usage
   #
   # Inside a function, registers r4..r8 and r10 are used for local variables
   # and function arguments, whereas r11 is used as a frame pointer.
   #
-  # r12 is used as a temporary, and r3 is used when another temporary
-  # is needed.
+  # r12 is used as a temporary, and r3, r2 and r1 are used when more
+  # temporaries are needed.
+  #
+  # == Local Variables
+  #
+  # Local variables are used to store both the first 4 function arguments
+  # and any variables declared inside the function (arguments beyond the 4th
+  # are stored on the stack, as per the calling convention). Local variables
+  # beyond the 6th are stored on the stack, starting below the saved registers
+  # and counting down.
   #
   class ARMGasGenerator < CommonCodeGenerator
     def initialize params
@@ -88,9 +99,10 @@ module Voodoo
       @frame_offset = 0
       @frame_size = 0
       @function_end_label = nil
-      @imports = {}
+      @imports = Set.new
       @if_labels = []
       @saved_registers = []       # registers we've saved in the current frame
+      @saved_size = 0             # bytes dedicated to saved registers
       super params
       @output_file_suffix = '.s'
       @features.merge! \
@@ -222,6 +234,7 @@ module Voodoo
 
       # Call function
       if global? func
+        @symbol_tracker.use func
         emit "bl #{func}\n"
       else
         with_temporary do |temporary|
@@ -254,6 +267,7 @@ module Voodoo
       clobbered << @FP
       clobbered << :lr if save_lr
       @saved_registers = clobbered
+      @saved_size = @saved_registers.length * @WORDSIZE
       emit "stmfd sp!, {#{clobbered.join ', '}}\n"
       emit "add #{@FP}, sp, \##{clobbered.length * @WORDSIZE}\n"
 
@@ -378,7 +392,7 @@ module Voodoo
       # If we are returning to top level, restore stack pointer
       # and saved registers.
       if @environment.parent == @top_level
-        offset = @frame_size - @saved_registers.length * @WORDSIZE
+        offset = @frame_size - @saved_size
         if offset > 0
           emit "add sp, sp, \##{offset}\n"
         end
@@ -386,6 +400,7 @@ module Voodoo
         @frame_size = 0
         @frame_offset = 0
         @saved_registers = []
+        @saved_size = 0
 
         # If we need to emit constants, do so now
         unless @constants.empty?
@@ -411,6 +426,7 @@ module Voodoo
       @frame_size = 0
       @frame_offset = 0
       @saved_registers = []
+      @saved_size = 0
       @environment = @top_level
     end
 
@@ -427,13 +443,13 @@ module Voodoo
       case op
       when :div
         func = :"__aeabi_idiv"
-        import func unless @imports.has_key? func
+        import func unless @imports.member? func
         call func, expr[1], expr[2]
         emit "cpy #{register}, r0\n" if register != :r0
         return
       when :mod
         func = :"__aeabi_idivmod"
-        import func unless @imports.has_key? func
+        import func unless @imports.member? func
         call func, expr[1], expr[2]
         emit "cpy #{register}, r1\n" if register != :r1
         return
@@ -642,8 +658,9 @@ module Voodoo
 
     # Import labels into the current section
     def import *symbols
-      # Record imported labels in @imports
-      symbols.each { |sym| @imports[sym] = sym }
+      # Record imported labels in @imports and @symbol_tracker
+      @imports.merge symbols
+      @symbol_tracker.define *symbols
     end
 
     # Introduce a new local variable
@@ -703,7 +720,8 @@ module Voodoo
 
     # Returns the fp-relative reference for the nth (0-based) local.
     def local_offset n
-      -@INITIAL_FRAME_SIZE - ((n + number_of_register_arguments) * @WORDSIZE)
+      nstack_locals = n + number_of_register_arguments - @NREGISTER_LOCALS
+      -(nstack_locals + 1) * @WORDSIZE - @saved_size
     end
     
     # Given an offset, returns an fp-relative reference.
@@ -935,6 +953,7 @@ module Voodoo
 	  return register
 	else
           # Assume global
+          @symbol_tracker.use x
           lbl = add_constant x
           emit "ldr #{register}, #{lbl}\n"
           return register

data/lib/voodoo/generators/common_code_generator.rb

@@ -1,4 +1,5 @@
 require 'set'
+require 'voodoo/symbol_tracker'
 
 module Voodoo
   # Common base class for code generators.
@@ -48,6 +49,7 @@ module Voodoo
       @output_file_suffix = '.o'
       @open_labels = []     # Labels for which we must emit size annotations
       @relocated_symbols = Set.new
+      @symbol_tracker = SymbolTracker.new
       @features = {
         :voodoo => "1.1"    # Voodoo language version
       }
@@ -309,6 +311,7 @@ module Voodoo
       if real_section_name(section) == ".data"
         @relocated_symbols.merge symbols
       end
+      @symbol_tracker.use *symbols
       emit_export *symbols
     end
 
@@ -332,6 +335,7 @@ module Voodoo
       if real_section_name(section) == ".data"
         @relocated_symbols.merge symbols
       end
+      @symbol_tracker.define *symbols
       emit_import *symbols
     end
 
@@ -368,6 +372,7 @@ module Voodoo
         emit_label_type name, type
         @open_labels << name
       end
+      @symbol_tracker.define name
       emit_label name
     end
 
@@ -565,6 +570,11 @@ module Voodoo
       [:add, :and, :mul, :or, :xor].member? op
     end
 
+    # Returns a set of symbols that have been used, but not defined.
+    def undefined_symbols
+      @symbol_tracker.used_but_undefined_symbols
+    end
+
     # Executes a block of code, passing the block the name of +n+
     # unused temporary registers.
     #
@@ -698,6 +708,11 @@ module Voodoo
     def count_locals_helper statements, count, max
       statements.each do |statement|
         case statement[0]
+        when :ifeq, :ifge, :ifgt, :ifle, :iflt, :ifne
+          max = count_locals_helper statement[2], count, max
+          if statement.length > 3
+            max = count_locals_helper statement[3], count, max
+          end
         when :block
           max = count_locals_helper statement[1..-1], count, max
         when :let

data/lib/voodoo/generators/dummy_generator.rb

@@ -1,10 +1,102 @@
+require 'set'
+require 'voodoo/symbol_tracker'
+
 module Voodoo
-  # Generator that does nothing.
+  # Generator that does not generate code.
   class DummyGenerator
-    def add *args
+    def initialize *params
+      @locals = Set.new
+      @symbol_tracker = SymbolTracker.new
+    end
+
+    def add section, *code
+      analyze code
+    end
+
+    # Returns a set of symbols that have been used, but not defined.
+    def undefined_symbols
+      @symbol_tracker.used_but_undefined_symbols
     end
 
     def write *args
     end
+
+    private
+
+    def analyze statements
+      statements.each { |code| analyze_statement code }
+    end
+
+    def analyze_statement code
+      case code[0]
+      when :block
+        old_locals = @locals
+        @locals = Set.new @locals
+        begin
+          analyze code[1..-1]
+        ensure
+          @locals = old_locals
+        end
+      when :export
+        use *code[1..-1]
+      when :function
+        old_locals = @locals
+        @locals = Set.new @locals
+        @locals.merge code[1]
+        begin
+          analyze code[2..-1]
+        ensure
+          @locals = old_locals
+        end
+      when :import
+        define *code[1..-1]
+      when :label
+        define code[1]
+      when :let
+        define code[1]
+        analyze_expr code[2..-1]
+      when :return
+        analyze_expr code[1..-1]
+      when :set
+        analyze_values [code[1]]
+        analyze_expr code[2..-1]
+      else
+        if code[0].to_s[0...2] == "if"
+          analyze_values code[1]
+          analyze code[2]
+          analyze code[3] if code.length > 3
+        else
+          analyze_values code[1..-1]
+        end
+      end
+    end
+
+    def analyze_expr code
+      if code.length == 1
+        analyze_values code
+      else
+        analyze_values code[1..-1]
+      end
+    end
+
+    def analyze_values values
+      values.each do |x|
+        if x.kind_of? Symbol
+          use x
+        elsif x.respond_to?(:[]) && x[0] == :'@'
+          analyze_values x[1]
+        end
+      end
+    end
+
+    def define *symbols
+      @symbol_tracker.define *symbols
+    end
+
+    def use *symbols
+      syms = Set.new symbols
+      nonlocals = syms - @locals
+      @symbol_tracker.use *nonlocals
+    end
   end
 end

data/lib/voodoo/generators/mips_gas_generator.rb

@@ -281,6 +281,7 @@ module Voodoo
 
       # Load function address
       if global? func
+        @symbol_tracker.use func
         if @imports.has_key? func
           # Load address from global offset table
           emit "lw #{@FUNCTION}, %call16(#{func})(#{@GOT})\n"

data/lib/voodoo/generators/nasm_generator.rb

@@ -55,6 +55,7 @@ module Voodoo
 
     # Import labels into the current section
     def import *symbols
+      @symbol_tracker.define *symbols
       if real_section_name(section) != ".text"
         @relocated_symbols.merge symbols
       end
@@ -351,6 +352,7 @@ module Voodoo
         offset_reference x
       else
         # Assume global
+        @symbol_tracker.use symbol
         if @relocated_symbols.include? symbol
           load_symbol_from_got symbol, reg
         else

data/lib/voodoo/parser.rb

@@ -320,8 +320,13 @@ module Voodoo
     # This method should be called while the lookahead is the first
     # character of the symbol name.
     def parse_symbol
+      parse_symbol1 ''
+    end
+
+    # Continues parsing a symbol.
+    # +name+ the part of the symbol that has already been parsed.
+    def parse_symbol1 name
       wrap_exceptions do
-        name = ''
         while lookahead != :eof
           case lookahead
           when "\\"
@@ -547,9 +552,20 @@ module Voodoo
       when NUMBER_STARTER
         # Digit; parse number
         parse_number
+      when "\\"
+        # Check if this is the line continuation escape or some other escape.
+        decoded = parse_escape
+        if decoded == ''
+          # Line continuation. Now that we've parsed that, try again.
+          try_parse_token
+        else
+          # Some other escape. That means it's a symbol.
+          parse_symbol1 decoded
+        end
       when SYMBOL_STARTER
         # Letter, underscore, or backslash; parse symbol
-        # Note: \w matches digits, too, so keep this case after \d
+        # Note: SYMBOL_STARTER matches digits and backslashes, too, so
+        # keep it after the cases that match those.
        parse_symbol
       when STRING_STARTER
         # Double quote; parse string

data/lib/voodoo/symbol_tracker.rb

@@ -0,0 +1,35 @@
+require 'set'
+
+module Voodoo
+  # Class to keep track of defined and used symbols.
+  class SymbolTracker
+    def initialize
+      @defined = Set.new
+      @used = Set.new
+    end
+
+    def define *symbols
+      @defined.merge symbols
+    end
+
+    def use *symbols
+      @used.merge symbols
+    end
+
+    def defined_but_unused_symbols
+      @defined - @used
+    end
+
+    def defined_symbols
+      @defined
+    end
+
+    def used_symbols
+      @used
+    end
+
+    def used_but_undefined_symbols
+      @used - @defined
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voodoo
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies: []
 description: ! 'The Voodoo compiler is an implementation of the Voodoo programming
 
@@ -50,6 +50,7 @@ files:
 - lib/voodoo/compiler.rb
 - lib/voodoo/validator.rb
 - lib/voodoo/config.rb
+- lib/voodoo/symbol_tracker.rb
 homepage: http://inglorion.net/software/voodoo/
 licenses: []
 post_install_message: