ruby-libjit 0.2.0 → 0.2.1

data/README

@@ -1,5 +1,7 @@
-Ruby-libjit 0.2.0
-Copyright (C) 2008 Paul Brannan
+Ruby-libjit
+:include: VERSION
+
+Copyright (C) 2009 Paul Brannan
 
 Ruby-libjit is a wrapper for the libjit library.  It provides basic
 functionality for jit-compiling functions, including integrating those

data/VERSION

@@ -0,0 +1 @@
+0.2.1

data/ext/jit.c

@@ -182,6 +182,22 @@ static VALUE context_build(VALUE self)
 #endif
 }
 
+static VALUE function_s_compile(int argc, VALUE * argv, VALUE klass);
+
+/* 
+ * call-seq:
+ *   function = context.compile_function(signature) { |f| ... }
+ *
+ * Acquire a lock on the context so it can be used to build a function.
+ */
+static VALUE context_compile_function(VALUE self, VALUE signature)
+{
+  /* TODO: support passing in parent function */
+  VALUE argv[] = { self, signature };
+  int argc = 2;
+  return function_s_compile(argc, argv, rb_cFunction);
+}
+
 /*
  * call-seq:
  *   Context.build { |context| ... }
@@ -259,6 +275,19 @@ static VALUE create_function(int argc, VALUE * argv, VALUE klass)
 
   rb_scan_args(argc, argv, "21", &context_v, &signature_v, &parent_function_v);
 
+  /* Allow the user to specific the signature as a hash */
+  if (TYPE(signature_v) == T_HASH)
+  {
+    signature_v = rb_funcall(
+        rb_cType,
+        rb_intern("create_signature"),
+        1,
+        signature_v);
+  }
+
+  check_type("context", rb_cContext, context_v);
+  check_type("signature", rb_cType, signature_v);
+
   Data_Get_Struct(context_v, struct _jit_context, context);
   Data_Get_Struct(signature_v, struct _jit_type, signature);
 
@@ -1008,7 +1037,7 @@ static VALUE wrap_type(jit_type_t type)
 
 /*
  * call-seq:
- *   type = Type.create_signature(abi, return_type, array_of_param_types)
+ *   type = Type._create_signature(abi, return_type, array_of_param_types)
  *
  * Create a new signature.
  */
@@ -1436,6 +1465,7 @@ void Init_jit()
   rb_cContext = rb_define_class_under(rb_mJIT, "Context", rb_cObject);
   rb_define_singleton_method(rb_cContext, "new", context_s_new, 0);
   rb_define_method(rb_cContext, "build", context_build, 0);
+  rb_define_method(rb_cContext, "compile_function", context_compile_function, 1);
   rb_define_singleton_method(rb_cContext, "build", context_s_build, 0);
 
   rb_cClosure = rb_define_class_under(rb_mJIT, "Closure", rb_cObject);
@@ -1465,7 +1495,7 @@ void Init_jit()
   rb_define_method(rb_cFunction, "compiled?", function_is_compiled, 0);
 
   rb_cType = rb_define_class_under(rb_mJIT, "Type", rb_cObject);
-  rb_define_singleton_method(rb_cType, "create_signature", type_s_create_signature, 3);
+  rb_define_singleton_method(rb_cType, "_create_signature", type_s_create_signature, 3);
   rb_define_singleton_method(rb_cType, "create_struct", type_s_create_struct, 1);
   rb_define_singleton_method(rb_cType, "create_pointer", type_s_create_pointer, 1);
   rb_define_method(rb_cType, "get_offset", type_get_offset, 1);

data/lib/jit.rb

@@ -3,3 +3,4 @@ require 'jit/array'
 require 'jit/function'
 require 'jit/struct'
 require 'jit/value'
+require 'jit/type'

data/lib/jit/type.rb

@@ -0,0 +1,38 @@
+module JIT
+  class Type
+    # Create a new signature.
+    #
+    # call-seq:
+    #   jit = JIT::Type.create_signature(abi, return_type, array_of_param_types)
+    #   jit = JIT::Type.create_signature(array_of_param_types => return_type)
+    #   jit = JIT::Type.create_signature(array_of_param_types => return_type, :abi => abi)
+    def self.create_signature(*args)
+      if args.size == 1 then
+        h = args[0]
+        return_type = nil
+        param_types = nil
+        abi = :CDECL
+        h.each do |k, v|
+          if k == :abi then
+            abi = v
+          else
+            param_types = k
+            return_type = v
+          end
+        end
+
+        if return_type.nil? or param_types.nil? then
+          raise ArgumentError, "Missing return_type and/or param types"
+        end
+
+        return self._create_signature(abi, return_type, param_types)
+
+      elsif args.size == 3 then
+        return self._create_signature(args[0], args[1], args[2])
+
+      else
+        raise ArgumentError, "Wrong number of arguments (expected 3)"
+      end
+    end
+  end
+end

data/sample/fib.rb

@@ -1,11 +1,6 @@
 require 'jit'
 
-fib = nil
-signature = JIT::Type.create_signature(
-    :CDECL,
-    :INT,
-    [ :INT ])
-fib = JIT::Function.build(signature) do |f|
+fib = JIT::Function.build([:INT] => :INT) do |f|
   n = f.param(0)
 
   a = f.value(:INT, 0)

data/sample/simple.rb

@@ -1,15 +1,9 @@
 require 'jit'
 
-function = nil
-JIT::Context.build do |context|
-  signature = JIT::Type.create_signature(
-      JIT::ABI::CDECL,
-      JIT::Type::INT,       # returns an integer
-      [ JIT::Type::INT ])   # and tages an integer as a parameter
-  function = JIT::Function.compile(context, signature) do |f|
-    value = f.get_param(0)
-    f.insn_return(value)
-  end
+multiply = JIT::Function.build([:INT, :INT] => :INT) do |f|
+  lhs = f.param(0)
+  rhs = f.param(1)
+  f.return(lhs * rhs)
 end
 
-p function.apply(42) #=> 42
+p multiply.apply(6, 7) #=> 42

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-libjit
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Paul Brannan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-02 00:00:00 -05:00
+date: 2009-12-04 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -27,6 +27,7 @@ extensions:
 extra_rdoc_files: []
 
 files: 
+- VERSION
 - COPYING
 - LGPL
 - LICENSE
@@ -37,6 +38,7 @@ files:
 - lib/jit/struct.rb
 - lib/jit/pointer.rb
 - lib/jit/value.rb
+- lib/jit/type.rb
 - ext/extconf.rb
 - ext/rubypp.rb
 - ext/jit.c