voodoo 1.1.3 → 1.1.4

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.3'
+    IMPLEMENTATION_VERSION = '1.1.4'
 
     # Class that holds configuration parameters
     class Configuration

data/lib/voodoo/generators/amd64_nasm_generator.rb

@@ -162,13 +162,14 @@ module Voodoo
       end
       # Call function
       with_temporary do |temporary|
-        value_ref = load_value func, temporary
-        emit "xor rax, rax\n"
-        # If value_ref is a symbol, use PLT-relative addressing
+        # If func is a global, use PLT-relative addressing
         if global?(func)
           @symbol_tracker.use func
+          emit "xor rax, rax\n"
           emit "call #{func} wrt ..plt\n"
         else
+          value_ref = load_value func, temporary
+          emit "xor rax, rax\n"
           emit "call #{value_ref}\n"
         end
       end
@@ -181,14 +182,8 @@ module Voodoo
     # Ends a function body.
     def end_function
       label @function_end_label
-      # Restore saved registers
-      @saved_registers.each_with_index do |register,i|
-        ref = offset_reference saved_local_offset(i)
-        emit "mov #{register}, #{ref}\n"
-      end
-      # Destroy frame.
+      restore_saved_registers
       emit "leave\n"
-      # Return.
       emit "ret\n"
       if @environment == @top_level
         raise "Cannot end function when not in a function"
@@ -197,6 +192,14 @@ module Voodoo
       end
     end
 
+    # Restores saved registers.
+    def restore_saved_registers
+      @saved_registers.each_with_index do |register,i|
+        ref = offset_reference saved_local_offset(i)
+        emit "mov #{register}, #{ref}\n"
+      end
+    end
+
     # Returns from a function.
     def ret *words
       eval_expr words, @AX unless words.empty?
@@ -266,13 +269,16 @@ module Voodoo
         end
 
         # Tail call
-        func_ref = load_value func, @BX
-        emit "leave\n"
-        set_register @AX, 0
-        # If func_ref is a symbol, use PLT-relative addressing
-        if global?(func)
-          emit "jmp #{func_ref} wrt ..plt\n"
-        else
+        with_temporary do |temporary|
+          # If func is a global, use PLT-relative addressing
+          if global?(func)
+            func_ref = "#{func} wrt ..plt\n"
+          else
+            func_ref = load_value func, temporary
+          end
+          restore_saved_registers
+          emit "leave\n"
+          set_register @AX, 0
           emit "jmp #{func_ref}\n"
         end
       end

data/lib/voodoo/generators/arm_gas_generator.rb

@@ -72,6 +72,7 @@ module Voodoo
   #
   class ARMGasGenerator < CommonCodeGenerator
     def initialize params
+      @BYTES_PER_INSTRUCTION = 4
       @WORDSIZE_BITS = 2
       @WORDSIZE = 1 << @WORDSIZE_BITS
       @CODE_ALIGNMENT = 4
@@ -90,12 +91,15 @@ module Voodoo
       @SAVED_FRAME_LAYOUT = {}
       @SAVE_FRAME_REGISTERS.each_with_index { |r,i| @SAVED_FRAME_LAYOUT[r] = i }
       @INITIAL_FRAME_SIZE = 2 * @WORDSIZE
+      @MAX_CONSTANT_POOL_OFFSET = 4096
       @NREGISTER_ARGS = 4
       @NREGISTER_LOCALS = @LOCAL_REGISTERS.length
       @FP = :r11
       @RETURN = :r0
       @TEMPORARIES = [:r12, :r3, :r2, :r1]
-      @constants = []
+      @bytes_emitted_since_constants = 0
+      @constants = {}
+      @emitting_constants = false
       @frame_offset = 0
       @frame_size = 0
       @function_end_label = nil
@@ -114,9 +118,13 @@ module Voodoo
     # returning the label that will refer to the constant.
     # The value may be an integer or a label.
     def add_constant value
-      label = gensym
-      @constants << [label, value]
-      label
+      # If the value is already in the constant pool, return its label.
+      # Else, add it to the pool with a new label and return that label.
+      @constants.fetch(value) do |value|
+        label = gensym
+        @constants[value] = label
+        label
+      end
     end
 
     # Returns the fp-relative offset for the nth (0-based) argument.
@@ -322,6 +330,22 @@ module Voodoo
       emit_constants if ret
     end
 
+    alias :_common_emit :emit
+
+    # Adds code to the current section.
+    def emit code
+      _common_emit code
+      if real_section_name(@section) == '.text'
+        @bytes_emitted_since_constants = @bytes_emitted_since_constants +
+          @BYTES_PER_INSTRUCTION
+        if !@emitting_constants &&
+            (@bytes_emitted_since_constants + @WORDSIZE * @constants.length) >
+            @MAX_CONSTANT_POOL_OFFSET - 2 * @BYTES_PER_INSTRUCTION
+          emit_constants_with_goto
+        end
+      end
+    end
+
     # Aligns on the next multiple of +n+ bytes.
     def emit_align n
       emit ".align #{n}\n"
@@ -330,11 +354,31 @@ module Voodoo
     # Writes any constants that need to be written to the instruction
     # stream, and clears the list of constants that need to be written.
     def emit_constants
-      @constants.each do |x|
-        label x[0]
-        word x[1]
+      old_emitting_constants = @emitting_constants
+      begin
+        @emitting_constants = true
+        @constants.each do |value,l|
+          label l
+          word value
+        end
+        @constants = {}
+        @bytes_emitted_since_constants = 0
+      ensure
+        @emitting_constants = old_emitting_constants
+      end
+    end
+
+    # Emits constants, and code that jumps over the constants pool.
+    def emit_constants_with_goto
+      old_emitting_constants = @emitting_constants
+      begin
+        @emitting_constants = true
+        lbl = gensym
+        goto lbl
+        label lbl
+      ensure
+        @emitting_constants = old_emitting_constants
       end
-      @constants = []
     end
 
     # Declares symbols to be exported.
@@ -408,9 +452,7 @@ module Voodoo
 
         # If we need to emit constants, do so now
         unless @constants.empty?
-          lbl = gensym
-          goto lbl
-          label lbl
+          emit_constants_with_goto
         end
       end
 

data/lib/voodoo/generators/mips_gas_generator.rb

@@ -686,7 +686,7 @@ module Voodoo
           if @relocated_symbols.include? x
             emit "lw #{register}, %got(#{x})(#{@GOT})\n"
           else
-            emit "lui #{register}, %hi(#{x})\n"
+            emit "lw #{register}, %got(#{x})(#{@GOT})\n"
             emit "addiu #{register}, %lo(#{x})\n"
           end
           return register

data/lib/voodoo/generators/nasm_generator.rb

@@ -281,60 +281,60 @@ module Voodoo
     end
 
     # Create a value reference to an address.
-    # Invoking this code may clobber @BX and/or @CX
+    # Invoking this code may use a temporary and/or clobber @CX
     def load_address base, offset, scale
-      base_ref = load_value base, @BX
-      offset_ref = load_value offset, @CX
+      with_temporary do |temporary|
+        base_ref = load_value base, temporary
+        offset_ref = load_value offset, @CX
 
-      if offset_ref == 0
-        if integer? base_ref
-          # Only an integer base
-          "[#{base_ref}]"
-        else
-          # Some complex base; load in @BX
-          emit "mov #{@BX}, #{base_ref}\n"
-          "[#{@BX}]"
-        end
-      elsif base_ref == 0
-        if integer? offset_ref
-          # Only a scaled offset
-          "[#{offset_ref.to_i * scale}]"
-        else
-          # Some complex offset; load in @CX
-          emit "mov #{@CX}, #{offset_ref}\n"
-          "[#{@CX} * #{scale}]"
-        end
-      elsif integer? base_ref
-        if integer? offset_ref
-          # All integers, combine them together
-          "[#{base_ref.to_i + (offset_ref.to_i * scale)}]"
+        if offset_ref == 0
+          if integer? base_ref
+            # Only an integer base
+            "[#{base_ref}]"
+          else
+            # Some complex base; load in temporary
+            emit "mov #{temporary}, #{base_ref}\n"
+            "[#{temporary}]"
+          end
+        elsif base_ref == 0
+          if integer? offset_ref
+            # Only a scaled offset
+            "[#{offset_ref.to_i * scale}]"
+          else
+            # Some complex offset; load in @CX
+            emit "mov #{@CX}, #{offset_ref}\n"
+            "[#{@CX} * #{scale}]"
+          end
+        elsif integer? base_ref
+          if integer? offset_ref
+            # All integers, combine them together
+            "[#{base_ref.to_i + (offset_ref.to_i * scale)}]"
+          else
+            # Complex offset; use @CX
+            emit "mov #{@CX}, #{offset_ref}\n"
+            "[#{base_ref} + #{@CX} * #{scale}]"
+          end
+        elsif integer? offset_ref
+          # Complex base, integer offset; use temporary
+          emit "mov #{temporary}, #{base_ref}\n"
+          "[#{temporary} + #{offset_ref.to_i * scale}]"
         else
-          # Complex offset; use @CX
+          # Both base and offset are complex
+          # Use both temporary and @CX
+          emit "mov #{temporary}, #{base_ref}\n"
           emit "mov #{@CX}, #{offset_ref}\n"
-          "[#{base_ref} + #{@CX} * #{scale}]"
+          "[#{temporary} + #{@CX} * #{scale}]"
         end
-      elsif integer? offset_ref
-        # Complex base, integer offset; use @BX
-        emit "mov #{@BX}, #{base_ref}\n"
-        "[#{@BX} + #{offset_ref.to_i * scale}]"
-      else
-        # Both base and offset are complex
-        # Use both @BX and @CX
-        emit "mov #{@BX}, #{base_ref}\n"
-        emit "mov #{@CX}, #{offset_ref}\n"
-        "[#{@BX} + #{@CX} * #{scale}]"
       end
     end
 
     # Load the value at the given address.
-    # Invoking this code may clobber @BX.
     def load_at address, reg
-      if integer?(address) || (global?(address) && 
-                               !@relocated_symbols.include?(address))
+      if integer?(address)
         "[#{address}]"
       else
-        load_value_into_register address, @BX
-        "[#{@BX}]"
+        load_value_into_register address, reg
+        "[#{reg}]"
       end
     end
 
@@ -415,8 +415,10 @@ module Voodoo
           eval_expr words, @environment[target]
         else
           eval_expr words, @RETURN_REG
-          target_ref = load_value target, @BX
-          emit "mov #{target_ref}, #{@RETURN_REG}\n"
+          with_temporary do |temporary|
+            target_ref = load_value target, temporary
+            emit "mov #{target_ref}, #{@RETURN_REG}\n"
+          end
         end
       end
     end
@@ -448,8 +450,10 @@ module Voodoo
     # Divide x by y and store the quotient in target
     def div target, x, y
       eval_div x, y
-      target_ref = load_value target, @BX
-      emit "mov #{target_ref}, #{@AX}\n"
+      with_temporary do |temporary|
+        target_ref = load_value target, temporary
+        emit "mov #{target_ref}, #{@AX}\n"
+      end
     end
 
     # Divide target by x and store the quotient in target
@@ -460,8 +464,10 @@ module Voodoo
     # Divide x by y and store the remainder in target
     def mod target, x, y
       eval_div x, y
-      target_ref = load_value target, @BX
-      emit "mov #{target_ref}, #{@DX}\n"
+      with_temporary do |temporary|
+        target_ref = load_value target, temporary
+        emit "mov #{target_ref}, #{@DX}\n"
+      end
     end
 
     # Divide target by x and store the remainder in target
@@ -472,8 +478,10 @@ module Voodoo
     # Multiply x by y and store the result in target
     def mul target, x, y
       eval_mul x, y
-      target_ref = load_value target, @BX
-      emit "mov #{target_ref}, #{@RETURN_REG}\n"      
+      with_temporary do |temporary|
+        target_ref = load_value target, temporary
+        emit "mov #{target_ref}, #{@RETURN_REG}\n"
+      end
     end
 
     # Multiply target by x and store the result in target
@@ -494,8 +502,8 @@ module Voodoo
         emit "mov #{@DX}, #{@AX}\n"
         emit "sar #{@DX}, #{@WORDSIZE * 8 - 1}\n"
         if immediate_operand?(y_ref)
-          set_register @BX, y_ref
-          emit "idiv #{@BX}\n"
+          set_register temporary, y_ref
+          emit "idiv #{temporary}\n"
         else
           emit "idiv #{@WORD_NAME} #{y_ref}\n"
         end
@@ -504,7 +512,7 @@ module Voodoo
 
     # Evaluate an expression.
     # The result is stored in _register_ (@RETURN_REG by default).
-    # The following registers may be clobbered: @AX, @BX, @CX, @DX
+    # The following registers may be clobbered: @AX, @CX, @DX
     def eval_expr words, register = @RETURN_REG
       if words.length == 1
         if words[0] == 0
@@ -569,10 +577,18 @@ module Voodoo
           emit "not #{register}\n"
         else
           if binop?(op)
-            x_ref = load_value words[1], @DX
-            y_ref = load_value words[2], @BX
-            emit "mov #{register}, #{x_ref}\n" unless register == x_ref
-            emit "#{op} #{register}, #{y_ref}\n"
+            with_temporary do |t1|
+              x_ref = load_value words[1], @DX
+              y_ref = load_value words[2], t1
+              if register == y_ref
+                emit "mov #{@DX}, #{x_ref}\n"
+                emit "#{op} #{@DX}, #{y_ref}\n"
+                emit "mov #{register}, #{@DX}\n"
+              else
+                emit "mov #{register}, #{x_ref}\n" unless register == x_ref
+                emit "#{op} #{register}, #{y_ref}\n"
+              end
+            end
           else
             raise "Not a magic word: #{words[0]}"
           end
@@ -585,22 +601,24 @@ module Voodoo
     # a different register can be specified by passing
     # a third argument.
     def eval_mul x, y, register = @AX
-      x_ref = load_value x, @DX
-      y_ref = load_value y, @BX
+      with_temporary do |t1|
+        x_ref = load_value x, @DX
+        y_ref = load_value y, t1
 
-      if immediate_operand? x_ref
-        if immediate_operand? y_ref
-          set_register register, x_ref * y_ref
+        if immediate_operand? x_ref
+          if immediate_operand? y_ref
+            set_register register, x_ref * y_ref
+          else
+            emit "imul #{register}, #{y_ref}, #{x_ref}\n"
+          end
+        elsif immediate_operand? y_ref
+          emit "imul #{register}, #{x_ref}, #{y_ref}\n"
+        elsif y_ref != register
+          emit "mov #{register}, #{x_ref}\n" unless x_ref == register
+          emit "imul #{register}, #{y_ref}\n"
         else
-          emit "imul #{register}, #{y_ref}, #{x_ref}\n"
+          emit "imul #{register}, #{x_ref}\n"
         end
-      elsif immediate_operand? y_ref
-        emit "imul #{register}, #{x_ref}, #{y_ref}\n"
-      elsif y_ref != register
-        emit "mov #{register}, #{x_ref}\n" unless x_ref == register
-        emit "imul #{register}, #{y_ref}\n"
-      else
-        emit "imul #{register}, #{x_ref}\n"
       end
     end
 

metadata

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