ruby-libjit 0.2.4 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/ext/extconf.rb

@@ -30,15 +30,6 @@ have_func("rb_errinfo", "ruby.h")
 have_func('fmemopen')
 have_func("rb_ensure", "ruby.h")
 
-if have_header('ruby/node.h') then
-  # ruby.h defines HAVE_RUBY_NODE_H, even though it is not there
-  $defs.push("-DREALLY_HAVE_RUBY_NODE_H")
-elsif have_header('node.h') then
-  # okay
-else
-  $defs.push("-DNEED_MINIMAL_NODE")
-end
-
 have_header('env.h')
 
 checking_for("whether VALUE is a pointer") do

data/ext/jit_ext.c

@@ -14,11 +14,6 @@
 #include <jit/jit-dump.h>
 
 #include "rubyjit.h"
-#include "method_data.h"
-
-#ifdef NEED_MINIMAL_NODE
-#include "minimal_node.h"
-#endif
 
 #ifndef RARRAY_LEN
 #define RARRAY_LEN(a) RARRAY(a)->len
@@ -38,6 +33,8 @@ static VALUE rb_cLabel;
 static VALUE rb_mCall;
 static VALUE rb_cClosure;
 
+static VALUE closures;
+
 jit_type_t jit_type_VALUE;
 jit_type_t jit_type_ID;
 jit_type_t jit_type_Function_Ptr;
@@ -223,8 +220,9 @@ static void mark_closure(struct Closure * closure)
 VALUE closure_to_int(VALUE self)
 {
   struct Closure * closure;
+  VALUE v;
   Data_Get_Struct(self, struct Closure, closure);
-  VALUE v = ULONG2NUM((unsigned long)closure->function_ptr);
+  v = ULONG2NUM((unsigned long)closure->function_ptr);
   return v;
 }
 
@@ -646,7 +644,7 @@ static VALUE function_insn_call(int argc, VALUE * argv, VALUE self)
 
   Data_Get_Struct(self, struct _jit_function, function);
 
-  name = STR2CSTR(name_v);
+  name = StringValuePtr(name_v);
 
   check_type("called function", rb_cFunction, called_function_v);
   Data_Get_Struct(called_function_v, struct _jit_function, called_function);
@@ -712,7 +710,7 @@ static VALUE function_insn_call_native(int argc, VALUE * argv, VALUE self)
   {
     rb_raise(
         rb_eArgError,
-        "Wrong number of arguments passed for %s (expecting %d but got %d)", 
+        "Wrong number of arguments passed for %s (expecting %d but got %zd)", 
         name,
         jit_type_num_params(signature),
         num_args);
@@ -1426,7 +1424,7 @@ static VALUE module_define_jit_method(VALUE klass, VALUE name_v, VALUE function_
   }
   else
   {
-    name = STR2CSTR(name_v);
+    name = StringValuePtr(name_v);
   }
 
   Data_Get_Struct(function_v, struct _jit_function, function);
@@ -1445,9 +1443,15 @@ static VALUE module_define_jit_method(VALUE klass, VALUE name_v, VALUE function_
 
   closure_v = function_to_closure(function_v);
   Data_Get_Struct(closure_v, struct Closure, closure);
-  define_method_with_data(
-      klass, rb_intern(name), RUBY_METHOD_FUNC(closure->function_ptr),
-      arity, closure_v);
+
+  /* TODO: This will leak the closure if the method is ever redefined.
+   * I had a solution to this problem, but it became too convoluted to
+   * maintain.
+   */
+  rb_ary_push(closures, closure_v);
+  rb_define_method(
+      klass, name, RUBY_METHOD_FUNC(closure->function_ptr), arity);
+
   return Qnil;
 }
 
@@ -1460,6 +1464,9 @@ void Init_jit_ext()
 {
   jit_init();
 
+  closures = rb_ary_new();
+  rb_gc_register_address(&closures);
+
   rb_mJIT = rb_define_module("JIT");
 
   rb_cContext = rb_define_class_under(rb_mJIT, "Context", rb_cObject);
@@ -1575,9 +1582,5 @@ void Init_jit_ext()
 
   /* VALUE rb_cModule = rb_define_module(); */
   rb_define_method(rb_cModule, "define_jit_method", module_define_jit_method, 2);
-
-#ifdef NEED_MINIMAL_NODE
-  Init_minimal_node();
-#endif
 }
 

metadata

@@ -1,37 +1,31 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-libjit
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 0.2.5
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 4
-  version: 0.2.4
 platform: ruby
-authors: 
+authors:
 - Paul Brannan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-03 00:00:00 Z
+date: 2012-05-09 00:00:00.000000000 Z
 dependencies: []
+description: ! 'Ruby-libjit is a wrapper for the libjit library.  Libjit is a
 
-description: |
-  Ruby-libjit is a wrapper for the libjit library.  Libjit is a
   lightweight library for building just-in-time compilers.  Ruby-libjit
+
   includes both a wrapper for libjit and a minimal DSL for building loops
+
   and control structures.
 
+'
 email: curlypaul924@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - VERSION
 - COPYING
 - LGPL
@@ -46,14 +40,11 @@ files:
 - lib/jit/pointer.rb
 - ext/extconf.rb
 - ext/rubypp.rb
-- ext/method_data.c
 - ext/jit_ext.c
 - ext/minimal_node.c
 - ext/rubyjit.h
 - ext/minimal_node.h
-- ext/method_data.h
 - ext/insns.inc.rpp
-- ext/method_data.c.rpp
 - sample/simple.rb
 - sample/fib.rb
 - sample/gcd_benchmark.rb
@@ -64,38 +55,29 @@ files:
 - test/test_jit_value.rb
 homepage: http://ruby-libjit.rubyforge.org
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: ruby-libjit
-rubygems_version: 1.7.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A wrapper for the libjit library
-test_files: 
+test_files:
 - test/test_jit_array.rb
 - test/test_jit_pointer.rb
 - test/test_jit_function.rb

data/ext/method_data.c

@@ -1,385 +0,0 @@
-#include "method_data.h"
-
-#include <ruby.h>
-
-#ifndef HAVE_RUBINIUS
-
-
-#if defined(HAVE_NODE_H)
-/* pre-YARV */
-#include <node.h>
-#elif defined(REALLY_HAVE_RUBY_NODE_H)
-/* YARV */
-#include <ruby/node.h>
-#elif defined(RUBY_VM)
-/* YARV without node.h */
-#include "minimal_node.h"
-#else
-/* something else */
-#error "Need node.h"
-#endif
-
-#ifdef HAVE_ENV_H
-/* pre-YARV */
-#include <env.h>
-#endif
-
-#ifdef RUBY_VM
-
-/* YARV */
-
-struct rb_thread_struct
-{   
-    VALUE self;
-    void *vm;
-    VALUE *stack;
-    unsigned long stack_size;
-    VALUE *cfp;
-    /* ... */
-};
-
-typedef struct rb_thread_struct rb_thread_t;
-
-#define CFP_DATA_MEMO_NODE_AND_PC cfp[0]
-#define CFP_METHOD_CLASS cfp[11]
-
-/* On YARV, we store the method data on the stack.  We don't have to pop
- * it off the stack, because the stack pointer will be reset to the
- * previous frame's stack pointer when the function returns.
- */
-static void fix_frame()
-{
-  do {
-    extern rb_thread_t * ruby_current_thread;
-    VALUE * cfp = ruby_current_thread->cfp;
-    CFP_DATA_MEMO_NODE_AND_PC = RBASIC(CFP_METHOD_CLASS)->klass;
-
-    if(rb_type(CFP_DATA_MEMO_NODE_AND_PC) != T_NODE)
-    {
-      /* This can happen for module functions that are created after
-       * the stub function */
-      rb_raise(
-          rb_eRuntimeError,
-          "Cannot find method data for module function");
-    }
-    else
-    {
-      CFP_METHOD_CLASS = RCLASS_SUPER(CFP_METHOD_CLASS);
-    }
-  } while(0);
-}
-
-#define FIX_FRAME() \
-  fix_frame()
-
-static NODE * data_memo_node()
-{
-  extern rb_thread_t * ruby_current_thread;
-  VALUE * cfp = ruby_current_thread->cfp;
-  return (NODE *)CFP_DATA_MEMO_NODE_AND_PC;
-}
-
-#else
-
-/* pre-YARV */
-
-/* Okay to not pop this temporary frame, since it will be popped by the
- * caller
- */
-#define FIX_FRAME() \
-  struct FRAME _frame = *ruby_frame; \
-  _frame.last_class = RCLASS(ruby_frame->last_class)->super; \
-  _frame.prev = ruby_frame; \
-  ruby_frame = &_frame; \
-
-static NODE * data_memo_node()
-{
-  return (NODE *)(RBASIC(ruby_frame->prev->last_class)->klass);
-}
-
-#endif
-
-typedef VALUE (*Method_Func)(ANYARGS);
-
-static Method_Func actual_cfunc()
-{
-  return data_memo_node()->nd_cfnc;
-}
-
-static VALUE data_wrapper_m1(int argc, VALUE * argv, VALUE self)
-{
-  VALUE result;
-  FIX_FRAME();
-  result = (*actual_cfunc())(argc, argv, self);
-  return result;
-}
-
-static VALUE data_wrapper_0(VALUE self)
-{
-  VALUE result;
-  FIX_FRAME();
-  result = (*actual_cfunc())(self);
-  return result;
-}
-
-static VALUE data_wrapper_1(VALUE self, VALUE arg1)
-{
-  VALUE result;
-  FIX_FRAME();
-  result = (*actual_cfunc())(self, arg1);
-  return result;
-}
-static VALUE data_wrapper_2(VALUE self, VALUE arg1, VALUE arg2)
-{
-  VALUE result;
-  FIX_FRAME();
-  result = (*actual_cfunc())(self, arg1, arg2);
-  return result;
-}
-static VALUE data_wrapper_3(VALUE self, VALUE arg1, VALUE arg2, VALUE arg3)
-{
-  VALUE result;
-  FIX_FRAME();
-  result = (*actual_cfunc())(self, arg1, arg2, arg3);
-  return result;
-}
-static VALUE data_wrapper_4(VALUE self, VALUE arg1, VALUE arg2, VALUE arg3, VALUE arg4)
-{
-  VALUE result;
-  FIX_FRAME();
-  result = (*actual_cfunc())(self, arg1, arg2, arg3, arg4);
-  return result;
-}
-static VALUE data_wrapper_5(VALUE self, VALUE arg1, VALUE arg2, VALUE arg3, VALUE arg4, VALUE arg5)
-{
-  VALUE result;
-  FIX_FRAME();
-  result = (*actual_cfunc())(self, arg1, arg2, arg3, arg4, arg5);
-  return result;
-}
-static VALUE data_wrapper_6(VALUE self, VALUE arg1, VALUE arg2, VALUE arg3, VALUE arg4, VALUE arg5, VALUE arg6)
-{
-  VALUE result;
-  FIX_FRAME();
-  result = (*actual_cfunc())(self, arg1, arg2, arg3, arg4, arg5, arg6);
-  return result;
-}
-static VALUE data_wrapper_7(VALUE self, VALUE arg1, VALUE arg2, VALUE arg3, VALUE arg4, VALUE arg5, VALUE arg6, VALUE arg7)
-{
-  VALUE result;
-  FIX_FRAME();
-  result = (*actual_cfunc())(self, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-  return result;
-}
-static VALUE data_wrapper_8(VALUE self, VALUE arg1, VALUE arg2, VALUE arg3, VALUE arg4, VALUE arg5, VALUE arg6, VALUE arg7, VALUE arg8)
-{
-  VALUE result;
-  FIX_FRAME();
-  result = (*actual_cfunc())(self, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-  return result;
-}
-static VALUE data_wrapper_9(VALUE self, VALUE arg1, VALUE arg2, VALUE arg3, VALUE arg4, VALUE arg5, VALUE arg6, VALUE arg7, VALUE arg8, VALUE arg9)
-{
-  VALUE result;
-  FIX_FRAME();
-  result = (*actual_cfunc())(self, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-  return result;
-}
-static VALUE data_wrapper_10(VALUE self, VALUE arg1, VALUE arg2, VALUE arg3, VALUE arg4, VALUE arg5, VALUE arg6, VALUE arg7, VALUE arg8, VALUE arg9, VALUE arg10)
-{
-  VALUE result;
-  FIX_FRAME();
-  result = (*actual_cfunc())(self, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
-  return result;
-}
-static VALUE data_wrapper_11(VALUE self, VALUE arg1, VALUE arg2, VALUE arg3, VALUE arg4, VALUE arg5, VALUE arg6, VALUE arg7, VALUE arg8, VALUE arg9, VALUE arg10, VALUE arg11)
-{
-  VALUE result;
-  FIX_FRAME();
-  result = (*actual_cfunc())(self, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
-  return result;
-}
-static VALUE data_wrapper_12(VALUE self, VALUE arg1, VALUE arg2, VALUE arg3, VALUE arg4, VALUE arg5, VALUE arg6, VALUE arg7, VALUE arg8, VALUE arg9, VALUE arg10, VALUE arg11, VALUE arg12)
-{
-  VALUE result;
-  FIX_FRAME();
-  result = (*actual_cfunc())(self, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
-  return result;
-}
-static VALUE data_wrapper_13(VALUE self, VALUE arg1, VALUE arg2, VALUE arg3, VALUE arg4, VALUE arg5, VALUE arg6, VALUE arg7, VALUE arg8, VALUE arg9, VALUE arg10, VALUE arg11, VALUE arg12, VALUE arg13)
-{
-  VALUE result;
-  FIX_FRAME();
-  result = (*actual_cfunc())(self, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13);
-  return result;
-}
-static VALUE data_wrapper_14(VALUE self, VALUE arg1, VALUE arg2, VALUE arg3, VALUE arg4, VALUE arg5, VALUE arg6, VALUE arg7, VALUE arg8, VALUE arg9, VALUE arg10, VALUE arg11, VALUE arg12, VALUE arg13, VALUE arg14)
-{
-  VALUE result;
-  FIX_FRAME();
-  result = (*actual_cfunc())(self, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14);
-  return result;
-}
-static VALUE data_wrapper_15(VALUE self, VALUE arg1, VALUE arg2, VALUE arg3, VALUE arg4, VALUE arg5, VALUE arg6, VALUE arg7, VALUE arg8, VALUE arg9, VALUE arg10, VALUE arg11, VALUE arg12, VALUE arg13, VALUE arg14, VALUE arg15)
-{
-  VALUE result;
-  FIX_FRAME();
-  result = (*actual_cfunc())(self, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15);
-  return result;
-}
-
-/* Define a method and attach data to it.
- *
- * The method looks to ruby like a normal aliased CFUNC, with a modified
- * origin class:
- *
- * NODE_FBODY
- *   |- (u1) orig - origin class
- *   |  |- basic
- *   |  |  |- flags - origin class flags + FL_SINGLETON
- *   |  |  +- klass - NODE_MEMO
- *   |  |     |- (u1) cfnc - actual C function to call
- *   |  |     |- (u2) rval - stored data
- *   |  |     +- (u3) 0
- *   |  |- iv_tbl - 0
- *   |  |- m_tbl - 0
- *   |  +- super - actual origin class
- *   |- (u2) mid - name of the method
- *   +- (u3) head - NODE_CFUNC
- *      |- (u1) cfnc - wrapper function to call
- *      +- (u2) argc - function arity
- *
- * Or, on YARV:
- *
- * NODE_FBODY
- *   |- (u1) oid - name of the method
- *   +- (u2) body - NODE_METHOD
- *      |- (u1) clss - origin class
- *      |  |- basic
- *      |  |  |- flags - origin class flags + FL_SINGLETON
- *      |  |  +- klass - NODE_MEMO
- *      |  |     |- (u1) cfnc - actual C function to call
- *      |  |     |- (u2) rval - stored data
- *      |  |     +- (u3) 0
- *      |  |- ptr - rb_classext_t
- *      |  |  |- super - actual origin class
- *      |  |  +- iv_tbl - 0
- *      |  |- m_tbl - 0
- *      |  +- iv_index_tbl - 0?
- *      |- (u2) body - NODE_CFUNC
- *      |  |- (u1) cfnc - wrapper function to call
- *      |  |- (u2) argc - function arity
- *      +- (u3) noex - NOEX_PUBLIC
- *
- * When the wrapper function is called, last_class is set to the origin
- * class found in the FBODY node.  So that the method data will be
- * accessible, and so last_class will point to klass and not to our MEMO
- * node, it is necessary to "fix" the current frame.
- *
- * Pre-YARV, this means we duplicate the current frame and set last_class:
- *
- * ruby_frame
- *   |- last_class - klass
- *   |- prev
- *   |  |- last_class - NODE_MEMO
- *   |  |  |- (u1) cfnc - actual C function to call
- *   |  |  |- (u2) rval - stored data
- *   |  |  +- (u3) 0
- *   |  |- prev - the real previous frame
- *   |  +- ...
- *   +- ...
- *
- * The method data is then accessible via
- * ruby_frame->prev->last_class->rval.
- *
- * On YARV, the current frame is not duplicated; rather, the method data
- * is placed on the stack and is referenced by one of the unused members
- * of the control frame (the program counter):
- *
- * ruby_current_thread->cfp
- *   |- pc - NODE_MEMO
- *   |  |- (u1) cfnc - actual C function to call
- *   |  |- (u2) rval - stored data
- *   |  +- (u3) 0
- *   |- method_class - klass
- *   +- ...
- *
- */
-void define_method_with_data(
-    VALUE klass, ID id, VALUE (*cfunc)(ANYARGS), int arity, VALUE data)
-{
-  /* TODO: origin should have #to_s and #inspect methods defined */
-#ifdef HAVE_RB_CLASS_BOOT
-  VALUE origin = rb_class_boot(klass);
-#else
-  VALUE origin = rb_class_new(klass);
-#endif
-  NODE * node;
-
-  VALUE (*data_wrapper)(ANYARGS);
-  switch(arity)
-  {
-    case 0: data_wrapper = RUBY_METHOD_FUNC(data_wrapper_0); break;
-    case 1: data_wrapper = RUBY_METHOD_FUNC(data_wrapper_1); break;
-    case 2: data_wrapper = RUBY_METHOD_FUNC(data_wrapper_2); break;
-    case 3: data_wrapper = RUBY_METHOD_FUNC(data_wrapper_3); break;
-    case 4: data_wrapper = RUBY_METHOD_FUNC(data_wrapper_4); break;
-    case 5: data_wrapper = RUBY_METHOD_FUNC(data_wrapper_5); break;
-    case 6: data_wrapper = RUBY_METHOD_FUNC(data_wrapper_6); break;
-    case 7: data_wrapper = RUBY_METHOD_FUNC(data_wrapper_7); break;
-    case 8: data_wrapper = RUBY_METHOD_FUNC(data_wrapper_8); break;
-    case 9: data_wrapper = RUBY_METHOD_FUNC(data_wrapper_9); break;
-    case 10: data_wrapper = RUBY_METHOD_FUNC(data_wrapper_10); break;
-    case 11: data_wrapper = RUBY_METHOD_FUNC(data_wrapper_11); break;
-    case 12: data_wrapper = RUBY_METHOD_FUNC(data_wrapper_12); break;
-    case 13: data_wrapper = RUBY_METHOD_FUNC(data_wrapper_13); break;
-    case 14: data_wrapper = RUBY_METHOD_FUNC(data_wrapper_14); break;
-    case 15: data_wrapper = RUBY_METHOD_FUNC(data_wrapper_15); break;
-    case -1: data_wrapper = RUBY_METHOD_FUNC(data_wrapper_m1); break;
-    default: rb_raise(rb_eArgError, "unsupported arity %d", arity);
-  }
-
-  FL_SET(origin, FL_SINGLETON);
-  rb_singleton_class_attached(origin, klass);
-  rb_name_class(origin, SYM2ID(rb_class_name(klass)));
-
-  RBASIC(origin)->klass = (VALUE)NEW_NODE(NODE_MEMO, cfunc, data, 0);
-
-#ifdef RUBY_VM
-  /* YARV */
-  node = NEW_FBODY(
-      NEW_METHOD(
-          NEW_CFUNC(data_wrapper, arity),
-          origin,
-          NOEX_PUBLIC),
-      id);
-  st_insert(RCLASS_M_TBL(klass), id, (st_data_t)node);
-#else
-  /* pre-YARV */
-  node = NEW_FBODY(
-      NEW_CFUNC(data_wrapper, arity),
-      id,
-      origin);
-  rb_add_method(klass, id, node, NOEX_PUBLIC);
-#endif
-}
-
-VALUE get_method_data()
-{
-  return data_memo_node()->nd_rval;
-}
-
-#else /* HAVE_RUBINIUS */
-
-void define_method_with_data(
-    VALUE klass, ID id, VALUE (*cfunc)(ANYARGS), int arity, VALUE data)
-{
-  rb_raise(rb_eNotImpError, "Not implemented: define_method_with_data");
-}
-
-VALUE get_method_data()
-{
-  rb_raise(rb_eNotImpError, "Not implemented: get_method_data");
-}
-
-#endif

data/ext/method_data.c.rpp

@@ -1,294 +0,0 @@
-#include "method_data.h"
-
-#include <ruby.h>
-
-#ifndef HAVE_RUBINIUS
-
-#ruby <<END
-MAX_ARGS = 15
-nil
-END
-
-#if defined(HAVE_NODE_H)
-/* pre-YARV */
-#include <node.h>
-#elif defined(REALLY_HAVE_RUBY_NODE_H)
-/* YARV */
-#include <ruby/node.h>
-#elif defined(RUBY_VM)
-/* YARV without node.h */
-#include "minimal_node.h"
-#else
-/* something else */
-#error "Need node.h"
-#endif
-
-#ifdef HAVE_ENV_H
-/* pre-YARV */
-#include <env.h>
-#endif
-
-#ifdef RUBY_VM
-
-/* YARV */
-
-struct rb_thread_struct
-{   
-    VALUE self;
-    void *vm;
-    VALUE *stack;
-    unsigned long stack_size;
-    VALUE *cfp;
-    /* ... */
-};
-
-typedef struct rb_thread_struct rb_thread_t;
-
-#define CFP_DATA_MEMO_NODE_AND_PC cfp[0]
-#define CFP_METHOD_CLASS cfp[11]
-
-/* On YARV, we store the method data on the stack.  We don't have to pop
- * it off the stack, because the stack pointer will be reset to the
- * previous frame's stack pointer when the function returns.
- */
-static void fix_frame()
-{
-  do {
-    extern rb_thread_t * ruby_current_thread;
-    VALUE * cfp = ruby_current_thread->cfp;
-    CFP_DATA_MEMO_NODE_AND_PC = RBASIC(CFP_METHOD_CLASS)->klass;
-
-    if(rb_type(CFP_DATA_MEMO_NODE_AND_PC) != T_NODE)
-    {
-      /* This can happen for module functions that are created after
-       * the stub function */
-      rb_raise(
-          rb_eRuntimeError,
-          "Cannot find method data for module function");
-    }
-    else
-    {
-      CFP_METHOD_CLASS = RCLASS_SUPER(CFP_METHOD_CLASS);
-    }
-  } while(0);
-}
-
-#define FIX_FRAME() \
-  fix_frame()
-
-static NODE * data_memo_node()
-{
-  extern rb_thread_t * ruby_current_thread;
-  VALUE * cfp = ruby_current_thread->cfp;
-  return (NODE *)CFP_DATA_MEMO_NODE_AND_PC;
-}
-
-#else
-
-/* pre-YARV */
-
-/* Okay to not pop this temporary frame, since it will be popped by the
- * caller
- */
-#define FIX_FRAME() \
-  struct FRAME _frame = *ruby_frame; \
-  _frame.last_class = RCLASS(ruby_frame->last_class)->super; \
-  _frame.prev = ruby_frame; \
-  ruby_frame = &_frame; \
-
-static NODE * data_memo_node()
-{
-  return (NODE *)(RBASIC(ruby_frame->prev->last_class)->klass);
-}
-
-#endif
-
-typedef VALUE (*Method_Func)(ANYARGS);
-
-static Method_Func actual_cfunc()
-{
-  return data_memo_node()->nd_cfnc;
-}
-
-static VALUE data_wrapper_m1(int argc, VALUE * argv, VALUE self)
-{
-  VALUE result;
-  FIX_FRAME();
-  result = (*actual_cfunc())(argc, argv, self);
-  return result;
-}
-
-static VALUE data_wrapper_0(VALUE self)
-{
-  VALUE result;
-  FIX_FRAME();
-  result = (*actual_cfunc())(self);
-  return result;
-}
-
-#ruby <<END
-  (1..MAX_ARGS).each do |i|
-    params = (1..i).map { |j| "VALUE arg#{j}" }.join(', ')
-    args = (1..i).map { |j| "arg#{j}" }.join(', ')
-
-    puts <<-END
-static VALUE data_wrapper_#{i}(VALUE self, #{params})
-{
-  VALUE result;
-  FIX_FRAME();
-  result = (*actual_cfunc())(self, #{args});
-  return result;
-}
-    END
-  end
-
-  nil
-END
-
-/* Define a method and attach data to it.
- *
- * The method looks to ruby like a normal aliased CFUNC, with a modified
- * origin class:
- *
- * NODE_FBODY
- *   |- (u1) orig - origin class
- *   |  |- basic
- *   |  |  |- flags - origin class flags + FL_SINGLETON
- *   |  |  +- klass - NODE_MEMO
- *   |  |     |- (u1) cfnc - actual C function to call
- *   |  |     |- (u2) rval - stored data
- *   |  |     +- (u3) 0
- *   |  |- iv_tbl - 0
- *   |  |- m_tbl - 0
- *   |  +- super - actual origin class
- *   |- (u2) mid - name of the method
- *   +- (u3) head - NODE_CFUNC
- *      |- (u1) cfnc - wrapper function to call
- *      +- (u2) argc - function arity
- *
- * Or, on YARV:
- *
- * NODE_FBODY
- *   |- (u1) oid - name of the method
- *   +- (u2) body - NODE_METHOD
- *      |- (u1) clss - origin class
- *      |  |- basic
- *      |  |  |- flags - origin class flags + FL_SINGLETON
- *      |  |  +- klass - NODE_MEMO
- *      |  |     |- (u1) cfnc - actual C function to call
- *      |  |     |- (u2) rval - stored data
- *      |  |     +- (u3) 0
- *      |  |- ptr - rb_classext_t
- *      |  |  |- super - actual origin class
- *      |  |  +- iv_tbl - 0
- *      |  |- m_tbl - 0
- *      |  +- iv_index_tbl - 0?
- *      |- (u2) body - NODE_CFUNC
- *      |  |- (u1) cfnc - wrapper function to call
- *      |  |- (u2) argc - function arity
- *      +- (u3) noex - NOEX_PUBLIC
- *
- * When the wrapper function is called, last_class is set to the origin
- * class found in the FBODY node.  So that the method data will be
- * accessible, and so last_class will point to klass and not to our MEMO
- * node, it is necessary to "fix" the current frame.
- *
- * Pre-YARV, this means we duplicate the current frame and set last_class:
- *
- * ruby_frame
- *   |- last_class - klass
- *   |- prev
- *   |  |- last_class - NODE_MEMO
- *   |  |  |- (u1) cfnc - actual C function to call
- *   |  |  |- (u2) rval - stored data
- *   |  |  +- (u3) 0
- *   |  |- prev - the real previous frame
- *   |  +- ...
- *   +- ...
- *
- * The method data is then accessible via
- * ruby_frame->prev->last_class->rval.
- *
- * On YARV, the current frame is not duplicated; rather, the method data
- * is placed on the stack and is referenced by one of the unused members
- * of the control frame (the program counter):
- *
- * ruby_current_thread->cfp
- *   |- pc - NODE_MEMO
- *   |  |- (u1) cfnc - actual C function to call
- *   |  |- (u2) rval - stored data
- *   |  +- (u3) 0
- *   |- method_class - klass
- *   +- ...
- *
- */
-void define_method_with_data(
-    VALUE klass, ID id, VALUE (*cfunc)(ANYARGS), int arity, VALUE data)
-{
-  /* TODO: origin should have #to_s and #inspect methods defined */
-#ifdef HAVE_RB_CLASS_BOOT
-  VALUE origin = rb_class_boot(klass);
-#else
-  VALUE origin = rb_class_new(klass);
-#endif
-  NODE * node;
-
-  VALUE (*data_wrapper)(ANYARGS);
-  switch(arity)
-  {
-#ruby <<END
-  (0..MAX_ARGS).each do |i|
-    puts <<-END
-    case #{i}: data_wrapper = RUBY_METHOD_FUNC(data_wrapper_#{i}); break;
-    END
-  end
-  nil
-END
-    case -1: data_wrapper = RUBY_METHOD_FUNC(data_wrapper_m1); break;
-    default: rb_raise(rb_eArgError, "unsupported arity %d", arity);
-  }
-
-  FL_SET(origin, FL_SINGLETON);
-  rb_singleton_class_attached(origin, klass);
-  rb_name_class(origin, SYM2ID(rb_class_name(klass)));
-
-  RBASIC(origin)->klass = (VALUE)NEW_NODE(NODE_MEMO, cfunc, data, 0);
-
-#ifdef RUBY_VM
-  /* YARV */
-  node = NEW_FBODY(
-      NEW_METHOD(
-          NEW_CFUNC(data_wrapper, arity),
-          origin,
-          NOEX_PUBLIC),
-      id);
-  st_insert(RCLASS_M_TBL(klass), id, (st_data_t)node);
-#else
-  /* pre-YARV */
-  node = NEW_FBODY(
-      NEW_CFUNC(data_wrapper, arity),
-      id,
-      origin);
-  rb_add_method(klass, id, node, NOEX_PUBLIC);
-#endif
-}
-
-VALUE get_method_data()
-{
-  return data_memo_node()->nd_rval;
-}
-
-#else /* HAVE_RUBINIUS */
-
-void define_method_with_data(
-    VALUE klass, ID id, VALUE (*cfunc)(ANYARGS), int arity, VALUE data)
-{
-  rb_raise(rb_eNotImpError, "Not implemented: define_method_with_data");
-}
-
-VALUE get_method_data()
-{
-  rb_raise(rb_eNotImpError, "Not implemented: get_method_data");
-}
-
-#endif

data/ext/method_data.h

@@ -1,11 +0,0 @@
-#ifndef METHOD_DATA_H
-#define METHOD_DATA_H
-
-#include <ruby.h>
-
-void define_method_with_data(
-    VALUE klass, ID id, VALUE (*cfunc)(ANYARGS), int arity, VALUE data);
-
-VALUE get_method_data();
-
-#endif // METHOD_DATA_H