From a05cd1f55a80d3b159d986e24d67252d9a890d25 Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 23 Sep 2008 00:20:28 +0000
Subject: * common.mk: clean up   - remove blockinlining.$(OBJEXT) to built   -
 make ENCODING_H_INCLDUES variable (include/ruby/encoding.h)   - make
 VM_CORE_H_INCLUDES variable (vm_core.h)   - simplify rules.   - make depends
 rule to output depend status using gcc -MM. * include/ruby/mvm.h,
 include/ruby/vm.h: rename mvm.h to vm.h. * include/ruby.h: ditto. * load.c:
 add inclusion explicitly. * enumerator.c, object.c, parse.y, thread.c,
 vm_dump.c:   remove useless inclusion. * eval_intern.h: cleanup inclusion. *
 vm_core.h: rb_thread_t should be defined in this file. * vm_evalbody.c,
 vm_exec.c: rename vm_evalbody.c to vm_exec.c. * vm.h, vm_exec.h: rename vm.h
 to vm_exec.h. * insnhelper.h, vm_insnhelper.h: rename insnhelper.h to
 vm_insnhelper.h. * vm.c, vm_insnhelper.c, vm_insnhelper.h:   - rename
 vm_eval() to vm_exec_core().   - rename vm_eval_body() to vm_exec().   -
 cleanup include order. * vm_method.c: fix comment.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 vm_insnhelper.c | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

(limited to 'vm_insnhelper.c')

diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index c9397f8ec..553883c03 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -10,12 +10,10 @@
 
 /* finish iseq array */
 #include "insns.inc"
-
 #include <math.h>
 
 /* control stack frame */
 
-
 #ifndef INLINE
 #define INLINE inline
 #endif
@@ -967,6 +965,36 @@ vm_get_cref(const rb_iseq_t *iseq, const VALUE *lfp, const VALUE *dfp)
     return cref;
 }
 
+static NODE *
+vm_cref_push(rb_thread_t *th, VALUE klass, int noex)
+{
+    rb_control_frame_t *cfp = vm_get_ruby_level_caller_cfp(th, th->cfp);
+    NODE *cref = NEW_BLOCK(klass);
+    cref->nd_file = 0;
+    cref->nd_visi = noex;
+
+    if (cfp) {
+	cref->nd_next = vm_get_cref(cfp->iseq, cfp->lfp, cfp->dfp);
+    }
+
+    return cref;
+}
+
+static inline VALUE
+vm_get_cbase(const rb_iseq_t *iseq, const VALUE *lfp, const VALUE *dfp)
+{
+    NODE *cref = vm_get_cref(iseq, lfp, dfp);
+    VALUE klass = Qundef;
+
+    while (cref) {
+	if ((klass = cref->nd_clss) != 0) {
+	    break;
+	}
+	cref = cref->nd_next;
+    }
+
+    return klass;
+}
 
 static inline void
 vm_check_if_namespace(VALUE klass)
-- 
cgit