Imported Upstream version 2.3.3

Author: sorah

.document

@@ -20,9 +20,7 @@ ChangeLog
 
 NEWS
 
-README
-README.EXT
-README.EXT.ja
-README.ja
+README.md
+README.ja.md
 
 doc

.gdbinit

@@ -245,6 +245,12 @@ define rp
     printf "%sT_UNDEF%s: ", $color_type, $color_end
     print (struct RBasic *)($arg0)
   else
+  if ($flags & RUBY_T_MASK) == RUBY_T_IMEMO
+    printf "%sT_IMEMO%s(", $color_type, $color_end
+    output (enum imemo_type)(($flags>>RUBY_FL_USHIFT)&imemo_mask)
+    printf "): "
+    rp_imemo $arg0
+  else
   if ($flags & RUBY_T_MASK) == RUBY_T_NODE
     printf "%sT_NODE%s(", $color_type, $color_end
     output (enum node_type)(($flags&RUBY_NODE_TYPEMASK)>>RUBY_NODE_TYPESHIFT)
@@ -289,6 +295,7 @@ define rp
   end
   end
   end
+  end
 end
 document rp
   Print a Ruby's VALUE.
@@ -448,8 +455,8 @@ end
 
 define rp_class
   printf "(struct RClass *) %p", (void*)$arg0
-  if ((struct RClass *)($arg0))->ptr.origin != $arg0
-    printf " -> %p", ((struct RClass *)($arg0))->ptr.origin
+  if ((struct RClass *)($arg0))->ptr.origin_ != $arg0
+    printf " -> %p", ((struct RClass *)($arg0))->ptr.origin_
   end
   printf "\n"
   rb_classname $arg0
@@ -460,6 +467,40 @@ document rp_class
   Print the content of a Class/Module.
 end
 
+define rp_imemo
+  set $flags = (((struct RBasic *)($arg0))->flags >> RUBY_FL_USHIFT) & imemo_mask
+  if $flags == imemo_cref
+    printf "(rb_cref_t *) %p\n", (void*)$arg0
+    print *(rb_cref_t *)$arg0
+  else
+  if $flags == imemo_svar
+    printf "(struct vm_svar *) %p\n", (void*)$arg0
+    print *(struct vm_svar *)$arg0
+  else
+  if $flags == imemo_throw_data
+    printf "(struct vm_throw_data *) %p\n", (void*)$arg0
+    print *(struct vm_throw_data *)$arg0
+  else
+  if $flags == imemo_ifunc
+    printf "(struct vm_ifunc *) %p\n", (void*)$arg0
+    print *(struct vm_ifunc *)$arg0
+  else
+  if $flags == imemo_memo
+    printf "(struct MEMO *) %p\n", (void*)$arg0
+    print *(struct MEMO *)$arg0
+  else
+    printf "(struct RIMemo *) %p\n", (void*)$arg0
+    print *(struct RIMemo *)$arg0
+  end
+  end
+  end
+  end
+  end
+end
+document rp_imemo
+  Print the content of a memo
+end
+
 define nd_type
   print (enum node_type)((((NODE*)($arg0))->flags&RUBY_NODE_TYPEMASK)>>RUBY_NODE_TYPESHIFT)
 end
@@ -869,23 +910,16 @@ end
 
 define rb_ps_vm
   print $ps_vm = (rb_vm_t*)$arg0
-  set $ps_threads = (st_table*)$ps_vm->living_threads
-  if $ps_threads->entries_packed
-    set $ps_threads_i = 0
-    while $ps_threads_i < $ps_threads->num_entries
-      set $ps_threads_key = (st_data_t)$ps_threads->as.packed.entries[$ps_threads_i].key
-      set $ps_threads_val = (st_data_t)$ps_threads->as.packed.entries[$ps_threads_i].val
-      rb_ps_thread $ps_threads_key $ps_threads_val
-      set $ps_threads_i = $ps_threads_i + 1
-    end
-  else
-    set $ps_threads_ptr = (st_table_entry*)$ps_threads->head
-    while $ps_threads_ptr
-      set $ps_threads_key = (st_data_t)$ps_threads_ptr->key
-      set $ps_threads_val = (st_data_t)$ps_threads_ptr->record
-      rb_ps_thread $ps_threads_key $ps_threads_val
-      set $ps_threads_ptr = (st_table_entry*)$ps_threads_ptr->fore
+  set $ps_thread_ln = $ps_vm->living_threads.n.next
+  set $ps_thread_ln_last = $ps_vm->living_threads.n.prev
+  while 1
+    set $ps_thread_th = (rb_thread_t *)$ps_thread_ln
+    set $ps_thread = (VALUE)($ps_thread_th->self)
+    rb_ps_thread $ps_thread
+    if $ps_thread_ln == $ps_thread_ln_last
+      loop_break
     end
+    set $ps_thread_ln = $ps_thread_ln->next
   end
 end
 document rb_ps_vm
@@ -894,8 +928,9 @@ end
 
 define rb_ps_thread
   set $ps_thread = (struct RTypedData*)$arg0
-  set $ps_thread_id = $arg1
-  print $ps_thread_th = (rb_thread_t*)$ps_thread->data
+  set $ps_thread_th = (rb_thread_t*)$ps_thread->data
+  printf "* #<Thread:%p rb_thread_t:%p native_thread:%p>\n", \
+    $ps_thread, $ps_thread_th, $ps_thread_th->thread_id
 end
 
 # Details: https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/MachineInstructionsTraceWithGDB
@@ -914,3 +949,18 @@ define SDR
   call rb_vmdebug_stack_dump_raw_current()
 end
 
+define rbi
+  if ((LINK_ELEMENT*)$arg0)->type == ISEQ_ELEMENT_LABEL
+    p *(LABEL*)$arg0
+  else
+  if ((LINK_ELEMENT*)$arg0)->type == ISEQ_ELEMENT_INSN
+    p *(INSN*)$arg0
+  else
+  if ((LINK_ELEMENT*)$arg0)->type == ISEQ_ELEMENT_ADJUST
+    p *(ADJUST*)$arg0
+  else
+    print *$arg0
+  end
+  end
+  end
+end

.gitattributes

@@ -0,0 +1,5 @@
+*.gemspec diff=ruby
+*.rb diff=ruby
+bin/* diff=ruby
+tool/update-deps diff=ruby
+tool/make-snapshot diff=ruby

.gitignore

@@ -1,4 +1,6 @@
 *-*-*.def
+*-*-*.exp
+*-*-*.lib
 *.a
 *.bak
 *.dSYM
@@ -8,10 +10,13 @@
 *.inc
 *.log
 *.o
+*.obj
 *.orig
+*.pdb
 *.rej
 *.sav
 *.swp
+*.yarb
 *~
 .*-*
 .*.list
@@ -24,13 +29,18 @@
 .svn
 Makefile
 Makefile.old
+cygruby*.def
 extconf.h
 y.output
 y.tab.c
 
 # /
 /*-fake.rb
+/*.dll
+/*.exe
+/*.res
 /*.pc
+/*.rc
 /*_prelude.c
 /COPYING.LIB
 /ChangeLog-*
@@ -56,6 +66,8 @@ y.tab.c
 /config.status.lineno
 /configure
 /coverage/simplecov
+/coverage/simplecov-html
+/coverage/doclie
 /coverage/.last_run.json
 /coverage/.resultset.json*
 /coverage/assets
@@ -90,13 +102,16 @@ y.tab.c
 /riscos
 /rubicon
 /ruby
+/ruby-runner
+/ruby-runner.c
 /ruby-man.rd.gz
 /sizes.c
 /test.rb
 /tmp
 /transdb.h
 /uncommon.mk
 /verconf.h
+/verconf.mk
 /web
 /yasmdata.rb
 
@@ -105,14 +120,25 @@ y.tab.c
 /benchmark/fasta.output.*
 /benchmark/wc.input
 
+/enc/*.def
+/enc/*.exp
+/enc/*.lib
 /enc/unicode/data
 
 # /enc/trans/
 /enc/trans/*.c
+/enc/trans/*.def
+/enc/trans/*.exp
+/enc/trans/*.lib
+/enc/trans/.time
 
 # /ext/
 /ext/extinit.c
 
+# /ext/-test-/win32/dln/
+/ext/-test-/win32/dln/dlntest.exp
+/ext/-test-/win32/dln/dlntest.lib
+
 # /ext/dl/callback/
 /ext/dl/callback/callback-*.c
 /ext/dl/callback/callback.c

.travis.yml

@@ -64,11 +64,10 @@ script:
 branches:
   only:
     - trunk
+    - ruby_2_0_0
     - ruby_2_1
     - ruby_2_2
     - ruby_2_3
-    - /^feature\//
-    - /^bug\//
 
 # We want to be notified when something happens.
 notifications:
@@ -88,6 +87,10 @@ notifications:
     on_success: always
     on_failure: never
 
+  email:
+    - [email protected]
+    - [email protected]
+
 # Local Variables:
 # mode: YAML
 # coding: utf-8-unix