ruby-debug-base19x 0.11.30.pre10 → 0.11.30.pre12

data/Rakefile

@@ -25,3 +25,15 @@ task :test_base => :lib do
     t.verbose = true
   end
 end
+
+desc "Remove built files"
+task :clean do
+  cd "ext/ruby_debug" do
+    if File.exists?("Makefile")
+      sh "make clean"
+      rm  "Makefile"
+    end
+    derived_files = Dir.glob(".o") + Dir.glob("*.so") + Dir.glob("*.bundle") 
+    rm derived_files unless derived_files.empty?
+  end
+end

data/ext/ruby_debug/extconf.rb

@@ -1,8 +1,22 @@
+# autodetect ruby headers
+unless ARGV.any? {|arg| arg.include?('--with-ruby-include') }
+  require 'rbconfig'
+  bindir = RbConfig::CONFIG['bindir']
+  if bindir =~ %r{(^.*/\.rbenv/versions)/([^/]+)/bin$}
+    ruby_include = "#{$1}/#{$2}/include/ruby-1.9.1/ruby-#{$2}"
+    ARGV << "--with-ruby-include=#{ruby_include}"
+  elsif bindir =~ %r{(^.*/\.rvm/rubies)/([^/]+)/bin$}
+    ruby_include = "#{$1}/#{$2}/include/ruby-1.9.1/#{$2}"
+    ruby_include = "#{ENV['rvm_path']}/src/#{$2}" unless File.exist?(ruby_include)
+    ARGV << "--with-ruby-include=#{ruby_include}"
+  end
+end
+
 require "mkmf"
-require "ruby_core_source"
+require "debugger/ruby_core_source"
 
 hdrs = proc {
-  begin
+  result = begin
     have_struct_member("rb_method_entry_t", "called_id", "method.h") or
     have_struct_member("rb_control_frame_t", "method_id", "method.h")
   end and
@@ -12,33 +26,24 @@ hdrs = proc {
   end and
   have_header("vm_core.h") and have_header("iseq.h") and have_header("insns.inc") and
   have_header("insns_info.inc") and have_header("eval_intern.h")
-  if checking_for(checking_message("if rb_iseq_compile_with_option was added an argument filepath")) do
-    try_compile(<<SRC)
-#include <ruby.h>
-#include "vm_core.h"
-extern VALUE rb_iseq_new_main(NODE *node, VALUE filename, VALUE filepath);
-SRC
-    end
-  $defs << '-DRB_ISEQ_COMPILE_5ARGS'
-  end
+  have_func("rb_iseq_new_main", "vm_core.h")
+  have_func("rb_iseq_compile_on_base", "vm_core.h")
+  have_struct_member("rb_iseq_t", "location", "vm_core.h") or have_struct_member("rb_iseq_t", "filename", "vm_core.h")
+  have_struct_member("rb_iseq_t", "line_info_size", "vm_core.h") or have_struct_member("rb_iseq_t", "insn_info_size", "vm_core.h")
+  have_struct_member("rb_control_frame_t", "ep", "vm_core.h") or 
+    have_struct_member("rb_control_frame_t", "dfp", "vm_core.h")
+  have_struct_member("rb_control_frame_t", "bp", "vm_core.h")
+  result
 }
 
+$defs << "-O0"
+
 dir_config("ruby")
-name = "ruby_debug"
-if (ENV['rvm_ruby_string'])
-  dest_dir = RbConfig::CONFIG["rubyhdrdir"]
-  with_cppflags("-I" + dest_dir) {
-    if hdrs.call
-      create_makefile(name)
-      exit 0
-    end
-  }
-end
-if !Ruby_core_source::create_makefile_with_core(hdrs, name)
+if !Debugger::RubyCoreSource.create_makefile_with_core(hdrs, "ruby_debug")
   STDERR.print("Makefile creation failed\n")
   STDERR.print("*************************************************************\n\n")
-  STDERR.print("  NOTE: For Ruby 1.9 installation instructions, please see:\n\n")
-  STDERR.print("     http://wiki.github.com/mark-moseley/ruby-debug\n\n")
+  STDERR.print("  NOTE: If your headers were not found, try passing\n")
+  STDERR.print("        --with-ruby-include=PATH_TO_HEADERS      \n\n")
   STDERR.print("*************************************************************\n\n")
   exit(1)
 end

data/ext/ruby_debug/ruby_debug.c

@@ -9,7 +9,7 @@
 #include <insns_info.inc>
 #include "ruby_debug.h"
 
-#define DEBUG_VERSION "0.11.30.pre10"
+#define DEBUG_VERSION "0.11.30.pre12"
 
 #define FRAME_N(n)  (&debug_context->frames[debug_context->stack_size-(n)-1])
 #define GET_FRAME   (FRAME_N(check_frame_number(debug_context, frame)))
@@ -22,7 +22,9 @@
 
 int rb_vm_get_sourceline(const rb_control_frame_t *cfp); /* from vm.c */
 /* from iseq.c */
-#ifdef RB_ISEQ_COMPILE_5ARGS
+#ifdef HAVE_RB_ISEQ_COMPILE_ON_BASE
+VALUE rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE absolute_path, VALUE line, rb_block_t *base_block, VALUE opt);
+#elif HAVE_RB_ISEQ_NEW_MAIN
 VALUE rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE filepath, VALUE line, VALUE opt);
 #else
 VALUE rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE line, VALUE opt);
@@ -502,7 +504,11 @@ save_call_frame(rb_event_flag_t _event, debug_context_t *debug_context, VALUE se
     debug_frame->arg_ary = Qnil;
     debug_frame->argc = GET_THREAD()->cfp->iseq->argc;
     debug_frame->info.runtime.cfp = GET_THREAD()->cfp;
+#if VM_DEBUG_BP_CHECK
+    debug_frame->info.runtime.bp_check = GET_THREAD()->cfp->bp_check;
+#else    
     debug_frame->info.runtime.bp = GET_THREAD()->cfp->bp;
+#endif    
     debug_frame->info.runtime.block_iseq = GET_THREAD()->cfp->block_iseq;
     debug_frame->info.runtime.block_pc = NULL;
     debug_frame->info.runtime.last_pc = GET_THREAD()->cfp->pc;
@@ -521,9 +527,9 @@ filename_cmp_impl(VALUE source, char *file);
 
 int
 filename_cmp(VALUE source, char *file) {
-#ifdef __WIN32__
+#ifdef _WIN32
     return filename_cmp_impl(source, file);
-#endif
+#else
 
     if (!RTEST(resolve_symlinks)) {
         return filename_cmp_impl(source, file);
@@ -547,6 +553,7 @@ filename_cmp(VALUE source, char *file) {
       return result;
     }
 #endif  
+#endif  
 }
 
 int
@@ -704,7 +711,10 @@ create_catch_table(debug_context_t *debug_context, unsigned long cont)
     GET_THREAD()->parse_in_eval++;
     GET_THREAD()->mild_compile_error++;
     /* compiling with option Qfalse (no options) prevents debug hook calls during this catch routine */
-#ifdef RB_ISEQ_COMPILE_5ARGS
+#ifdef HAVE_RB_ISEQ_COMPILE_ON_BASE
+    catch_table->iseq = rb_iseq_compile_with_option(
+        rb_str_new_cstr("begin\nend"), rb_str_new_cstr("(exception catcher)"), Qnil, INT2FIX(1), NULL, Qfalse);
+#elif HAVE_RB_ISEQ_NEW_MAIN    
     catch_table->iseq = rb_iseq_compile_with_option(
         rb_str_new_cstr("begin\nend"), rb_str_new_cstr("(exception catcher)"), Qnil, INT2FIX(1), Qfalse);
 #else
@@ -723,6 +733,7 @@ create_catch_table(debug_context_t *debug_context, unsigned long cont)
     return(catch_table);
 }
 
+#ifdef RUBY_EVENT_VM
 static int
 set_thread_event_flag_i(st_data_t key, st_data_t val, st_data_t flag)
 {
@@ -733,6 +744,7 @@ set_thread_event_flag_i(st_data_t key, st_data_t val, st_data_t flag)
 
     return(ST_CONTINUE);
 }
+#endif
 
 static void
 debug_event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE klass)
@@ -757,8 +769,9 @@ debug_event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE kl
         mid = iseq->defined_method_id;
         klass = iseq->klass;
     }
-
+#ifdef ID_ALLOCATOR
     if (mid == ID_ALLOCATOR) return;
+#endif    
 
     /* return if thread is marked as 'ignored'.
        debugger's threads are marked this way
@@ -805,13 +818,19 @@ debug_event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE kl
         debug_context->old_iseq_catch = NULL;
     }
 
+#ifdef RUBY_EVENT_VM
     /* make sure all threads have event flag set so we'll get its events */
     st_foreach(thread->vm->living_threads, set_thread_event_flag_i, 0);
+#endif
 
     /* remove any frames that are now out of scope */
     while(debug_context->stack_size > 0)
     {
+#if VM_DEBUG_BP_CHECK
+        if (debug_context->frames[debug_context->stack_size - 1].info.runtime.bp_check <= thread->cfp->bp_check)
+#else        
         if (debug_context->frames[debug_context->stack_size - 1].info.runtime.bp <= thread->cfp->bp)
+#endif            
             break;
         debug_context->stack_size--;
     }
@@ -859,37 +878,6 @@ debug_event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE kl
     {
     case RUBY_EVENT_LINE:
     {
-        if (CTX_FL_TEST(debug_context, CTX_FL_CATCHING))
-        {
-            debug_frame_t *top_frame = get_top_frame(debug_context);
-            
-            if (top_frame != NULL)
-            {
-                rb_control_frame_t *cfp = top_frame->info.runtime.cfp;
-                VALUE hit_count;
-                int c_hit_count;
-                rb_iseq_t *iseq = cfp->iseq; 
-
-                if (iseq != NULL) {
-                    /* restore the proper catch table */
-                    iseq->catch_table_size = debug_context->catch_table.old_catch_table_size;
-                    iseq->catch_table = debug_context->catch_table.old_catch_table;
-                }
-                
-                /* send catchpoint notification */                
-                c_hit_count = FIX2INT(rb_hash_aref(rdebug_catchpoints, debug_context->catch_table.mod_name)) + 1;
-                hit_count = INT2FIX(c_hit_count);
-                rb_hash_aset(rdebug_catchpoints, debug_context->catch_table.mod_name, hit_count);
-                debug_context->stop_reason = CTX_STOP_CATCHPOINT;
-                rb_funcall(context, idAtCatchpoint, 1, debug_context->catch_table.errinfo);
-                if(self && binding == Qnil)
-                    binding = create_binding(self);
-                save_top_binding(debug_context, binding);
-                call_at_line(context, debug_context, rb_str_new2(top_frame->file), INT2FIX(top_frame->line));
-            }
-            
-            break;
-        }
         if(debug_context->stack_size == 0 || 
            get_top_frame(debug_context)->info.runtime.block_iseq != thread->cfp->block_iseq ||
            get_top_frame(debug_context)->info.runtime.cfp->iseq != thread->cfp->iseq)
@@ -987,7 +975,11 @@ debug_event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE kl
         while(debug_context->stack_size > 0)
         {
             debug_context->stack_size--;
+#if VM_DEBUG_BP_CHECK
+            if (debug_context->frames[debug_context->stack_size].info.runtime.bp_check <= GET_THREAD()->cfp->bp_check)
+#else           
             if (debug_context->frames[debug_context->stack_size].info.runtime.bp <= GET_THREAD()->cfp->bp)
+#endif               
                 break;
         }
         CTX_FL_SET(debug_context, CTX_FL_ENABLE_BKPT);
@@ -1006,13 +998,6 @@ debug_event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE kl
         VALUE expn_class, aclass;
         int i;
 
-        if (CTX_FL_TEST(debug_context, CTX_FL_CATCHING)) {
-          /* we're re-raising exception after processing line event, 
-          now allow the next exception to be caught, don't setup catchers */
-          CTX_FL_UNSET(debug_context, CTX_FL_CATCHING);
-          break;    
-        }
-
         if(debug == Qtrue) {
           fprintf(stderr, "stack_size %d\n", debug_context->stack_size);
           for (i = 0; i < debug_context->stack_size; i++) {
@@ -1071,25 +1056,20 @@ debug_event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE kl
             if (hit_count != Qnil)
             {
                 debug_frame_t *top_frame = get_top_frame(debug_context);
-                rb_control_frame_t *cfp = top_frame->info.runtime.cfp;
-                rb_iseq_t *iseq = cfp->iseq;
+                VALUE hit_count;
+                int c_hit_count;
                 
-                debug_context->catch_table.mod_name = mod_name;
-                debug_context->catch_table.errinfo = rb_errinfo();
-                CTX_FL_SET(debug_context, CTX_FL_CATCHING);
-                if (iseq != NULL) {
-                                    
-                   /* save the current catch table */
-                    debug_context->catch_table.old_catch_table_size = iseq->catch_table_size;
-                    debug_context->catch_table.old_catch_table = iseq->catch_table;
-                    
-
-                    /* create a new catch table to catch this exception, and put it in the current iseq */
-                    iseq->catch_table_size = 1;
-                    iseq->catch_table =
-                    create_catch_table(debug_context, top_frame->info.runtime.last_pc - cfp->iseq->iseq_encoded - insn_len(BIN(trace)));
-                    break;    
-                }
+                /* send catchpoint notification */                
+                hit_count = rb_hash_aref(rdebug_catchpoints, mod_name);
+                c_hit_count = (hit_count != Qnil ? FIX2INT(hit_count) : 0) + 1;
+                hit_count = INT2FIX(c_hit_count);
+                rb_hash_aset(rdebug_catchpoints, mod_name, hit_count);
+                debug_context->stop_reason = CTX_STOP_CATCHPOINT;
+                rb_funcall(context, idAtCatchpoint, 1, rb_errinfo());
+                if(self && binding == Qnil)
+                    binding = create_binding(self);
+                save_top_binding(debug_context, binding);
+                call_at_line(context, debug_context, rb_str_new2(top_frame->file), INT2FIX(top_frame->line));
             }
         }
 
@@ -1931,8 +1911,11 @@ copy_scalar_args(debug_frame_t *debug_frame)
         for (i = 0; i < iseq->argc; i++)
         {
             if (!rb_is_local_id(iseq->local_table[i])) continue; /* skip flip states */
-
+#ifdef HAVE_RB_CONTROL_FRAME_T_EP
+            val = *(cfp->ep - iseq->local_size + i);
+#else            
             val = *(cfp->dfp - iseq->local_size + i);
+#endif
 
             if (arg_value_is_small(val))
                 rb_ary_push(debug_frame->arg_ary, val);
@@ -1993,7 +1976,11 @@ context_copy_locals(debug_context_t *debug_context, debug_frame_t *debug_frame,
         {
             VALUE str = rb_id2str(iseq->local_table[i]);
             if (str != 0)
+#ifdef HAVE_RB_CONTROL_FRAME_T_EP
+                rb_hash_aset(hash, str, *(cfp->ep - iseq->local_size + i));
+#else                
                 rb_hash_aset(hash, str, *(cfp->dfp - iseq->local_size + i));
+#endif            
         }
     }
 
@@ -2011,7 +1998,11 @@ context_copy_locals(debug_context_t *debug_context, debug_frame_t *debug_frame,
                 {
                     VALUE str = rb_id2str(iseq->local_table[i]);
                     if (str != 0)
+#ifdef HAVE_RB_CONTROL_FRAME_T_EP
+                        rb_hash_aset(hash, str, *(block_frame->ep - iseq->local_table_size + i - 1));
+#else                        
                         rb_hash_aset(hash, str, *(block_frame->dfp - iseq->local_table_size + i - 1));
+#endif                    
                 }
                 return(hash);
             }
@@ -2478,11 +2469,24 @@ context_jump(VALUE self, VALUE line, VALUE file)
     /* find target frame to jump to */
     while (RUBY_VM_VALID_CONTROL_FRAME_P(cfp, cfp_end))
     {
+#ifdef HAVE_RB_ISEQ_T_LOCATION
+        if ((cfp->iseq != NULL) && (rb_str_cmp(file, cfp->iseq->location.path) == 0))
+#else        
         if ((cfp->iseq != NULL) && (rb_str_cmp(file, cfp->iseq->filename) == 0))
+#endif            
         {
+#ifdef HAVE_RB_ISEQ_T_LINE_INFO_SIZE
+            for (i = 0; i < cfp->iseq->line_info_size; i++)
+#else            
             for (i = 0; i < cfp->iseq->insn_info_size; i++)
+#endif                
             {
+#ifdef HAVE_RB_ISEQ_T_LINE_INFO_SIZE
+                if (cfp->iseq->line_info_table[i].line_no != line)
+#else            
                 if (cfp->iseq->insn_info_table[i].line_no != line)
+#endif                   
+                
                     continue;
 
                 /* hijack the currently running code so that we can change the frame PC */
@@ -2492,8 +2496,13 @@ context_jump(VALUE self, VALUE line, VALUE file)
                 cfp_start->pc[1] = (VALUE)do_jump;
 
                 debug_context->jump_cfp = cfp;
+#ifdef HAVE_RB_ISEQ_T_LINE_INFO_SIZE
+                debug_context->jump_pc =
+                    cfp->iseq->iseq_encoded + cfp->iseq->line_info_table[i].position;
+#else                
                 debug_context->jump_pc =
                     cfp->iseq->iseq_encoded + cfp->iseq->insn_info_table[i].position;
+#endif                    
 
                 return(INT2FIX(0)); /* success */
             }

data/ext/ruby_debug/ruby_debug.h

@@ -45,7 +45,11 @@ typedef struct {
     union {
         struct {
 			rb_control_frame_t *cfp;
-			VALUE *bp;
+#if VM_DEBUG_BP_CHECK
+            VALUE *bp_check;
+#else    
+            VALUE *bp;
+#endif            
 			struct rb_iseq_struct *block_iseq;
 			VALUE *block_pc;
             VALUE *last_pc;

data/lib/ruby-debug-base.rb

@@ -1,6 +1,5 @@
 require 'ruby_debug'
 require 'rubygems'
-require 'linecache19'
 
 module Debugger
   
@@ -90,19 +89,6 @@ module Debugger
       end
       context
     end
-    
-    def source_reload
-      LineCache::clear_file_cache
-    end
-    
-    # Get line +line_number+ from file named +filename+. Return "\n"
-    # there was a problem. Leaking blanks are stripped off.
-    def line_at(filename, line_number) # :nodoc:
-      @reload_on_change=nil unless defined?(@reload_on_change)
-      line = LineCache::getline(filename, line_number, @reload_on_change)
-      return "\n" unless line
-      return "#{line.gsub(/^\s+/, '').chomp}\n"
-    end
 
     #
     # Activates the post-mortem mode. There are two ways of using it:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-debug-base19x
 version: !ruby/object:Gem::Version
-  version: 0.11.30.pre10
+  version: 0.11.30.pre12
   prerelease: 8
 platform: ruby
 authors:
@@ -9,52 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: columnize
-  requirement: &70196555532780 !ruby/object:Gem::Requirement
+  name: debugger-ruby_core_source
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70196555532780
-- !ruby/object:Gem::Dependency
-  name: ruby_core_source
-  requirement: &70196555530700 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.4
-  type: :runtime
-  prerelease: false
-  version_requirements: *70196555530700
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
-  name: linecache19
-  requirement: &70196555529100 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.11
+        version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70196555529100
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70196555527340 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *70196555527340
 description: ! 'ruby-debug is a fast implementation of the standard Ruby debugger
   debug.rb.
 
@@ -104,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: ruby-debug19
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Fast Ruby debugger - core component