ruby-llvm 2.9.3 → 3.0.0.beta

data/README.rdoc

@@ -20,7 +20,7 @@ ruby-llvm has been tested on Mac OS X 10.6 using the following Ruby interpreters
 If using MRI, ffi >= 1.0.7 is recommended (only ffi >= 1.0.0 is required).
 
 == Requirements
-* LLVM 2.9, including libLLVM-2.9 (compile LLVM with --enable-shared).
+* LLVM 3.0, including libLLVM-3.0 (compile LLVM with --enable-shared).
 * In order to ensure the usability of JIT features (i.e. create_jit_compiler), compile LLVM with --enable-jit as well.
 
 == About version numbers

data/ext/ruby-llvm-support/Rakefile

@@ -3,7 +3,7 @@ require 'ffi'
 
 CC = "g++"
 LLVM_CONFIG = `llvm-config --cxxflags --ldflags --libs all`.gsub("\n"," ")
-OUTPUT = FFI.map_library_name "RubyLLVMSupport-2.9.2"
+OUTPUT = FFI.map_library_name "RubyLLVMSupport-3.0.0"
 OUTPUT_DIR = "../../lib"
 SRC = "support.cpp"
 CLOBBER.include(OUTPUT)

data/ext/ruby-llvm-support/support.cpp

@@ -2,6 +2,7 @@
  * Extended bindings for LLVM.
  */
 
+#include <llvm/ADT/StringRef.h>
 #include <llvm/Support/DynamicLibrary.h>
 
 extern "C" {

data/lib/llvm.rb

@@ -7,6 +7,6 @@ module LLVM
   # @private
   module C
     extend ::FFI::Library
-    ffi_lib ['LLVM-2.9']
+    ffi_lib ['LLVM-3.0']
   end
 end

data/lib/llvm/core.rb

@@ -20,10 +20,16 @@ module LLVM
       :optimize_for_size, 1 << 13,
       :stack_protect,     1 << 14,
       :stack_protect_req, 1 << 15,
+      :alignment,        31 << 16,
       :no_capture,        1 << 21,
       :no_red_zone,       1 << 22,
       :no_implicit_float, 1 << 23,
-      :naked,             1 << 24
+      :naked,             1 << 24,
+      :inline_hint,       1 << 25,
+      :stack_alignment,   7 << 26,
+      :returns_twice,     1 << 29,
+      :uw_table,          1 << 30,
+      :non_lazy_bind,     1 << 31
     ]
 
     enum :opcode, [
@@ -33,7 +39,7 @@ module LLVM
       :switch,          3,
       :indirectbr,      4,
       :invoke,          5,
-      :unwind,          6,
+      # removed 6 due to API changes
       :unreachable,     7,
 
       # Standard Binary Operators
@@ -84,15 +90,24 @@ module LLVM
       :phi,             44,
       :call,            45,
       :select,          46,
-
-      # UserOp1
-      # UserOp2
+      :user_op_1,       47,
+      :user_op_2,       48,
       :vaarg,           49,
       :extractelement,  50,
       :insertelement,   51,
       :shufflevector,   52,
       :extractvalue,    53,
       :insertvalue,     54,
+      
+      # Atomic Operators
+      :fence,           55,
+      :atomic_cmp_xchg, 56,
+      :atomic_rmw,      57,
+      
+      # Exception Handling Operators
+      :resume,          58,
+      :landing_pad,     59,
+      :unwind,          60
     ]
 
     enum :type_kind, [
@@ -108,9 +123,9 @@ module LLVM
       :struct,
       :array,
       :pointer,
-      :opaque,
       :vector,
-      :metadata
+      :metadata,
+      :x86_mmx
     ]
     
     enum :linkage, [
@@ -177,6 +192,11 @@ module LLVM
       :true
     ]
     
+    enum :landing_pad_clause_type, [
+      :catch,
+      :filter
+    ]
+    
     # Error handling
     attach_function :LLVMDisposeMessage, [:pointer], :void
     
@@ -193,13 +213,12 @@ module LLVM
     attach_function :LLVMSetDataLayout, [:pointer, :string], :void
     attach_function :LLVMGetTarget, [:pointer], :string
     attach_function :LLVMSetTarget, [:pointer, :string], :void
-    attach_function :LLVMAddTypeName, [:pointer, :string, :pointer], :int
-    attach_function :LLVMDeleteTypeName, [:pointer, :string], :void
     attach_function :LLVMGetTypeByName, [:pointer, :string], :pointer
     attach_function :LLVMDumpModule, [:pointer], :void
     
     # Types
     attach_function :LLVMGetTypeKind, [:pointer], :type_kind
+    attach_function :LLVMTypeIsSized, [:pointer], :int
     attach_function :LLVMGetTypeContext, [:pointer], :pointer
     
     # Integer types
@@ -241,9 +260,14 @@ module LLVM
     # Struct types
     attach_function :LLVMStructTypeInContext, [:pointer, :pointer, :uint, :int], :pointer
     attach_function :LLVMStructType, [:pointer, :uint, :int], :pointer
+    attach_function :LLVMStructCreateNamed, [:pointer, :string], :pointer
+    attach_function :LLVMGetStructName, [:pointer], :string
+    attach_function :LLVMStructSetBody, [:pointer, :pointer, :uint, :int], :void
     attach_function :LLVMCountStructElementTypes, [:pointer], :uint
     attach_function :LLVMGetStructElementTypes, [:pointer, :pointer], :void
     attach_function :LLVMIsPackedStruct, [:pointer], :int
+    attach_function :LLVMIsOpaqueStruct, [:pointer], :int
+    attach_function :LLVMGetTypeByName, [:pointer, :string], :pointer
     
     # Array, pointer and vector types (sequence types)
     attach_function :LLVMArrayType, [:pointer, :uint], :pointer
@@ -258,17 +282,9 @@ module LLVM
     # All other types
     attach_function :LLVMVoidTypeInContext, [:pointer], :pointer
     attach_function :LLVMLabelTypeInContext, [:pointer], :pointer
-    attach_function :LLVMOpaqueTypeInContext, [:pointer], :pointer
     
     attach_function :LLVMVoidType, [], :pointer
     attach_function :LLVMLabelType, [], :pointer
-    attach_function :LLVMOpaqueType, [], :pointer
-    
-    # Type handles
-    attach_function :LLVMCreateTypeHandle, [:pointer], :pointer
-    attach_function :LLVMRefineType, [:pointer, :pointer], :void
-    attach_function :LLVMResolveTypeHandle, [:pointer], :pointer
-    attach_function :LLVMDisposeTypeHandle, [:pointer], :void
     
     # All values
     attach_function :LLVMTypeOf, [:pointer], :pointer
@@ -485,7 +501,6 @@ module LLVM
     attach_function :LLVMBuildCondBr, [:pointer, :pointer, :pointer, :pointer], :pointer
     attach_function :LLVMBuildSwitch, [:pointer, :pointer, :pointer, :uint], :pointer
     attach_function :LLVMBuildInvoke, [:pointer, :pointer, :pointer, :uint, :pointer, :pointer, :string], :pointer
-    attach_function :LLVMBuildUnwind, [:pointer], :pointer
     attach_function :LLVMBuildUnreachable, [:pointer], :pointer
     
     # Switch instruction

data/lib/llvm/core/builder.rb

@@ -117,13 +117,6 @@ module LLVM
           fun, args, args.size, normal, exception, name))
     end
 
-    # Builds an unwind Instruction.
-    # @return [LLVM::Instruction]
-    # @LLVMinst unwind
-    def unwind
-      Instruction.from_ptr(C.LLVMBuildUnwind(self))
-    end
-
     # Generates an instruction with no defined semantics. Can be used to
     # provide hints to the optimizer.
     # @return [LLVM::Instruction]

data/lib/llvm/core/context.rb

@@ -1,7 +1,7 @@
 module LLVM  
   class Context
-    def initialize
-      @ptr = C.LLVMContextCreate()
+    def initialize(ptr = nil)
+      @ptr = ptr || C.LLVMContextCreate()
     end
 
     # @private

data/lib/llvm/core/module.rb

@@ -42,11 +42,6 @@ module LLVM
         @module = mod
       end
       
-      # Adds the given Type to the collection with the given name (symbol or string).
-      def add(name, type)
-        C.LLVMAddTypeName(@module, name.to_s, type)
-      end
-      
       # Returns the Type with the given name (symbol or string).
       def named(name)
         Type.from_ptr(C.LLVMGetTypeByName(@module, name.to_s))
@@ -149,7 +144,7 @@ module LLVM
       
       # Adds a Function with the given name (symbol or string) and args (Types).
       def add(name, *args)
-        if args.first.kind_of? Type
+        if args.first.kind_of? FunctionType
           type = args.first
         else
           type = Type.function(*args)

data/lib/llvm/core/type.rb

@@ -57,6 +57,11 @@ module LLVM
       Type.pointer(self, address_space)
     end
     
+    # Returns the name of the struct type.
+    def name
+      C.LLVMGetStructName(self)
+    end
+    
     # @private
     def self.from_ptr(ptr)
       return if ptr.null?
@@ -90,11 +95,17 @@ module LLVM
     end
     
     # Creates a struct type with the given array of element types.
-    def self.struct(elt_types, is_packed)
+    def self.struct(elt_types, is_packed, name = nil)
       elt_types.map! { |ty| LLVM::Type(ty) }
       elt_types_ptr = FFI::MemoryPointer.new(FFI.type_size(:pointer) * elt_types.size)
       elt_types_ptr.write_array_of_pointer(elt_types)
-      from_ptr(C.LLVMStructType(elt_types_ptr, elt_types.size, is_packed ? 1 : 0))
+      if name
+        struct = from_ptr(C.LLVMStructCreateNamed(Context.global, name))
+        C.LLVMStructSetBody(struct, elt_types_ptr, elt_types.size, is_packed ? 1 : 0)
+        struct
+      else
+        from_ptr(C.LLVMStructType(elt_types_ptr, elt_types.size, is_packed ? 1 : 0))
+      end
     end
 
     # Creates a void type.
@@ -102,21 +113,12 @@ module LLVM
       from_ptr(C.LLVMVoidType)
     end
     
-    # Creates an opaque type.
-    def self.opaque
-      from_ptr(C.LLVMOpaqueType)
-    end
-    
     def self.rec
       h = opaque
       ty = yield h
       h.refine(ty)
       ty
     end
-    
-    def refine(ty)
-      C.LLVMRefineType(self, ty)
-    end
   end
 
   class IntType < Type
@@ -163,7 +165,12 @@ module LLVM
   
   # Shortcut to Type.struct.
   def Struct(*elt_types)
-    LLVM::Type.struct(elt_types, false)
+    name = if elt_types.last.is_a? String
+      elt_types.pop
+    else
+      nil
+    end
+    LLVM::Type.struct(elt_types, false, name)
   end
 
   # Shortcut to Type.void.

data/lib/llvm/execution_engine.rb

@@ -45,11 +45,14 @@ module LLVM
     attach_function :LLVMInitializeX86TargetInfo, [], :void
 
     attach_function :LLVMInitializeX86Target, [], :void
+
+    attach_function :LLVMInitializeX86TargetMC, [], :void
   end
 
   def LLVM.init_x86
     LLVM::C.LLVMInitializeX86Target
     LLVM::C.LLVMInitializeX86TargetInfo
+    LLVM::C.LLVMInitializeX86TargetMC
   end
 
   class JITCompiler

data/lib/llvm/support.rb

@@ -7,7 +7,7 @@ module LLVM
                       File.join(
                         File.dirname(__FILE__),
                         '../',
-                        FFI.map_library_name('RubyLLVMSupport-2.9.2')))
+                        FFI.map_library_name('RubyLLVMSupport-3.0.0')))
       ffi_lib [support_lib]
       attach_function :LLVMLoadLibraryPermanently, [:string], :int
     end

data/lib/llvm/version.rb

@@ -1,4 +1,4 @@
 module LLVM
-  LLVM_VERSION = "2.9"
-  RUBY_LLVM_VERSION = "2.9.3"
+  LLVM_VERSION = "3.0"
+  RUBY_LLVM_VERSION = "3.0.0.beta"
 end

data/test/equality_test.rb

@@ -74,9 +74,9 @@ class EqualityTestCase < Test::Unit::TestCase
   def test_function
     mod = LLVM::Module.new('test')
 
-    fn1 = mod.functions.add('test1', LLVM.Void)
+    fn1 = mod.functions.add('test1', [], LLVM.Void)
     fn2 = LLVM::Function.from_ptr(fn1.to_ptr)
-    fn3 = mod.functions.add('test2', LLVM.Void)
+    fn3 = mod.functions.add('test2', [], LLVM.Void)
     fn4 = MyFunction.from_ptr(fn1.to_ptr)
 
     assert_equalities :equal     => [fn1, fn2, fn4],

data/test/struct_test.rb

@@ -13,6 +13,12 @@ class StructTestCase < Test::Unit::TestCase
     struct = LLVM::Struct(LLVM::Int, LLVM::Float)
     assert_instance_of LLVM::Type, struct
   end
+  
+  def test_named_struct
+    struct = LLVM::Struct(LLVM::Int, LLVM::Float, "struct100")
+    assert_instance_of LLVM::Type, struct
+    assert_equal "struct100", struct.name
+  end
 
   def test_unpacked_constant_struct_from_size
     struct = LLVM::ConstantStruct.const(2, LLVM_UNPACKED) { |i| LLVM::Int(i) }

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: ruby-llvm
 version: !ruby/object:Gem::Version
-  version: 2.9.3
-  prerelease: 
+  version: 3.0.0.beta
+  prerelease: 6
 platform: ruby
 authors:
 - Jeremy Voorhis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-21 00:00:00.000000000 Z
+date: 2012-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &70109058811900 !ruby/object:Gem::Requirement
+  requirement: &70123470125560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70109058811900
+  version_requirements: *70123470125560
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70109058811480 !ruby/object:Gem::Requirement
+  requirement: &70123470125140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70109058811480
+  version_requirements: *70123470125140
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70109058811000 !ruby/object:Gem::Requirement
+  requirement: &70123470124680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70109058811000
+  version_requirements: *70123470124680
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70109058810580 !ruby/object:Gem::Requirement
+  requirement: &70123470124260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70109058810580
+  version_requirements: *70123470124260
 description: LLVM bindings for Ruby
 email: jvoorhis@gmail.com
 executables: []
@@ -120,12 +120,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: LLVM bindings for Ruby