experimental per-VM method cache

git-svn-id: http://svn.macosforge.org/repository/ruby/MacRuby/branches/vm-mcache@3927 23306eb0-4c56-4727-a40e-e92c0eb68959
MacRuby · Apr 14, 2010 · 57119dd · 57119dd
1 parent 286b7b9
commit 57119dd
Show file tree

Hide file tree

Showing 18 changed files with 282 additions and 486 deletions.
diff --git a/array.c b/array.c
@@ -1889,8 +1889,8 @@ take_items(VALUE obj, long n)
     args[0] = result;
     args[1] = (VALUE)n;
 
-    rb_objc_block_call(obj, selEach, cacheEach, 0, 0,
-	    (VALUE(*)(ANYARGS))take_i, (VALUE)args);
+    rb_objc_block_call(obj, selEach, 0, 0, (VALUE(*)(ANYARGS))take_i,
+	    (VALUE)args);
 
     return result;
 }

diff --git a/compar.c b/compar.c
@@ -16,7 +16,6 @@
 VALUE rb_mComparable;
 
 static SEL cmp = 0;
-static struct mcache *cmp_cache = NULL;
 
 void
 rb_cmperr(VALUE x, VALUE y)
@@ -37,14 +36,14 @@ rb_cmperr(VALUE x, VALUE y)
 VALUE
 rb_objs_cmp(VALUE x, VALUE y)
 {
-    return rb_vm_call_with_cache(cmp_cache, x, cmp, 1, &y);
+    return rb_vm_call(x, cmp, 1, &y, false);
 }
 
 static VALUE
 cmp_eq(VALUE *a)
 {
     //VALUE c = rb_funcall(a[0], cmp, 1, a[1]);
-    VALUE c = rb_vm_call_with_cache(cmp_cache, a[0], cmp, 1, &a[1]);
+    VALUE c = rb_vm_call(a[0], cmp, 1, &a[1], false);
 
     if (NIL_P(c)) {
 	return Qfalse;
@@ -93,7 +92,7 @@ static VALUE
 cmp_gt(VALUE x, SEL sel, VALUE y)
 {
     //VALUE c = rb_funcall(x, cmp, 1, y);
-    VALUE c = rb_vm_call_with_cache(cmp_cache, x, cmp, 1, &y);
+    VALUE c = rb_vm_call(x, cmp, 1, &y, false);
 
     if (rb_cmpint(c, x, y) > 0) return Qtrue;
     return Qfalse;
@@ -111,7 +110,7 @@ static VALUE
 cmp_ge(VALUE x, SEL sel, VALUE y)
 {
     //VALUE c = rb_funcall(x, cmp, 1, y);
-    VALUE c = rb_vm_call_with_cache(cmp_cache, x, cmp, 1, &y);
+    VALUE c = rb_vm_call(x, cmp, 1, &y, false);
 
     if (rb_cmpint(c, x, y) >= 0) return Qtrue;
     return Qfalse;
@@ -129,7 +128,7 @@ static VALUE
 cmp_lt(VALUE x, SEL sel, VALUE y)
 {
     //VALUE c = rb_funcall(x, cmp, 1, y);
-    VALUE c = rb_vm_call_with_cache(cmp_cache, x, cmp, 1, &y);
+    VALUE c = rb_vm_call(x, cmp, 1, &y, false);
 
     if (rb_cmpint(c, x, y) < 0) return Qtrue;
     return Qfalse;
@@ -147,7 +146,7 @@ static VALUE
 cmp_le(VALUE x, SEL sel, VALUE y)
 {
     //VALUE c = rb_funcall(x, cmp, 1, y);
-    VALUE c = rb_vm_call_with_cache(cmp_cache, x, cmp, 1, &y);
+    VALUE c = rb_vm_call(x, cmp, 1, &y, false);
 
     if (rb_cmpint(c, x, y) <= 0) return Qtrue;
     return Qfalse;
@@ -225,5 +224,4 @@ Init_Comparable(void)
     rb_objc_define_method(rb_mComparable, "between?", cmp_between, 2);
 
     cmp = sel_registerName("<=>:");
-    cmp_cache = rb_vm_get_call_cache(cmp);
 }