debase-ruby_core_source 0.9.0 → 0.9.1

data/lib/debase/ruby_core_source/{ruby-2.3.0-preview2 → ruby-2.4.0-preview1}/vm_call_iseq_optimized.inc

@@ -181,10 +181,10 @@ static inline vm_call_handler
 vm_call_iseq_setup_func(const struct rb_call_info *ci, const int param_size, const int local_size)
 {
     if (UNLIKELY(ci->flag & VM_CALL_TAILCALL)) {
-	return vm_call_iseq_setup_tailcall_0start;
+	return &vm_call_iseq_setup_tailcall_0start;
     }
     else if (0) { /* to disable optimize */
-        return vm_call_iseq_setup_normal_0start;
+        return &vm_call_iseq_setup_normal_0start;
     }
     else {
 	if (param_size <= 3 &&
@@ -192,7 +192,7 @@ vm_call_iseq_setup_func(const struct rb_call_info *ci, const int param_size, con
 	    VM_ASSERT(local_size != 0);
 	    return vm_call_iseq_handlers[param_size][local_size-1];
 	}
-	return vm_call_iseq_setup_normal_0start;
+	return &vm_call_iseq_setup_normal_0start;
     }
 }
 
@@ -203,10 +203,10 @@ static inline vm_call_handler
 vm_call_iseq_setup_func(const struct rb_call_info *ci, struct rb_call_cache *cc)
 {
     if (UNLIKELY(ci->flag & VM_CALL_TAILCALL)) {
-	return vm_call_iseq_setup_tailcall_0start;
+	return &vm_call_iseq_setup_tailcall_0start;
     }
     else {
-        return vm_call_iseq_setup_normal_0start;
+        return &vm_call_iseq_setup_normal_0start;
     }
 }
 #endif

data/lib/debase/ruby_core_source/{ruby-2.3.0-preview2 → ruby-2.4.0-preview1}/vm_core.h

@@ -42,10 +42,11 @@
 #define VMDEBUG 3
 #endif
 
+#include "ruby_assert.h"
+
 #if VM_CHECK_MODE > 0
 #define VM_ASSERT(expr) ( \
-	LIKELY(expr) ? (void)0 : \
-	rb_bug("%s:%d assertion violation - %s", __FILE__, __LINE__, #expr))
+	RUBY_ASSERT_WHEN(VM_CHECK_MODE > 0, expr))
 #else
 #define VM_ASSERT(expr) ((void)0)
 #endif
@@ -199,10 +200,11 @@ enum method_missing_reason {
     MISSING_NOENTRY   = 0x00,
     MISSING_PRIVATE   = 0x01,
     MISSING_PROTECTED = 0x02,
-    MISSING_VCALL     = 0x04,
-    MISSING_SUPER     = 0x08,
-    MISSING_MISSING   = 0x10,
-    MISSING_NONE      = 0x20
+    MISSING_FCALL     = 0x04,
+    MISSING_VCALL     = 0x08,
+    MISSING_SUPER     = 0x10,
+    MISSING_MISSING   = 0x20,
+    MISSING_NONE      = 0x40
 };
 
 struct rb_call_info {
@@ -249,12 +251,11 @@ struct rb_call_cache {
 };
 
 #if 1
-#define GetCoreDataFromValue(obj, type, ptr) do { \
-    (ptr) = (type*)DATA_PTR(obj); \
-} while (0)
+#define CoreDataFromValue(obj, type) (type*)DATA_PTR(obj)
 #else
-#define GetCoreDataFromValue(obj, type, ptr) Data_Get_Struct((obj), type, (ptr))
+#define CoreDataFromValue(obj, type) (type*)rb_data_object_get(obj)
 #endif
+#define GetCoreDataFromValue(obj, type, ptr) ((ptr) = CoreDataFromValue((obj), type))
 
 typedef struct rb_iseq_location_struct {
     VALUE path;
@@ -402,10 +403,8 @@ struct rb_iseq_struct {
     } aux;
 };
 
-#define USE_LAZY_LOAD 0
-
 #ifndef USE_LAZY_LOAD
-#define USE_LAZY_LOAD
+#define USE_LAZY_LOAD 0
 #endif
 
 #if USE_LAZY_LOAD
@@ -454,6 +453,8 @@ enum ruby_basic_operators {
     BOP_NEQ,
     BOP_MATCH,
     BOP_FREEZE,
+    BOP_MAX,
+    BOP_MIN,
 
     BOP_LAST_
 };
@@ -461,6 +462,14 @@ enum ruby_basic_operators {
 #define GetVMPtr(obj, ptr) \
   GetCoreDataFromValue((obj), rb_vm_t, (ptr))
 
+struct rb_vm_struct;
+typedef void rb_vm_at_exit_func(struct rb_vm_struct*);
+
+typedef struct rb_at_exit_list {
+    rb_vm_at_exit_func *func;
+    struct rb_at_exit_list *next;
+} rb_at_exit_list;
+
 struct rb_objspace;
 struct rb_objspace *rb_objspace_alloc(void);
 void rb_objspace_free(struct rb_objspace *);
@@ -484,9 +493,10 @@ typedef struct rb_vm_struct {
     size_t living_thread_num;
     VALUE thgroup_default;
 
-    int running;
-    int thread_abort_on_exception;
-    int trace_running;
+    unsigned int running: 1;
+    unsigned int thread_abort_on_exception: 1;
+    unsigned int thread_report_on_exception: 1;
+    unsigned int trace_running: 1;
     volatile int sleeper;
 
     /* object management */
@@ -529,11 +539,7 @@ typedef struct rb_vm_struct {
 
     struct rb_objspace *objspace;
 
-    /*
-     * @shyouhei notes that this is not for storing normal Ruby
-     * objects so do *NOT* mark this when you GC.
-     */
-    struct RArray at_exit;
+    rb_at_exit_list *at_exit;
 
     VALUE *defined_strings;
     st_table *frozen_strings;
@@ -564,12 +570,12 @@ typedef struct rb_vm_struct {
 #define RUBY_VM_FIBER_MACHINE_STACK_SIZE_MIN  (  16 * 1024 * sizeof(VALUE)) /*   64 KB or  128 KB */
 
 /* optimize insn */
-#define FIXNUM_REDEFINED_OP_FLAG (1 << 0)
+#define INTEGER_REDEFINED_OP_FLAG (1 << 0)
 #define FLOAT_REDEFINED_OP_FLAG  (1 << 1)
 #define STRING_REDEFINED_OP_FLAG (1 << 2)
 #define ARRAY_REDEFINED_OP_FLAG  (1 << 3)
 #define HASH_REDEFINED_OP_FLAG   (1 << 4)
-#define BIGNUM_REDEFINED_OP_FLAG (1 << 5)
+/* #define BIGNUM_REDEFINED_OP_FLAG (1 << 5) */
 #define SYMBOL_REDEFINED_OP_FLAG (1 << 6)
 #define TIME_REDEFINED_OP_FLAG   (1 << 7)
 #define REGEXP_REDEFINED_OP_FLAG (1 << 8)
@@ -697,8 +703,6 @@ typedef struct rb_thread_struct {
     VALUE top_wrapper;
 
     /* eval env */
-    rb_block_t *base_block;
-
     VALUE *root_lep;
     VALUE root_svar;
 
@@ -741,20 +745,6 @@ typedef struct rb_thread_struct {
     struct rb_vm_tag *tag;
     struct rb_vm_protect_tag *protect_tag;
 
-    /*! Thread-local state of evaluation context.
-     *
-     *  If negative, this thread is evaluating the main program.
-     *  If positive, this thread is evaluating a program under Kernel::eval
-     *  family.
-     */
-    int parse_in_eval;
-
-    /*! Thread-local state of compiling context.
-     *
-     * If non-zero, the parser does not automatically print error messages to
-     * stderr. */
-    int mild_compile_error;
-
     /* storage */
     st_table *local_storage;
     VALUE local_storage_recursive_hash;
@@ -795,8 +785,9 @@ typedef struct rb_thread_struct {
     rb_ensure_list_t *ensure_list;
 
     /* misc */
-    enum method_missing_reason method_missing_reason;
-    int abort_on_exception;
+    enum method_missing_reason method_missing_reason: 8;
+    unsigned int abort_on_exception: 1;
+    unsigned int report_on_exception: 1;
 #ifdef USE_SIGALTSTACK
     void *altstack;
 #endif
@@ -825,7 +816,7 @@ RUBY_SYMBOL_EXPORT_BEGIN
 /* node -> iseq */
 rb_iseq_t *rb_iseq_new(NODE*, VALUE, VALUE, VALUE, const rb_iseq_t *parent, enum iseq_type);
 rb_iseq_t *rb_iseq_new_top(NODE *node, VALUE name, VALUE path, VALUE absolute_path, const rb_iseq_t *parent);
-rb_iseq_t *rb_iseq_new_main(NODE *node, VALUE path, VALUE absolute_path);
+rb_iseq_t *rb_iseq_new_main(NODE *node, VALUE path, VALUE absolute_path, const rb_iseq_t *parent);
 rb_iseq_t *rb_iseq_new_with_bopt(NODE*, VALUE, VALUE, VALUE, VALUE, VALUE, enum iseq_type, VALUE);
 rb_iseq_t *rb_iseq_new_with_opt(NODE*, VALUE, VALUE, VALUE, VALUE, const rb_iseq_t *parent, enum iseq_type, const rb_compile_option_t*);
 
@@ -1148,6 +1139,7 @@ enum {
 #define RUBY_VM_INTERRUPTED(th) ((th)->interrupt_flag & ~(th)->interrupt_mask & (PENDING_INTERRUPT_MASK|TRAP_INTERRUPT_MASK))
 #define RUBY_VM_INTERRUPTED_ANY(th) ((th)->interrupt_flag & ~(th)->interrupt_mask)
 
+VALUE rb_exc_set_backtrace(VALUE exc, VALUE bt);
 int rb_signal_buff_size(void);
 void rb_signal_exec(rb_thread_t *th, int sig);
 void rb_threadptr_check_signal(rb_thread_t *mth);
@@ -1159,6 +1151,7 @@ void rb_threadptr_unlock_all_locking_mutexes(rb_thread_t *th);
 void rb_threadptr_pending_interrupt_clear(rb_thread_t *th);
 void rb_threadptr_pending_interrupt_enque(rb_thread_t *th, VALUE v);
 int rb_threadptr_pending_interrupt_active_p(rb_thread_t *th);
+void rb_threadptr_error_print(rb_thread_t *th, VALUE errinfo);
 
 #define RUBY_VM_CHECK_INTS(th) ruby_vm_check_ints(th)
 static inline void

data/lib/debase/ruby_core_source/{ruby-2.3.0-preview2 → ruby-2.4.0-preview1}/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
@@ -185,8 +185,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, const char *format,
-				      VALUE obj, int argc, const VALUE *argv);
+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, rb_control_frame_t *cf, VALUE st)

data/lib/debase/ruby_core_source/{ruby-2.3.0-preview2 → ruby-2.4.0-preview1}/vmtc.inc

@@ -59,6 +59,8 @@ 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),

data/lib/debase/ruby_core_source/version.rb

@@ -1,5 +1,5 @@
 module Debase
   module RubyCoreSource
-   VERSION = '0.9.0'
+   VERSION = '0.9.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: debase-ruby_core_source
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Mark Moseley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
@@ -1348,52 +1348,6 @@ files:
 - lib/debase/ruby_core_source/ruby-2.3.0-p0/vm_insnhelper.h
 - lib/debase/ruby_core_source/ruby-2.3.0-p0/vm_opts.h
 - lib/debase/ruby_core_source/ruby-2.3.0-p0/vmtc.inc
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/addr2line.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/ccan/build_assert/build_assert.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/ccan/check_type/check_type.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/ccan/container_of/container_of.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/ccan/list/list.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/ccan/str/str.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/constant.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/dln.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/encindex.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/eval_intern.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/gc.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/id.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/id_table.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/insns.inc
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/insns_info.inc
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/internal.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/iseq.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/known_errors.inc
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/method.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/node.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/node_name.inc
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/opt_sc.inc
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/optinsn.inc
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/optunifs.inc
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/parse.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/probes_helper.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/regenc.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/regint.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/regparse.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/revision.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/ruby_atomic.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/siphash.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/symbol.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/thread_pthread.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/thread_win32.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/timev.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/transcode_data.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/version.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/vm.inc
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/vm_call_iseq_optimized.inc
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/vm_core.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/vm_debug.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/vm_exec.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/vm_insnhelper.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/vm_opts.h
-- lib/debase/ruby_core_source/ruby-2.3.0-preview2/vmtc.inc
 - lib/debase/ruby_core_source/ruby-2.3.1-p112/addr2line.h
 - lib/debase/ruby_core_source/ruby-2.3.1-p112/ccan/build_assert/build_assert.h
 - lib/debase/ruby_core_source/ruby-2.3.1-p112/ccan/check_type/check_type.h
@@ -1440,6 +1394,53 @@ files:
 - lib/debase/ruby_core_source/ruby-2.3.1-p112/vm_insnhelper.h
 - lib/debase/ruby_core_source/ruby-2.3.1-p112/vm_opts.h
 - lib/debase/ruby_core_source/ruby-2.3.1-p112/vmtc.inc
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/addr2line.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/ccan/build_assert/build_assert.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/ccan/check_type/check_type.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/ccan/container_of/container_of.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/ccan/list/list.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/ccan/str/str.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/constant.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/dln.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/encindex.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/eval_intern.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/gc.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/id.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/id_table.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/insns.inc
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/insns_info.inc
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/internal.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/iseq.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/known_errors.inc
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/method.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/node.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/node_name.inc
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/opt_sc.inc
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/optinsn.inc
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/optunifs.inc
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/parse.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/probes_helper.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/regenc.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/regint.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/regparse.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/revision.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/ruby_assert.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/ruby_atomic.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/siphash.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/symbol.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/thread_pthread.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/thread_win32.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/timev.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/transcode_data.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/version.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/vm.inc
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/vm_call_iseq_optimized.inc
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/vm_core.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/vm_debug.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/vm_exec.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/vm_insnhelper.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/vm_opts.h
+- lib/debase/ruby_core_source/ruby-2.4.0-preview1/vmtc.inc
 - lib/debase/ruby_core_source/version.rb
 homepage: http://github.com/os97673/debase-ruby_core_source
 licenses:

data/lib/debase/ruby_core_source/ruby-2.3.0-preview2/revision.h

@@ -1 +0,0 @@
-#define RUBY_REVISION 53028