voodoo 0.7.0 → 1.0.0

data/lib/voodoo/generators/common_code_generator.rb

@@ -1,5 +1,3 @@
-require 'voodoo/generators/generator_api1'
-
 module Voodoo
   # Common base class for code generators.
   #
@@ -8,10 +6,11 @@ module Voodoo
   # - #new
   # - #add
   # - #add_function
+  # - #features
   # - #gensym
+  # - #has_feature?
   # - #output_file_name
   # - #output_file_suffix
-  # - #wordsize
   # - #write
   #
   # This class contains base implementations of some of these methods,
@@ -21,9 +20,6 @@ module Voodoo
   # is provided on the main page of the documentation of the Voodoo module.
   #
   class CommonCodeGenerator
-    # Provide compatibility with old API
-    include GeneratorApi1
-
     # Initializes the code generator.
     # _params_ shall be a hash containing parameters to the code generator,
     # and shall at least contain the keys <tt>:architecture</tt> and
@@ -43,6 +39,9 @@ module Voodoo
       @top_level = Environment.initial_environment
       @environment = @top_level
       @output_file_suffix = '.o'
+      @features = {
+        :voodoo => "1.0"        # Voodoo language version
+      }
     end
 
     # Adds code to the given section.
@@ -158,6 +157,14 @@ module Voodoo
       end
     end
 
+    # Returns a hash describing the features supported by this code generator.
+    # The keys in this hash are the names of the supported features.
+    # The associated values are strings providing additional information about
+    # the feature, such as a version number.
+    def features
+      @features
+    end
+
     # Add a function to the current section
     def function formals, *code
       begin_function *formals
@@ -175,6 +182,12 @@ module Voodoo
       @sections[real_section_name(@section)] << code
     end
 
+    # Returns true if a feature is supported by this generator,
+    # false otherwise.
+    def has_feature? name
+      @features.has_key? name
+    end
+
     # Get the real name of a section.
     # Given a section name which may be an alias, this method returns the
     # real name of the section.

data/lib/voodoo/generators/gas_elf_generator.rb

@@ -5,7 +5,7 @@ module Voodoo
   # Class that generates ELF object files by invoking the GNU assembler on
   # the output of a code generator that generates GNU assembly.
   class GasELFGenerator
-    def initialize asmgenerator, extra_args
+    def initialize asmgenerator, extra_args = ""
       @asmgenerator = asmgenerator
       @extra_args = extra_args
       @output_file_suffix = '.o'
@@ -33,7 +33,7 @@ module Voodoo
       Tempfile.open(base + '.s') do |asmfile|
         Tempfile.open(base + '.o') do |elffile|
           elffile.close
-          # Write assembly code to nsamfile
+          # Write assembly code to asmfile
           @asmgenerator.write asmfile
           asmfile.close
           # Find out the name of the GNU assembler

data/lib/voodoo/generators/i386_nasm_generator.rb

@@ -1,4 +1,5 @@
 require 'voodoo/generators/common_code_generator'
+require 'voodoo/generators/nasm_generator'
 
 module Voodoo
   # = i386 NASM Code Generator
@@ -61,6 +62,10 @@ module Voodoo
       # Stack pointer
       @SP = 'esp'
       super params
+      @features.merge! \
+        :'bits-per-word' => '32',
+        :'byte-order' => 'little-endian',
+        :'bytes-per-word' => '4'
     end
 
     # Call a function
@@ -104,7 +109,7 @@ module Voodoo
       emit "push dword #{value_ref}\n"
     end
 
-    # Call a function, re-using the current call fram if possible
+    # Call a function, re-using the current call frame if possible
     def tail_call fun, *args
       emit "; tail-call #{fun} #{args.join ' '}\n"
       if args.length > @environment.args

data/lib/voodoo/generators/mips_gas_generator.rb

@@ -3,7 +3,7 @@ require 'voodoo/generators/common_code_generator'
 module Voodoo
   # = MIPS GNU Assembler Code Generator
   #
-  # The MIPS code generator generates i386 assembly code for use with
+  # The MIPS code generator generates assembly code for use with
   # the GNU assembler.
   #
   # == Calling Convention
@@ -43,7 +43,7 @@ module Voodoo
   #   empty0    <-- $sp points here
   #
   # The function prologue of functions generated by this code generator
-  # creates activiation frames that look as follows:
+  # creates activation frames that look as follows:
   #
   # :
   # old frame
@@ -117,6 +117,18 @@ module Voodoo
       @if_labels = []
       super params
       @output_file_suffix = '.s'
+      @features.merge! \
+        :'bits-per-word' => '32',
+        :'bytes-per-word' => '4'
+      case @architecture
+      when :mips
+        @features[:'byte-order'] = 'big-endian'
+      when :mipsel
+        @features[:'byte-order'] = 'little-endian'
+      else
+        raise ArgumentError.new("#{self.class} does not support " +
+                                "architecture #{@architecture}")
+      end
     end
 
     def align alignment = nil
@@ -840,8 +852,6 @@ module Voodoo
         ret :call, func, *args
       end
 
-      # TODO
-
       # Back up any stack arguments we will need after we overwrite them
       temporaries = @TEMPORARIES.dup
       nlocals = @environment.locals

data/lib/voodoo/generators/nasm_elf_generator.rb

@@ -35,7 +35,7 @@ module Voodoo
           Tempfile.open(base + '.o') do |elffile|
             begin
               elffile.close
-              # Write NASM code to nsamfile
+              # Write NASM code to nasmfile
               @nasmgenerator.write nasmfile
               nasmfile.close
               # Find out the name of the nasm executable

data/lib/voodoo/generators/nasm_generator.rb

@@ -29,15 +29,6 @@ module Voodoo
       @output_file_suffix = '.asm'
     end
 
-    #
-    # == Information About the Generator
-    #
-
-    # Returns the number of bits per word for this code generator.
-    def wordsize
-      @WORDSIZE * 8
-    end
-
     #
     # == Labels
     #
@@ -415,7 +406,12 @@ module Voodoo
     # Set the byte at _base_ + _offset_ to _value_
     def set_byte base, offset, value
       emit "; set-byte #{base} #{offset} #{value}\n"
-      value_ref = load_value value, @RETURN_REG
+      if immediate_operand?(value)
+        value_ref = value
+      else
+        load_value_into_register value, @RETURN_REG
+        value_ref = "al"
+      end
       addr_ref = load_address base, offset, 1
       emit "mov byte #{addr_ref}, #{value_ref}\n"
     end