voodoo 0.7.0 → 1.0.0

data/bin/voodooc

@@ -24,17 +24,31 @@ Valid options are:
         Select output format. Use -a <architecture> -f help to get a list of
         supported output formats for architecture.
 
+--features
+        Lists the features supported by this implementation. The features
+        are listed in the format <feature name><tab><version>, ordered
+        by feature name. The program exits after printing the list of
+        features; no compilation is performed.
+
+-h
+--help
+        Display usage information and exit. No compilation will be performed.
+
 -o <output file>
 --output <output file>
 --output-file <output file>
         Set output file name. The special name '-' causes voodooc to write
         to standard output.
+
+--version
+        Display version information and exit. No compilation will be performed.
 EOT
 
 input_file = nil
 output_file = nil
 architecture = Voodoo::Config.default_architecture
 output_format = Voodoo::Config.default_format
+show_features = false
 
 #
 # Process command line
@@ -43,8 +57,10 @@ output_format = Voodoo::Config.default_format
 opts = GetoptLong.new(
   ['--help', '-h', GetoptLong::NO_ARGUMENT ],
   ['--arch', '--architecture', '-a', GetoptLong::REQUIRED_ARGUMENT ],
+  ['--features', GetoptLong::NO_ARGUMENT],
   ['--output-file', '--output', '-o', GetoptLong::REQUIRED_ARGUMENT ],
-  ['--output-format', '--format', '-f', GetoptLong::REQUIRED_ARGUMENT ]
+  ['--output-format', '--format', '-f', GetoptLong::REQUIRED_ARGUMENT ],
+  ['--version', GetoptLong::NO_ARGUMENT]
 )
 
 # Process options
@@ -56,10 +72,16 @@ opts.each do |opt, arg|
     exit
   when '--arch'
     architecture = arg.to_sym
+  when '--features'
+    show_features = true
   when '--output-file'
     output_file = arg
   when '--output-format'
     output_format = arg.to_sym
+  when '--version'
+    puts "#{Voodoo::Config::IMPLEMENTATION_NAME} version " +
+      Voodoo::Config::IMPLEMENTATION_VERSION
+    exit
   end
 end
 
@@ -77,19 +99,6 @@ if output_format == :help
   exit
 end
 
-# Get input file name
-if ARGV.length == 1
-  input_file = ARGV[0]
-else
-  if ARGV.length < 1
-    $stderr.puts "no input files"
-  else
-    $stderr.puts "Too many arguments"
-  end
-  $stderr.puts usage
-  exit 0x80
-end
-
 # Select code generator based on output format
 begin
   generator = Voodoo::CodeGenerator.get_generator :architecture => architecture,
@@ -107,6 +116,28 @@ rescue NotImplementedError
   exit 1
 end
 
+# If requested, show features and exit
+if show_features
+  generator.features.to_a.sort{|x,y| x[0].to_s <=> y[0].to_s}.each do |feature|
+    puts "#{feature[0]}\t#{feature[1]}"
+  end
+  exit
+end
+
+# Get input file name
+if ARGV.length == 1
+  input_file = ARGV[0]
+else
+  if ARGV.length < 1
+    $stderr.puts "no input files"
+  else
+    $stderr.puts "Too many arguments"
+  end
+  $stderr.puts usage
+  exit 0x80
+end
+
+
 
 #
 # Compile
@@ -135,11 +166,35 @@ begin
   compiler = Voodoo::Compiler.new parser, generator, outfile
 
   compiler.compile
-rescue
+rescue => e
   if output_file != '-'
     File::unlink(output_file) if File::exists?(output_file)
   end
-  raise
+
+  # If e is a compiler error, iterate over all child errors and
+  # print user-friendly messages. Else, re-raise so that the default
+  # handling is performed.
+  if e.kind_of? Voodoo::Compiler::Error
+    e.errors.each do |error|
+      message = ''
+      if error.start_line != nil
+        message << "#{error.start_line}: "
+        if error.input_name != nil
+          message = "#{error.input_name}:#{message}"
+        else
+          message = "line #{message}"
+        end
+      end
+      message << error.message
+      $stderr.puts message
+      if error.text != nil
+        $stderr.print "\n  #{error.text.gsub("\n", "\n  ")}\n"
+      end
+    end
+    exit 1
+  else
+    raise
+  end
 ensure
   outfile.close
   infile.close

data/lib/voodoo/compiler.rb

@@ -1,3 +1,5 @@
+require 'voodoo/parser'
+
 module Voodoo
   # Voodoo compiler driver.
   # The compiler driver reads input from a parser (see
@@ -7,6 +9,20 @@ module Voodoo
   # An example of its usage can be found on the main page for the
   # Voodoo module.
   class Compiler
+    class Error < StandardError
+      def initialize errors
+        @errors = errors
+      end
+
+      attr_reader :errors
+
+      def message
+        msg = ""
+        @errors.each {|e| msg << e.message << "\n"}
+        msg
+      end
+    end
+
     # Initialize a compiler.
     #
     # Parameters:
@@ -23,23 +39,35 @@ module Voodoo
     # Perform the compilation.
     def compile
       section = :code
+      errors = []
       while true
-        statement = @parser.parse_top_level
-
-        break if statement == nil
-        next if statement.empty?
-
-        case statement[0]
-        when :section
-          section = statement[1]
-        when :function
-          @generator.add section, [:function, statement[1]] + statement[2]
-        else
-          @generator.add section, statement
+        begin
+          statement = @parser.parse_top_level
+
+          break if statement == nil
+          next if statement.empty?
+
+          case statement[0]
+          when :section
+            section = statement[1]
+          else
+            @generator.add section, statement
+          end
+
+        rescue Parser::ParseError => e
+          errors << e
+          if errors.length >= 100
+            raise Error.new(errors)
+          end
         end
+
       end
 
-      @generator.write @output
+      if errors.empty?
+        @generator.write @output
+      else
+        raise Error.new(errors)
+      end
     end
   end
 end

data/lib/voodoo/config.rb

@@ -1,6 +1,9 @@
 module Voodoo
   # Methods to get and set configuration parameters
   module Config
+    IMPLEMENTATION_NAME = 'Voodoo Compiler'
+    IMPLEMENTATION_VERSION = '1.0.0'
+
     # Class that holds configuration parameters
     class Configuration
       def initialize
@@ -35,6 +38,8 @@ module Voodoo
         case arch
         when 'x86_64', 'amd64'
           :amd64
+        when 'arm'
+          :arm
         when 'i386', 'i686'
           :i386
         when 'mips'

data/lib/voodoo/generators/amd64_nasm_generator.rb

@@ -81,6 +81,10 @@ module Voodoo
       # Stack pointer
       @SP = 'rsp'
       super params
+      @features.merge! \
+        :'bits-per-word' => '64',
+        :'byte-order' => 'little-endian',
+        :'bytes-per-word' => '8'
     end
 
     #

data/lib/voodoo/generators/arm_elf_generator.rb

@@ -0,0 +1,33 @@
+require 'delegate'
+require 'tempfile'
+require 'voodoo/generators/arm_gas_generator'
+require 'voodoo/generators/gas_elf_generator'
+
+module Voodoo
+  # Generator that produces ELF objects for arm
+  class ARMELFGenerator < DelegateClass(ARMGasGenerator)
+    def initialize params = {}
+      @asmgenerator = ARMGasGenerator.new params
+      super(@asmgenerator)
+      @elfgenerator = GasELFGenerator.new @asmgenerator
+    end
+
+    def output_file_name input_name
+      @elfgenerator.output_file_name input_name
+    end
+
+    def output_file_suffix
+      @elfgenerator.output_file_suffix
+    end
+
+    def write io
+      @elfgenerator.write io
+    end
+  end
+
+  # Register class for arm
+  Voodoo::CodeGenerator.register_generator ARMELFGenerator,
+                                           :architecture => :arm,
+                                           :format => :elf
+
+end