voodoo 1.1.2 → 1.1.3

data/lib/voodoo.rb

@@ -1,6 +1,7 @@
 require 'voodoo/config'
 require 'voodoo/code_generator'
 require 'voodoo/compiler'
+require 'voodoo/error'
 require 'voodoo/parser'
 
 # = Voodoo - Code Generation for Multiple Target Platforms

data/lib/voodoo/code_generator.rb

@@ -1,4 +1,5 @@
 require 'voodoo/config'
+require 'voodoo/error'
 
 module Voodoo
   # Module for selecting code generators.
@@ -64,6 +65,32 @@ module Voodoo
     def formats architecture
       @@generators[architecture.to_sym].keys
     end
+
+    # Base class for errors raised by code generators.
+    class Error < Voodoo::Error
+    end
+
+    # Error raised when a symbol is exported after it has been used.
+    class SymbolsExportedAfterUseError < Error
+      def initialize symbols
+        @symbols = symbols
+        super("Symbols exported after they have been used: " +
+              symbols.to_a.join(" "))
+      end
+
+      attr_reader :symbols
+    end
+
+    # Error raised when a symbol is imported after it has been used.
+    class SymbolsImportedAfterUseError < Error
+      def initialize symbols
+        @symbols = symbols
+        super("Symbols imported after they have been used: " +
+              symbols.to_a.join(" "))
+      end
+
+      attr_reader :symbols
+    end
   end
 end
 

data/lib/voodoo/compiler.rb

@@ -1,3 +1,4 @@
+require 'voodoo/error'
 require 'voodoo/parser'
 
 module Voodoo
@@ -9,7 +10,7 @@ module Voodoo
   # An example of its usage can be found on the main page for the
   # Voodoo module.
   class Compiler
-    class Error < StandardError
+    class Error < Voodoo::Error
       def initialize errors
         @errors = errors
       end
@@ -54,6 +55,9 @@ module Voodoo
             @generator.add section, statement
           end
 
+        rescue CodeGenerator::Error => e
+          errors << e
+
         rescue Parser::MultipleErrors => e
           errors.concat e.errors
 

data/lib/voodoo/config.rb

@@ -2,7 +2,7 @@ module Voodoo
   # Methods to get and set configuration parameters
   module Config
     IMPLEMENTATION_NAME = 'Voodoo Compiler'
-    IMPLEMENTATION_VERSION = '1.1.2'
+    IMPLEMENTATION_VERSION = '1.1.3'
 
     # Class that holds configuration parameters
     class Configuration
@@ -38,7 +38,7 @@ module Voodoo
         case arch
         when 'x86_64', 'amd64'
           :amd64
-        when 'arm'
+        when /^arm/
           :arm
         when 'i386', 'i686'
           :i386

data/lib/voodoo/error.rb

@@ -0,0 +1,5 @@
+module Voodoo
+  # Base class of errors raised by the Voodoo Compiler.
+  class Error < StandardError
+  end
+end

data/lib/voodoo/generators/amd64_nasm_generator.rb

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

data/lib/voodoo/generators/arm_gas_generator.rb

@@ -99,7 +99,6 @@ module Voodoo
       @frame_offset = 0
       @frame_size = 0
       @function_end_label = nil
-      @imports = Set.new
       @if_labels = []
       @saved_registers = []       # registers we've saved in the current frame
       @saved_size = 0             # bytes dedicated to saved registers
@@ -338,6 +337,11 @@ module Voodoo
       @constants = []
     end
 
+    # Declares symbols to be exported.
+    def emit_export *symbols
+      symbols.each { |sym| emit ".globl #{sym}\n" }
+    end
+
     # Emit function prologue.
     def emit_function_prologue formals = [], nlocals = 0
       # Calculate the number of arguments we were passed in
@@ -443,13 +447,13 @@ module Voodoo
       case op
       when :div
         func = :"__aeabi_idiv"
-        import func unless @imports.member? func
+        import func unless @relocated_symbols.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.member? func
+        import func unless @relocated_symbols.member? func
         call func, expr[1], expr[2]
         emit "cpy #{register}, r1\n" if register != :r1
         return
@@ -543,11 +547,6 @@ module Voodoo
       end
     end
 
-    # Export symbols from the current section
-    def export *symbols
-      symbols.each { |sym| emit ".globl #{sym}\n" }
-    end
-
     # Load byte from _base_ + _offset_ into _register_
     def get_byte base, offset, register
       # If base is an integer, but offset isn't, swap them
@@ -656,13 +655,6 @@ module Voodoo
       common_if :ifne, x, y
     end
 
-    # Import labels into the current section
-    def import *symbols
-      # Record imported labels in @imports and @symbol_tracker
-      @imports.merge symbols
-      @symbol_tracker.define *symbols
-    end
-
     # Introduce a new local variable
     def let symbol, *expr
       n = @environment.locals

data/lib/voodoo/generators/common_code_generator.rb

@@ -295,6 +295,13 @@ module Voodoo
       @sections[real_section_name(@section)] << code
     end
 
+    # Emits code for an import incantation. For some targets, no code actually
+    # need be emitted, so the default implementation of this method does
+    # nothing.
+    def emit_import *symbols
+      # No need to emit anything.
+    end
+ 
     # Emits a label.
     def emit_label name
       emit "#{name}:\n"
@@ -308,11 +315,21 @@ module Voodoo
     # Declares that the given symbols are to be externally visible.
     # Requires subclasses to implement emit_export.
     def export *symbols
-      if real_section_name(section) == ".data"
-        @relocated_symbols.merge symbols
+      used_earlier = symbols_used_unrelocated symbols
+      # Exporting symbols after they have been used is not allowed.
+      error = nil
+      unless used_earlier.empty?
+        error = CodeGenerator::SymbolsExportedAfterUseError.new(used_earlier)
+      end
+      begin
+        if real_section_name(section) == ".data"
+          @relocated_symbols.merge symbols
+        end
+        @symbol_tracker.use *symbols
+        emit_export *symbols
+      ensure
+        raise error unless error == nil
       end
-      @symbol_tracker.use *symbols
-      emit_export *symbols
     end
 
     # Adds a function to the current section.
@@ -330,13 +347,24 @@ module Voodoo
     end
 
     # Declares that the given symbols are imported from an external object.
-    # Requires subclasses to implement emit_import.
+    # This function calls emit_import to actually emit code for the import
+    # statements. The default implementation of emit_import does nothing,
+    # so targets where code is required for imports will want to override
+    # emit_import.
     def import *symbols
-      if real_section_name(section) == ".data"
+      used_earlier = symbols_used_unrelocated symbols
+      # Importing symbols after they have been used is not allowed.
+      error = nil
+      unless used_earlier.empty?
+        error = CodeGenerator::SymbolsImportedAfterUseError.new(used_earlier)
+      end
+      begin
         @relocated_symbols.merge symbols
+        @symbol_tracker.define *symbols
+        emit_import *symbols
+      ensure
+        raise error unless error == nil
       end
-      @symbol_tracker.define *symbols
-      emit_import *symbols
     end
 
     # Executes a block of code using the given section as the current section.
@@ -722,5 +750,13 @@ module Voodoo
       end
       max
     end
+
+    # Given symbols, returns the set of symbols among those that
+    # have been used without relocation.
+    def symbols_used_unrelocated symbols
+      symbols_set = symbols.kind_of?(Set) ? symbols : Set.new(symbols)
+      new_symbols = symbols_set - @relocated_symbols
+      @symbol_tracker.used_symbols & new_symbols      
+    end
   end
 end

data/lib/voodoo/generators/mips_gas_generator.rb

@@ -136,7 +136,6 @@ module Voodoo
       @TEMPORARIES = [:'$8', :'$9', :'$10', :'$11',
                       :'$12', :'$13', :'$14', :'$15']
       @function_end_label = nil
-      @imports = {}
       @if_labels = []
       super params
       @output_file_suffix = '.s'
@@ -282,7 +281,7 @@ module Voodoo
       # Load function address
       if global? func
         @symbol_tracker.use func
-        if @imports.has_key? func
+        if @relocated_symbols.include? func
           # Load address from global offset table
           emit "lw #{@FUNCTION}, %call16(#{func})(#{@GOT})\n"
         else
@@ -395,12 +394,6 @@ module Voodoo
       end
     end
 
-    # Imports labels into the current section.
-    def emit_import *symbols
-      # Record imported labels in @imports
-      symbols.each { |sym| @imports[sym] = sym }
-    end
-
     # Emits a label type annotation.
     def emit_label_type name, type
       type_map = {
@@ -689,6 +682,7 @@ module Voodoo
           return register
         else
           # Assume global
+          @symbol_tracker.use x
           if @relocated_symbols.include? x
             emit "lw #{register}, %got(#{x})(#{@GOT})\n"
           else
@@ -920,7 +914,7 @@ module Voodoo
 
       # Load function address
       if global? func
-        if @imports.has_key? func
+        if @relocated_symbols.include? func
           # Load address from global offset table
           emit "lw #{@FUNCTION}, %call16(#{func})(#{@GOT})\n"
         else

data/lib/voodoo/generators/nasm_generator.rb

@@ -35,12 +35,11 @@ module Voodoo
     #
 
     # Export symbols from the current section
-    def export *symbols
+    def emit_export *symbols
       case real_section_name(section)
       when ".text"
         symbols.each { |sym| emit "global #{sym}:function\n" }
       else
-        @relocated_symbols.merge symbols
         symbols.each { |sym| emit "global #{sym}:data #{sym}.end-#{sym}\n" }
       end
     end
@@ -53,12 +52,8 @@ module Voodoo
       end
     end
 
-    # Import labels into the current section
-    def import *symbols
-      @symbol_tracker.define *symbols
-      if real_section_name(section) != ".text"
-        @relocated_symbols.merge symbols
-      end
+    # Emits code to declare symbols as imported from an external object.
+    def emit_import *symbols
       emit "extern #{symbols.join ', '}\n"
     end
 

data/lib/voodoo/parser.rb

@@ -22,7 +22,7 @@ module Voodoo
   class Parser
     NUMBER_STARTER = /\d|-/
     STRING_STARTER = '"'
-    SYMBOL_STARTER = /[[:alpha:]]|\\/
+    SYMBOL_STARTER = /[[:alpha:]]|_|\\/
     
     # Creates a parser using the specified object as input.
     # The input object must support a method +getc+, which must
@@ -41,7 +41,7 @@ module Voodoo
     # This provides methods to get the name of the input being processed,
     # as well as the start_line, start_column, and text of the code
     # that triggered the error.
-    class Error < StandardError
+    class Error < Voodoo::Error
       def initialize message, input_name, start_line, start_column, text
         super message
         @input_name = input_name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voodoo
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2013-12-01 00:00:00.000000000 Z
 dependencies: []
 description: ! 'The Voodoo compiler is an implementation of the Voodoo programming
 
@@ -30,27 +30,28 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/voodooc
-- lib/voodoo.rb
-- lib/voodoo/parser.rb
-- lib/voodoo/generators/mips_elf_generator.rb
-- lib/voodoo/generators/common_code_generator.rb
-- lib/voodoo/generators/nasm_elf_generator.rb
-- lib/voodoo/generators/amd64_nasm_generator.rb
-- lib/voodoo/generators/gas_elf_generator.rb
-- lib/voodoo/generators/i386_nasm_generator.rb
+- lib/voodoo/symbol_tracker.rb
 - lib/voodoo/generators/arm_gas_generator.rb
-- lib/voodoo/generators/nasm_generator.rb
 - lib/voodoo/generators/mips_gas_generator.rb
+- lib/voodoo/generators/common_code_generator.rb
+- lib/voodoo/generators/mips_elf_generator.rb
 - lib/voodoo/generators/dummy_generator.rb
-- lib/voodoo/generators/arm_elf_generator.rb
 - lib/voodoo/generators/amd64_elf_generator.rb
+- lib/voodoo/generators/arm_elf_generator.rb
 - lib/voodoo/generators/i386_elf_generator.rb
+- lib/voodoo/generators/i386_nasm_generator.rb
+- lib/voodoo/generators/amd64_nasm_generator.rb
+- lib/voodoo/generators/nasm_generator.rb
 - lib/voodoo/generators/command_postprocessor.rb
+- lib/voodoo/generators/gas_elf_generator.rb
+- lib/voodoo/generators/nasm_elf_generator.rb
+- lib/voodoo/parser.rb
+- lib/voodoo/config.rb
+- lib/voodoo/error.rb
+- lib/voodoo/validator.rb
 - lib/voodoo/code_generator.rb
 - lib/voodoo/compiler.rb
-- lib/voodoo/validator.rb
-- lib/voodoo/config.rb
-- lib/voodoo/symbol_tracker.rb
+- lib/voodoo.rb
 homepage: http://inglorion.net/software/voodoo/
 licenses: []
 post_install_message: