1 files changed, 24 insertions, 24 deletions

diff --git a/insns.def b/insns.def
index a4f792897b..379dbfba03 100644
--- a/insns.def
+++ b/insns.def
@@ -55,7 +55,7 @@ getlocal
 ()
 (VALUE val)
 {
-    val = *(GET_LFP() - idx);
+    val = *(GET_LEP() - idx);
 }
 
 /**
@@ -69,7 +69,7 @@ setlocal
 (VALUE val)
 ()
 {
-    (*(GET_LFP() - idx)) = val;
+    *(GET_LEP() - idx) = val;
 }
 
 /**
@@ -83,7 +83,7 @@ getspecial
 ()
 (VALUE val)
 {
-    val = vm_getspecial(th, GET_LFP(), key, type);
+    val = vm_getspecial(th, GET_LEP(), key, type);
 }
 
 /**
@@ -97,7 +97,7 @@ setspecial
 (VALUE obj)
 ()
 {
-    lfp_svar_set(th, GET_LFP(), key, obj);
+    lep_svar_set(th, GET_LEP(), key, obj);
 }
 
 /**
@@ -114,11 +114,11 @@ getdynamic
 (VALUE val)
 {
     rb_num_t i;
-    VALUE *dfp2 = GET_DFP();
+    VALUE *ep = GET_EP();
     for (i = 0; i < level; i++) {
-	dfp2 = GET_PREV_DFP(dfp2);
+	ep = GET_PREV_EP(ep);
     }
-    val = *(dfp2 - idx);
+    val = *(ep - idx);
 }
 
 /**
@@ -135,11 +135,11 @@ setdynamic
 ()
 {
     rb_num_t i;
-    VALUE *dfp2 = GET_DFP();
+    VALUE *ep = GET_EP();
     for (i = 0; i < level; i++) {
-	dfp2 = GET_PREV_DFP(dfp2);
+	ep = GET_PREV_EP(ep);
     }
-    *(dfp2 - idx) = val;
+    *(ep - idx) = val;
 }
 
 /**
@@ -183,7 +183,7 @@ getclassvariable
 ()
 (VALUE val)
 {
-    NODE * const cref = vm_get_cref(GET_ISEQ(), GET_LFP(), GET_DFP());
+    NODE *cref = vm_get_cref(GET_ISEQ(), GET_EP());
     val = rb_cvar_get(vm_get_cvar_base(cref), id);
 }
 
@@ -198,7 +198,7 @@ setclassvariable
 (VALUE val)
 ()
 {
-    NODE * const cref = vm_get_cref(GET_ISEQ(), GET_LFP(), GET_DFP());
+    NODE *cref = vm_get_cref(GET_ISEQ(), GET_EP());
     rb_cvar_set(vm_get_cvar_base(cref), id, val);
 }
 
@@ -343,10 +343,10 @@ putspecialobject
 	val = rb_mRubyVMFrozenCore;
 	break;
       case VM_SPECIAL_OBJECT_CBASE:
-	val = vm_get_cbase(GET_ISEQ(), GET_LFP(), GET_DFP());
+	val = vm_get_cbase(GET_ISEQ(), GET_EP());
 	break;
       case VM_SPECIAL_OBJECT_CONST_BASE:
-	val = vm_get_const_base(GET_ISEQ(), GET_LFP(), GET_DFP());
+	val = vm_get_const_base(GET_ISEQ(), GET_EP());
 	break;
       default:
 	rb_bug("putspecialobject insn: unknown value_type");
@@ -768,7 +768,7 @@ defined
 	}
 	break;
       case DEFINED_IVAR2:
-	klass = vm_get_cbase(GET_ISEQ(), GET_LFP(), GET_DFP());
+	klass = vm_get_cbase(GET_ISEQ(), GET_EP());
 	break;
       case DEFINED_GVAR:
 	if (rb_gvar_defined(rb_global_entry(SYM2ID(obj)))) {
@@ -777,7 +777,7 @@ defined
 	break;
       case DEFINED_CVAR:
 	{
-	NODE *cref = vm_get_cref(GET_ISEQ(), GET_LFP(), GET_DFP());
+	NODE *cref = vm_get_cref(GET_ISEQ(), GET_EP());
 	klass = vm_get_cvar_base(cref);
 	if (rb_cvar_defined(klass, SYM2ID(obj))) {
 	    expr_type = "class variable";
@@ -842,7 +842,7 @@ defined
 	break;
       }
       case DEFINED_REF:{
-	val = vm_getspecial(th, GET_LFP(), Qfalse, FIX2INT(obj));
+	val = vm_getspecial(th, GET_LEP(), Qfalse, FIX2INT(obj));
 	if (val != Qnil) {
 	    expr_type = "global-variable";
 	}
@@ -971,9 +971,9 @@ defineclass
     COPY_CREF(class_iseq->cref_stack, vm_cref_push(th, klass, NOEX_PUBLIC, NULL));
 
     /* enter scope */
-    vm_push_frame(th, class_iseq,
-		  VM_FRAME_MAGIC_CLASS, klass, (VALUE) GET_BLOCK_PTR(),
-		  class_iseq->iseq_encoded, GET_SP(), 0,
+    vm_push_frame(th, class_iseq, VM_FRAME_MAGIC_CLASS,
+		  klass, VM_ENVVAL_BLOCK_PTR(GET_BLOCK_PTR()),
+		  class_iseq->iseq_encoded, GET_SP(),
 		  class_iseq->local_size);
     RESTORE_REGS();
 
@@ -1315,11 +1315,11 @@ opt_checkenv
 ()
 ()
 {
-    if (GET_CFP()->bp != GET_DFP() + 1) {
-	VALUE *new_dfp = GET_CFP()->bp - 1;
+    if (GET_CFP()->bp != GET_EP() + 1) {
+	VALUE *ep = GET_CFP()->bp - 1;
 	/* TODO: copy env and clean stack at creating env? */
-	*new_dfp = *GET_DFP();
-	SET_DFP(new_dfp);
+	*ep = *GET_EP();
+	SET_EP(ep);
     }
 }