voodoo 0.5.0 → 0.6.1

data/lib/voodoo/generators/nasm_elf_generator.rb

@@ -8,12 +8,17 @@ module Voodoo
     def initialize nasmgenerator, nasm_extra_args
       @nasmgenerator = nasmgenerator
       @nasm_extra_args = nasm_extra_args
+      @output_file_suffix = '.o'
     end
 
     include CommandPostProcessor
 
     def output_file_name input_name
-      input_name.sub(/\.voo$/, '') + '.o'
+      input_name.sub(/\.voo$/, '') + @output_file_suffix
+    end
+
+    def output_file_suffix
+      @output_file_suffix
     end
 
     # Writes the generated code to the given IO handle

data/lib/voodoo/generators/nasm_generator.rb

@@ -26,18 +26,13 @@ module Voodoo
     def initialize params = {}
       super params
       @if_labels = []
+      @output_file_suffix = '.asm'
     end
 
     #
     # == Information About the Generator
     #
 
-    # Given an input file name, returns the canonical output file name
-    # for this code generator.
-    def output_file_name input_name
-      input_name.sub(/\.voo$/, '') + '.asm'
-    end    
-
     # Returns the number of bits per word for this code generator.
     def wordsize
       @WORDSIZE * 8
@@ -468,7 +463,8 @@ module Voodoo
     def eval_div x, y
       x_ref = load_value_into_register x, @AX
       y_ref = load_value y, @SCRATCH_REG
-      set_register @DX, 0
+      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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: voodoo
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Robbert Haarman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 +01:00
+date: 2010-04-15 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -39,12 +39,13 @@ files:
 - lib/voodoo/generators/amd64_elf_generator.rb
 - lib/voodoo/generators/common_code_generator.rb
 - lib/voodoo/generators/nasm_generator.rb
+- lib/voodoo/generators/mips_elf_generator.rb
+- lib/voodoo/generators/gas_elf_generator.rb
 - lib/voodoo/generators/amd64_nasm_generator.rb
 - lib/voodoo/generators/mips_gas_generator.rb
 - lib/voodoo/generators/generator_api1.rb
 - lib/voodoo/generators/i386_nasm_generator.rb
 - lib/voodoo/generators/command_postprocessor.rb
-- lib/voodoo/generators/gas_generator.rb
 - lib/voodoo/generators/nasm_elf_generator.rb
 - lib/voodoo/generators/i386_elf_generator.rb
 has_rdoc: true

data/lib/voodoo/generators/gas_generator.rb

@@ -1,91 +0,0 @@
-require 'voodoo/generators/common_code_generator'
-
-module Voodoo
-  # Common base class for code generators that target the GNU assembler
-  class GasGenerator < CommonCodeGenerator
-    def initialize params
-      super params
-    end
-
-    #
-    # == Alignment
-    #
-
-    # Align data on the next _alignment_-byte boundary.
-    # If _alignment_ is not specified, the default data alignment
-    # is used.
-    def align_data alignment = @DATA_ALIGNMENT
-      in_section(:data) { emit ".align #{alignment}" }
-    end
-
-    # Align code on the next _alignment_-byte boundary.
-    # If _alignment_ is not specified, the default code alignment
-    # is used.
-    def align_code alignment = @CODE_ALIGNMENT
-      in_section(:code) { emit ".align #{alignment}" }
-    end
-
-    # Align function on the next _alignment_-byte boundary.
-    # If _alignment_ is not specified, the default function alignment
-    # is used.
-    def align_function alignment = @FUNCTION_ALIGNMENT
-      in_section(:code) { emit ".align #{alignment}" }
-    end
-
-    #
-    # == Data Definition
-    # 
-
-    # Define a byte with the given value
-    def byte value
-      emit ".byte #{value}\n"
-    end
-
-    # Define a string with the given value
-    def string value
-      code = ''
-      value.each_byte do |b|
-        if b >= 32 && b < 128
-          code << b.chr
-        else
-          code << sprintf('\%02x', b)
-        end
-      end
-      emit ".ascii \"#{code}\"\n"
-    end
-
-    # Define a machine word with the given value
-    def word value
-      emit ".word #{value}\n"
-    end
-
-    #
-    # == Information About the Generator
-    #
-
-    # Returns the number of bits per word for this code generator.
-    def wordsize
-      @WORDSIZE * 8
-    end
-
-    #
-    # == Labels
-    #
-
-    # Export symbols from the current section
-    def export *symbols
-      symbols.each { |sym| emit ".globl #{sym}\n" }
-    end
-
-    # Import labels into the current section
-    def import *symbols
-      # nothing
-    end
-
-    # Define a label in the current section
-    def label name
-      emit "#{name}:\n"
-    end
-
-  end
-end