New upstream version 2.6.0

Author: sorah

.document

@@ -24,4 +24,13 @@ NEWS
 README.md
 README.ja.md
 
+COPYING
+COPYING.ja
+CONTRIBUTING.md
+
+LEGAL
+
+# win32/README.win32 linked from README.md
+win32
+
 doc

.editorconfig

@@ -3,7 +3,7 @@ root = true
 [*]
 end_of_line = lf
 indent_size = 4
-indent_style = tab
+indent_style = space
 insert_final_newline = true
 tab_width = 8
 trim_trailing_whitespace = true
@@ -13,12 +13,15 @@ end_of_line = crlf
 
 [*.gemspec]
 indent_size = 2
-indent_style = space
 
 [*.rb]
 indent_size = 2
-indent_style = space
 
 [*.yml]
 indent_size = 2
-indent_style = space
+
+[{*[Mm]akefile*,*.mak,*.mk,depend}]
+indent_style = tab
+
+[reg*.[ch]]
+indent_size = 2

.gdbinit

@@ -1,3 +1,5 @@
+set startup-with-shell off
+
 define hook-run
   set $color_type = 0
   set $color_highlite = 0
@@ -154,8 +156,12 @@ define rp
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_HASH
     printf "%sT_HASH%s: ", $color_type, $color_end,
-    if ((struct RHash *)($arg0))->ntbl
-      printf "len=%ld ", ((struct RHash *)($arg0))->ntbl->num_entries
+    if (((struct RHash *)($arg0))->basic->flags & RHASH_ST_TABLE_FLAG)
+      printf "st len=%ld ", ((struct RHash *)($arg0))->as.st->num_entries
+    else
+      printf "li len=%ld bound=%ld ", \
+        ((((struct RHash *)($arg0))->basic->flags & RHASH_ARRAY_LEN_MASK) >> RHASH_ARRAY_LEN_SHIFT), \
+        ((((struct RHash *)($arg0))->basic->flags & RHASH_ARRAY_BOUND_MASK) >> RHASH_ARRAY_BOUND_SHIFT)
     end
     print (struct RHash *)($arg0)
   else
@@ -698,12 +704,6 @@ define nd_cval
   rp ($arg0).u3.value
 end
 
-
-define nd_cnt
-  printf "%su3.cnt%s: ", $color_highlite, $color_end
-  p ($arg0).u3.cnt
-end
-
 define nd_tbl
   printf "%su1.tbl%s: ", $color_highlite, $color_end
   p ($arg0).u1.tbl
@@ -742,12 +742,6 @@ define nd_lit
   rp ($arg0).u1.value
 end
 
-
-define nd_frml
-  printf "%su1.node%s: ", $color_highlite, $color_end
-  rp ($arg0).u1.node
-end
-
 define nd_rest
   printf "%su2.argc%s: ", $color_highlite, $color_end
   p ($arg0).u2.argc
@@ -774,12 +768,6 @@ define nd_args
   rp ($arg0).u3.node
 end
 
-
-define nd_noex
-  printf "%su1.id%s: ", $color_highlite, $color_end
-  p ($arg0).u1.id
-end
-
 define nd_defn
   printf "%su3.node%s: ", $color_highlite, $color_end
   rp ($arg0).u3.node
@@ -797,17 +785,6 @@ define nd_new
 end
 
 
-define nd_cfnc
-  printf "%su1.cfunc%s: ", $color_highlite, $color_end
-  p ($arg0).u1.cfunc
-end
-
-define nd_argc
-  printf "%su2.argc%s: ", $color_highlite, $color_end
-  p ($arg0).u2.argc
-end
-
-
 define nd_cname
   printf "%su1.id%s: ", $color_highlite, $color_end
   p ($arg0).u1.id
@@ -1021,24 +998,55 @@ define print_lineno
     set $pos = $pos - 1
   end
 
-  set $i = 0
-  set $size = $iseq->body->insns_info_size
-  set $table = $iseq->body->insns_info
+  set $index = 0
+  set $size = $iseq->body->insns_info.size
+  set $table = $iseq->body->insns_info.body
+  set $positions = $iseq->body->insns_info.positions
   #printf "size: %d\n", $size
   if $size == 0
   else
-    set $i = 1
-    while $i < $size
-      #printf "table[%d]: position: %d, line: %d, pos: %d\n", $i, $table[$i].position, $table[$i].line_no, $pos
-      if $table[$i].position > $pos
-        loop_break
+  if $size == 1
+    printf "%d", $table[0].line_no
+  else
+    if $positions
+      # get_insn_info_linear_search
+      set $index = 1
+      while $index < $size
+        #printf "table[%d]: position: %d, line: %d, pos: %d\n", $i, $positions[$i], $table[$i].line_no, $pos
+        if $positions[$index] > $pos
+          loop_break
+        end
+        set $index = $index + 1
+        if $positions[$index] == $pos
+          loop_break
+        end
       end
-      set $i = $i + 1
-      if $table[$i].position == $pos
-        loop_break
+    else
+      # get_insn_info_succinct_bitvector
+      set $sd = $iseq->body->insns_info.succ_index_table
+      set $immediate_table_size = sizeof($sd->imm_part) / sizeof(uint64_t) * 9
+      if $pos < $immediate_table_size
+        set $i = $pos / 9
+        set $j = $pos % 9
+        set $index = ((int)($sd->imm_part[$i] >> ($j * 7))) & 0x7f
+      else
+        set $block_index = ($pos - $immediate_table_size) / 512
+        set $block = &$sd->succ_part[$block_index]
+        set $block_bit_index = ($pos - $immediate_table_size) % 512
+        set $small_block_index = $block_bit_index / 64
+        set $small_block_popcount = $small_block_index == 0 ? 0 : (((int)($block->small_block_ranks >> (($small_block_index - 1) * 9))) & 0x1ff)
+        set $x = $block->bits[$small_block_index] << (63 - $block_bit_index % 64)
+        set $x = ($x & 0x5555555555555555) + ($x >> 1 & 0x5555555555555555)
+        set $x = ($x & 0x3333333333333333) + ($x >> 2 & 0x3333333333333333)
+        set $x = ($x & 0x0707070707070707) + ($x >> 4 & 0x0707070707070707)
+        set $x = ($x & 0x001f001f001f001f) + ($x >> 8 & 0x001f001f001f001f)
+        set $x = ($x & 0x0000003f0000003f) + ($x >>16 & 0x0000003f0000003f)
+        set $popcnt = ($x & 0x7f) + ($x >>32 & 0x7f)
+        set $index = $block->rank + $small_block_popcount + $popcnt
       end
     end
-    printf "%d", $table[$i-1].line_no
+    printf "%d", $table[$index-1].line_no
+  end
   end
 end
 
@@ -1305,3 +1313,34 @@ define dump_node
                         ((struct RString*)$str)->as.heap.ptr : \
                         ((struct RString*)$str)->as.ary)
 end
+
+define print_flags
+  printf "RUBY_FL_WB_PROTECTED: %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_WB_PROTECTED ? "1" : "0"
+  printf "RUBY_FL_PROMOTED0   : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_PROMOTED0 ? "1" : "0"
+  printf "RUBY_FL_PROMOTED1   : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_PROMOTED1 ? "1" : "0"
+  printf "RUBY_FL_FINALIZE    : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_FINALIZE ? "1" : "0"
+  printf "RUBY_FL_TAINT       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_TAINT ? "1" : "0"
+  printf "RUBY_FL_UNTRUSTED   : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_UNTRUSTED ? "1" : "0"
+  printf "RUBY_FL_EXIVAR      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_EXIVAR ? "1" : "0"
+  printf "RUBY_FL_FREEZE      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_FREEZE ? "1" : "0"
+
+  printf "RUBY_FL_USER0       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER0 ? "1" : "0"
+  printf "RUBY_FL_USER1       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER1 ? "1" : "0"
+  printf "RUBY_FL_USER2       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER2 ? "1" : "0"
+  printf "RUBY_FL_USER3       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER3 ? "1" : "0"
+  printf "RUBY_FL_USER4       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER4 ? "1" : "0"
+  printf "RUBY_FL_USER5       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER5 ? "1" : "0"
+  printf "RUBY_FL_USER6       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER6 ? "1" : "0"
+  printf "RUBY_FL_USER7       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER7 ? "1" : "0"
+  printf "RUBY_FL_USER8       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER8 ? "1" : "0"
+  printf "RUBY_FL_USER9       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER9 ? "1" : "0"
+  printf "RUBY_FL_USER10      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER10 ? "1" : "0"
+  printf "RUBY_FL_USER11      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER11 ? "1" : "0"
+  printf "RUBY_FL_USER12      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER12 ? "1" : "0"
+  printf "RUBY_FL_USER13      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER13 ? "1" : "0"
+  printf "RUBY_FL_USER14      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER14 ? "1" : "0"
+  printf "RUBY_FL_USER15      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER15 ? "1" : "0"
+  printf "RUBY_FL_USER16      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER16 ? "1" : "0"
+  printf "RUBY_FL_USER17      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER17 ? "1" : "0"
+  printf "RUBY_FL_USER18      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER18 ? "1" : "0"
+end

.gitignore

@@ -4,6 +4,7 @@
 *.a
 *.bak
 *.bc
+*.bundle
 *.dSYM
 *.dmyh
 *.dylib
@@ -15,10 +16,13 @@
 *.obj
 *.old
 *.orig
+*.pch
 *.pdb
 *.rej
 *.s
 *.sav
+*.sl
+*.so
 *.swp
 *.yarb
 *~
@@ -60,6 +64,7 @@ lcov*.info
 /archive
 /autom4te*.cache
 /automake
+/benchmark/benchmark-driver
 /beos
 /bmlog-*
 /breakpoints.gdb
@@ -137,6 +142,10 @@ lcov*.info
 /enc/jis/props.h
 /enc/unicode/data
 
+# /coroutine/
+!/coroutine/**/*.s
+/coroutine/**/.time
+
 # /enc/trans/
 /enc/trans/*.c
 /enc/trans/*.def
@@ -145,6 +154,7 @@ lcov*.info
 /enc/trans/.time
 
 # /exe/
+/exe/goruby
 /exe/ruby
 /exe/.time
 
@@ -195,3 +205,8 @@ lcov*.info
 # /win32/
 /win32/*.ico
 /win32/.time
+
+# MJIT
+/rb_mjit_header.h
+/mjit_config.h
+/include/ruby-*/*/rb_mjit_min_header-*.h