debase-ruby_core_source 0.9.9 → 0.9.10

data/lib/debase/ruby_core_source/{ruby-2.4.0-preview2 → ruby-2.2.8-p477}/vm_insnhelper.h

@@ -2,7 +2,7 @@
 
   insnhelper.h - helper macros to implement each instructions
 
-  $Author: ko1 $
+  $Author: nobu $
   created at: 04/01/01 15:50:34 JST
 
   Copyright (C) 2004-2007 Koichi Sasada
@@ -12,6 +12,28 @@
 #ifndef RUBY_INSNHELPER_H
 #define RUBY_INSNHELPER_H
 
+/**
+ * VM Debug Level
+ *
+ * debug level:
+ *  0: no debug output
+ *  1: show instruction name
+ *  2: show stack frame when control stack frame is changed
+ *  3: show stack status
+ *  4: show register
+ *  5:
+ * 10: gc check
+ */
+
+#ifndef VMDEBUG
+#define VMDEBUG 0
+#endif
+
+#if 0
+#undef  VMDEBUG
+#define VMDEBUG 3
+#endif
+
 extern VALUE ruby_vm_const_missing_count;
 
 #if VM_COLLECT_USAGE_DETAILS
@@ -79,6 +101,8 @@ enum vm_regan_acttype {
 #define GET_CURRENT_INSN() (*GET_PC())
 #define GET_OPERAND(n)     (GET_PC()[(n)])
 #define ADD_PC(n)          (SET_PC(REG_PC + (n)))
+
+#define GET_PC_COUNT()     (REG_PC - GET_ISEQ()->iseq_encoded)
 #define JUMP(dst)          (REG_PC += (dst))
 
 /* frame pointer, environment pointer */
@@ -104,7 +128,7 @@ enum vm_regan_acttype {
 /* deal with variables                                    */
 /**********************************************************/
 
-#define GET_PREV_EP(ep)                ((VALUE *)((ep)[VM_ENV_DATA_INDEX_SPECVAL] & ~0x03))
+#define GET_PREV_EP(ep)                ((VALUE *)((ep)[0] & ~0x03))
 
 #define GET_GLOBAL(entry)       rb_gvar_get((struct rb_global_entry*)(entry))
 #define SET_GLOBAL(entry, val)  rb_gvar_set((struct rb_global_entry*)(entry), (val))
@@ -121,8 +145,27 @@ enum vm_regan_acttype {
 /* deal with control flow 2: method/iterator              */
 /**********************************************************/
 
-#define CALL_METHOD(calling, ci, cc) do { \
-    VALUE v = (*(cc)->call)(th, GET_CFP(), (calling), (ci), (cc)); \
+#define COPY_CREF_OMOD(c1, c2) do {  \
+  RB_OBJ_WRITE((c1), &(c1)->nd_refinements, (c2)->nd_refinements); \
+  if (!NIL_P((c2)->nd_refinements)) { \
+      (c1)->flags |= NODE_FL_CREF_OMOD_SHARED; \
+      (c2)->flags |= NODE_FL_CREF_OMOD_SHARED; \
+  } \
+} while (0)
+
+#define COPY_CREF(c1, c2) do {  \
+  NODE *__tmp_c2 = (c2); \
+  COPY_CREF_OMOD(c1, __tmp_c2); \
+  RB_OBJ_WRITE((c1), &(c1)->nd_clss, __tmp_c2->nd_clss); \
+  (c1)->nd_visi = __tmp_c2->nd_visi;\
+  RB_OBJ_WRITE((c1), &(c1)->nd_next, __tmp_c2->nd_next); \
+  if (__tmp_c2->flags & NODE_FL_CREF_PUSHED_BY_EVAL) { \
+      (c1)->flags |= NODE_FL_CREF_PUSHED_BY_EVAL; \
+  } \
+} while (0)
+
+#define CALL_METHOD(ci) do { \
+    VALUE v = (*(ci)->call)(th, GET_CFP(), (ci)); \
     if (v == Qundef) { \
 	RESTORE_REGS(); \
 	NEXT_INSN(); \
@@ -141,14 +184,14 @@ enum vm_regan_acttype {
 #endif
 
 #if OPT_CALL_FASTPATH
-#define CI_SET_FASTPATH(cc, func, enabled) do { \
-    if (LIKELY(enabled)) ((cc)->call = (func)); \
+#define CI_SET_FASTPATH(ci, func, enabled) do { \
+    if (LIKELY(enabled)) ((ci)->call = (func)); \
 } while (0)
 #else
 #define CI_SET_FASTPATH(ci, func, enabled) /* do nothing */
 #endif
 
-#define GET_BLOCK_HANDLER() (GET_LEP()[VM_ENV_DATA_INDEX_SPECVAL])
+#define GET_BLOCK_PTR() ((rb_block_t *)(GC_GUARDED_PTR_REF(GET_LEP()[0])))
 
 /**********************************************************/
 /* deal with control flow 3: exception                    */
@@ -172,11 +215,9 @@ enum vm_regan_acttype {
 #endif
 
 #define CALL_SIMPLE_METHOD(recv_) do { \
-    struct rb_calling_info calling; \
-    calling.block_handler = VM_BLOCK_HANDLER_NONE; \
-    calling.argc = ci->orig_argc; \
-    vm_search_method(ci, cc, calling.recv = (recv_)); \
-    CALL_METHOD(&calling, ci, cc); \
+    ci->blockptr = 0; ci->argc = ci->orig_argc; \
+    vm_search_method(ci, ci->recv = (recv_)); \
+    CALL_METHOD(ci); \
 } while (0)
 
 #define NEXT_CLASS_SERIAL() (++ruby_vm_class_serial)
@@ -185,43 +226,8 @@ enum vm_regan_acttype {
 #define GET_GLOBAL_CONSTANT_STATE() (ruby_vm_global_constant_state)
 #define INC_GLOBAL_CONSTANT_STATE() (++ruby_vm_global_constant_state)
 
-static VALUE make_no_method_exception(VALUE exc, VALUE format, VALUE obj,
-				      int argc, const VALUE *argv, int priv);
-
-static inline struct vm_throw_data *
-THROW_DATA_NEW(VALUE val, const rb_control_frame_t *cf, VALUE st)
-{
-    return (struct vm_throw_data *)rb_imemo_new(imemo_throw_data, val, (VALUE)cf, st, 0);
-}
-
-static inline void
-THROW_DATA_CATCH_FRAME_SET(struct vm_throw_data *obj, const rb_control_frame_t *cfp)
-{
-    obj->catch_frame = cfp;
-}
-
-static inline void
-THROW_DATA_STATE_SET(struct vm_throw_data *obj, int st)
-{
-    obj->throw_state = (VALUE)st;
-}
-
-static inline VALUE
-THROW_DATA_VAL(const struct vm_throw_data *obj)
-{
-    return obj->throw_obj;
-}
-
-static inline const rb_control_frame_t *
-THROW_DATA_CATCH_FRAME(const struct vm_throw_data *obj)
-{
-    return obj->catch_frame;
-}
-
-static int
-THROW_DATA_STATE(const struct vm_throw_data *obj)
-{
-    return (int)obj->throw_state;
-}
+static VALUE make_no_method_exception(VALUE exc, const char *format,
+				      VALUE obj, int argc, const VALUE *argv);
+
 
 #endif /* RUBY_INSNHELPER_H */

data/lib/debase/ruby_core_source/{ruby-2.4.0-preview3 → ruby-2.2.8-p477}/vm_opts.h

@@ -3,7 +3,7 @@
 
   vm_opts.h - VM optimize option
 
-  $Author: nobu $
+  $Author: tmm1 $
 
   Copyright (C) 2004-2007 Koichi Sasada
 
@@ -18,13 +18,12 @@
  * Following definitions are default values.
  */
 
-#define OPT_TRACE_INSTRUCTION           1
-#define OPT_TAILCALL_OPTIMIZATION       0
-#define OPT_PEEPHOLE_OPTIMIZATION       1
-#define OPT_SPECIALISED_INSTRUCTION     1
-#define OPT_INLINE_CONST_CACHE          1
-#define OPT_FROZEN_STRING_LITERAL       0
-#define OPT_DEBUG_FROZEN_STRING_LITERAL 0
+#define OPT_TRACE_INSTRUCTION        1
+#define OPT_TAILCALL_OPTIMIZATION    0
+#define OPT_PEEPHOLE_OPTIMIZATION    1
+#define OPT_SPECIALISED_INSTRUCTION  1
+#define OPT_INLINE_CONST_CACHE       1
+
 
 /* Build Options.
  * You can't change these options at runtime.

data/lib/debase/ruby_core_source/{ruby-2.4.0-preview3 → ruby-2.2.8-p477}/vmtc.inc

@@ -34,7 +34,6 @@ static const void *const insns_address_table[] = {
   LABEL_PTR(putstring),
   LABEL_PTR(concatstrings),
   LABEL_PTR(tostring),
-  LABEL_PTR(freezestring),
   LABEL_PTR(toregexp),
   LABEL_PTR(newarray),
   LABEL_PTR(duparray),
@@ -47,7 +46,6 @@ static const void *const insns_address_table[] = {
   LABEL_PTR(dup),
   LABEL_PTR(dupn),
   LABEL_PTR(swap),
-  LABEL_PTR(reverse),
   LABEL_PTR(reput),
   LABEL_PTR(topn),
   LABEL_PTR(setn),
@@ -59,8 +57,6 @@ static const void *const insns_address_table[] = {
   LABEL_PTR(defineclass),
   LABEL_PTR(send),
   LABEL_PTR(opt_str_freeze),
-  LABEL_PTR(opt_newarray_max),
-  LABEL_PTR(opt_newarray_min),
   LABEL_PTR(opt_send_without_block),
   LABEL_PTR(invokesuper),
   LABEL_PTR(invokeblock),
@@ -69,7 +65,6 @@ static const void *const insns_address_table[] = {
   LABEL_PTR(jump),
   LABEL_PTR(branchif),
   LABEL_PTR(branchunless),
-  LABEL_PTR(branchnil),
   LABEL_PTR(getinlinecache),
   LABEL_PTR(setinlinecache),
   LABEL_PTR(once),

data/lib/debase/ruby_core_source/{ruby-2.4.0-preview2 → ruby-2.3.5-p376}/constant.h

@@ -38,7 +38,7 @@ typedef struct rb_const_entry_struct {
 VALUE rb_mod_private_constant(int argc, const VALUE *argv, VALUE obj);
 VALUE rb_mod_public_constant(int argc, const VALUE *argv, VALUE obj);
 VALUE rb_mod_deprecate_constant(int argc, const VALUE *argv, VALUE obj);
-void rb_free_const_table(struct rb_id_table *tbl);
+void rb_free_const_table(st_table *tbl);
 VALUE rb_public_const_get(VALUE klass, ID id);
 VALUE rb_public_const_get_at(VALUE klass, ID id);
 VALUE rb_public_const_get_from(VALUE klass, ID id);

data/lib/debase/ruby_core_source/{ruby-2.4.0-preview1 → ruby-2.3.5-p376}/eval_intern.h

@@ -121,7 +121,7 @@ LONG WINAPI rb_w32_stack_overflow_handler(struct _EXCEPTION_POINTERS *);
 #define TH_PUSH_TAG(th) do { \
   rb_thread_t * const _th = (th); \
   struct rb_vm_tag _tag; \
-  _tag.tag = 0; \
+  _tag.tag = Qundef; \
   _tag.prev = _th->tag;
 
 #define TH_POP_TAG() \
@@ -139,11 +139,9 @@ LONG WINAPI rb_w32_stack_overflow_handler(struct _EXCEPTION_POINTERS *);
 #if defined __GNUC__ && __GNUC__ == 4 && (__GNUC_MINOR__ >= 6 && __GNUC_MINOR__ <= 8)
 # define VAR_FROM_MEMORY(var) __extension__(*(__typeof__(var) volatile *)&(var))
 # define VAR_INITIALIZED(var) ((var) = VAR_FROM_MEMORY(var))
-# define VAR_NOCLOBBERED(var) volatile var
 #else
 # define VAR_FROM_MEMORY(var) (var)
 # define VAR_INITIALIZED(var) ((void)&(var))
-# define VAR_NOCLOBBERED(var) var
 #endif
 
 /* clear th->state, and return the value */
@@ -266,7 +264,7 @@ NORETURN(void rb_method_name_error(VALUE, VALUE));
 
 NORETURN(void rb_fiber_start(void));
 
-NORETURN(void rb_print_undef(VALUE, ID, rb_method_visibility_t));
+NORETURN(void rb_print_undef(VALUE, ID, int));
 NORETURN(void rb_print_undef_str(VALUE, VALUE));
 NORETURN(void rb_print_inaccessible(VALUE, ID, rb_method_visibility_t));
 NORETURN(void rb_vm_localjump_error(const char *,VALUE, int));
@@ -280,6 +278,7 @@ rb_cref_t *rb_vm_cref_replace_with_duplicated_cref(void);
 VALUE rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg, const rb_block_t *blockptr, VALUE filename);
 void rb_vm_set_progname(VALUE filename);
 void rb_thread_terminate_all(void);
+VALUE rb_vm_top_self();
 VALUE rb_vm_cbase(void);
 
 #ifndef CharNext		/* defined as CharNext[AW] on Windows. */

data/lib/debase/ruby_core_source/{ruby-2.4.0-preview3 → ruby-2.3.5-p376}/id.h

@@ -118,8 +118,6 @@ enum ruby_method_ids {
     id_core_hash_merge_kwd,
     id_debug_created_info,
     tPRESERVED_ID_END,
-    tMax,
-    tMin,
     tFreeze,
     tInspect,
     tIntern,
@@ -162,12 +160,8 @@ enum ruby_method_ids {
     tMesg,
     tException,
     tUScore,
-    tLASTLINE,
-    tBACKREF,
     tNEXT_ID,
 #define TOKEN2LOCALID(n) id##n = ((t##n<<ID_SCOPE_SHIFT)|ID_LOCAL|ID_STATIC_SYM)
-    TOKEN2LOCALID(Max),
-    TOKEN2LOCALID(Min),
     TOKEN2LOCALID(Freeze),
     TOKEN2LOCALID(Inspect),
     TOKEN2LOCALID(Intern),
@@ -210,9 +204,6 @@ enum ruby_method_ids {
     TOKEN2LOCALID(Mesg),
     TOKEN2LOCALID(Exception),
     TOKEN2LOCALID(UScore),
-#define TOKEN2GLOBALID(n) id##n = ((t##n<<ID_SCOPE_SHIFT)|ID_GLOBAL|ID_STATIC_SYM)
-    TOKEN2GLOBALID(LASTLINE),
-    TOKEN2GLOBALID(BACKREF),
     tLAST_OP_ID = tPRESERVED_ID_END-1,
     idLAST_OP_ID = tLAST_OP_ID >> ID_SCOPE_SHIFT
 };

data/lib/debase/ruby_core_source/{ruby-2.4.0-preview2 → ruby-2.3.5-p376}/insns.inc

@@ -60,53 +60,51 @@ enum ruby_vminsn_type {
   BIN(defineclass)               = 43,
   BIN(send)                      = 44,
   BIN(opt_str_freeze)            = 45,
-  BIN(opt_newarray_max)          = 46,
-  BIN(opt_newarray_min)          = 47,
-  BIN(opt_send_without_block)    = 48,
-  BIN(invokesuper)               = 49,
-  BIN(invokeblock)               = 50,
-  BIN(leave)                     = 51,
-  BIN(throw)                     = 52,
-  BIN(jump)                      = 53,
-  BIN(branchif)                  = 54,
-  BIN(branchunless)              = 55,
-  BIN(branchnil)                 = 56,
-  BIN(getinlinecache)            = 57,
-  BIN(setinlinecache)            = 58,
-  BIN(once)                      = 59,
-  BIN(opt_case_dispatch)         = 60,
-  BIN(opt_plus)                  = 61,
-  BIN(opt_minus)                 = 62,
-  BIN(opt_mult)                  = 63,
-  BIN(opt_div)                   = 64,
-  BIN(opt_mod)                   = 65,
-  BIN(opt_eq)                    = 66,
-  BIN(opt_neq)                   = 67,
-  BIN(opt_lt)                    = 68,
-  BIN(opt_le)                    = 69,
-  BIN(opt_gt)                    = 70,
-  BIN(opt_ge)                    = 71,
-  BIN(opt_ltlt)                  = 72,
-  BIN(opt_aref)                  = 73,
-  BIN(opt_aset)                  = 74,
-  BIN(opt_aset_with)             = 75,
-  BIN(opt_aref_with)             = 76,
-  BIN(opt_length)                = 77,
-  BIN(opt_size)                  = 78,
-  BIN(opt_empty_p)               = 79,
-  BIN(opt_succ)                  = 80,
-  BIN(opt_not)                   = 81,
-  BIN(opt_regexpmatch1)          = 82,
-  BIN(opt_regexpmatch2)          = 83,
-  BIN(opt_call_c_function)       = 84,
-  BIN(bitblt)                    = 85,
-  BIN(answer)                    = 86,
-  BIN(getlocal_OP__WC__0)        = 87,
-  BIN(getlocal_OP__WC__1)        = 88,
-  BIN(setlocal_OP__WC__0)        = 89,
-  BIN(setlocal_OP__WC__1)        = 90,
-  BIN(putobject_OP_INT2FIX_O_0_C_) = 91,
-  BIN(putobject_OP_INT2FIX_O_1_C_) = 92,
-  VM_INSTRUCTION_SIZE            = 93
+  BIN(opt_send_without_block)    = 46,
+  BIN(invokesuper)               = 47,
+  BIN(invokeblock)               = 48,
+  BIN(leave)                     = 49,
+  BIN(throw)                     = 50,
+  BIN(jump)                      = 51,
+  BIN(branchif)                  = 52,
+  BIN(branchunless)              = 53,
+  BIN(branchnil)                 = 54,
+  BIN(getinlinecache)            = 55,
+  BIN(setinlinecache)            = 56,
+  BIN(once)                      = 57,
+  BIN(opt_case_dispatch)         = 58,
+  BIN(opt_plus)                  = 59,
+  BIN(opt_minus)                 = 60,
+  BIN(opt_mult)                  = 61,
+  BIN(opt_div)                   = 62,
+  BIN(opt_mod)                   = 63,
+  BIN(opt_eq)                    = 64,
+  BIN(opt_neq)                   = 65,
+  BIN(opt_lt)                    = 66,
+  BIN(opt_le)                    = 67,
+  BIN(opt_gt)                    = 68,
+  BIN(opt_ge)                    = 69,
+  BIN(opt_ltlt)                  = 70,
+  BIN(opt_aref)                  = 71,
+  BIN(opt_aset)                  = 72,
+  BIN(opt_aset_with)             = 73,
+  BIN(opt_aref_with)             = 74,
+  BIN(opt_length)                = 75,
+  BIN(opt_size)                  = 76,
+  BIN(opt_empty_p)               = 77,
+  BIN(opt_succ)                  = 78,
+  BIN(opt_not)                   = 79,
+  BIN(opt_regexpmatch1)          = 80,
+  BIN(opt_regexpmatch2)          = 81,
+  BIN(opt_call_c_function)       = 82,
+  BIN(bitblt)                    = 83,
+  BIN(answer)                    = 84,
+  BIN(getlocal_OP__WC__0)        = 85,
+  BIN(getlocal_OP__WC__1)        = 86,
+  BIN(setlocal_OP__WC__0)        = 87,
+  BIN(setlocal_OP__WC__1)        = 88,
+  BIN(putobject_OP_INT2FIX_O_0_C_) = 89,
+  BIN(putobject_OP_INT2FIX_O_1_C_) = 90,
+  VM_INSTRUCTION_SIZE            = 91
 };
 

data/lib/debase/ruby_core_source/{ruby-2.4.0-preview2 → ruby-2.3.5-p376}/insns_info.inc

@@ -70,8 +70,6 @@ static const char *const insn_name_info[] = {
   "defineclass",
   "send",
   "opt_str_freeze",
-  "opt_newarray_max",
-  "opt_newarray_min",
   "opt_send_without_block",
   "invokesuper",
   "invokeblock",
@@ -167,8 +165,6 @@ static const char *const insn_operand_info[] = {
   "ISN",
   "CES",
   "V",
-  "N",
-  "N",
   "CE",
   "CES",
   "C",
@@ -264,8 +260,6 @@ static const int insn_len_info[] = {
   4,
   4,
   2,
-  2,
-  2,
   3,
   4,
   2,
@@ -367,8 +361,6 @@ static const int insn_stack_push_num_info[] = {
   1,
   1,
   1,
-  1,
-  1,
   0,
   0,
   0,
@@ -589,18 +581,6 @@ insn_stack_increase(int depth, int insn, VALUE *opes)
         case BIN(opt_str_freeze):{
           return depth + 1;
         }
-        case BIN(opt_newarray_max):{
-          int inc = 0;
-        int num = FIX2INT(opes[0]);
-        inc += 1 - num;;
-        return depth + inc;
-        }
-        case BIN(opt_newarray_min):{
-          int inc = 0;
-        int num = FIX2INT(opes[0]);
-        inc += 1 - num;;
-        return depth + inc;
-        }
         case BIN(opt_send_without_block):{
           int inc = 0;
         CALL_INFO ci = (CALL_INFO)(opes[0]);