debugger 1.3.3 → 1.4.0

data/ext/ruby_debug/200/ruby_debug.h

@@ -0,0 +1,148 @@
+/* Context info */
+enum ctx_stop_reason {CTX_STOP_NONE, CTX_STOP_STEP, CTX_STOP_BREAKPOINT, 
+		      CTX_STOP_CATCHPOINT};
+
+/* Context flags */
+#define CTX_FL_SUSPEND      (1<<1)
+#define CTX_FL_TRACING      (1<<2)
+#define CTX_FL_SKIPPED      (1<<3)
+#define CTX_FL_IGNORE       (1<<4)
+#define CTX_FL_DEAD         (1<<5)
+#define CTX_FL_WAS_RUNNING  (1<<6)
+#define CTX_FL_ENABLE_BKPT  (1<<7)
+#define CTX_FL_STEPPED      (1<<8)
+#define CTX_FL_FORCE_MOVE   (1<<9)
+#define CTX_FL_CATCHING     (1<<10)
+
+#define CTX_FL_TEST(c,f)  ((c)->flags & (f))
+#define CTX_FL_SET(c,f)   do { (c)->flags |= (f); } while (0)
+#define CTX_FL_UNSET(c,f) do { (c)->flags &= ~(f); } while (0)
+
+typedef struct {
+    struct iseq_catch_table_entry tmp_catch_table;
+    struct iseq_catch_table_entry *old_catch_table;
+    int old_catch_table_size;
+    VALUE mod_name;
+    VALUE errinfo;
+} debug_catch_t;
+
+typedef struct {
+    struct rb_iseq_struct *iseq;
+    struct iseq_catch_table_entry *catch_table;
+    int catch_table_size;
+} iseq_catch_t;
+
+typedef struct {
+    int argc;         /* Number of arguments a frame should have. */
+    VALUE binding;
+    ID id;
+    ID orig_id;
+    int line;
+    const char * file;
+    short dead;
+    VALUE self;
+    VALUE arg_ary;
+    union {
+        struct {
+			rb_control_frame_t *cfp;
+			VALUE *bp;
+			struct rb_iseq_struct *block_iseq;
+			VALUE *block_pc;
+            VALUE *last_pc;
+        } runtime;
+        struct {
+            VALUE args;
+            VALUE locals;
+	        VALUE arg_ary;
+        } copy;
+    } info;
+} debug_frame_t;
+
+typedef struct {
+    VALUE thread_id;
+    int thnum;
+    int flags;
+    enum ctx_stop_reason stop_reason;
+    int stop_next;
+    int dest_frame;
+    int stop_line;
+    int stop_frame;
+    int stack_size;
+    int stack_len;
+    debug_frame_t *frames;
+    const char * last_file;
+    int last_line;
+    VALUE breakpoint;
+    debug_catch_t catch_table;
+    VALUE saved_jump_ins[2];
+    rb_control_frame_t *jump_cfp;
+    VALUE *jump_pc;
+    iseq_catch_t *old_iseq_catch;
+    volatile int thread_pause;
+} debug_context_t;
+
+/* variables in ruby_debug.c */
+extern VALUE mDebugger;
+extern VALUE rdebug_breakpoints;
+extern VALUE rdebug_catchpoints;
+extern VALUE rdebug_threads_tbl;
+
+/* routines in ruby_debug.c */
+extern int  filename_cmp(VALUE source, char *file);
+
+#define IS_STARTED  (rdebug_threads_tbl != Qnil)
+static inline void
+debug_check_started()
+{
+    if(!IS_STARTED)
+    {
+        rb_raise(rb_eRuntimeError, "Debugger.start is not called yet.");
+    }
+}
+
+static inline int
+classname_cmp(VALUE name, VALUE klass)
+{
+    VALUE mod_name;
+    VALUE class_name = (Qnil == name) ? rb_str_new2("main") : name;
+    if (klass == Qnil) return(0);
+    mod_name = rb_mod_name(klass);
+    return (mod_name != Qnil 
+	    && rb_str_cmp(class_name, mod_name) == 0);
+}
+
+/* Breakpoint information */
+enum bp_type {BP_POS_TYPE, BP_METHOD_TYPE};
+enum hit_condition {HIT_COND_NONE, HIT_COND_GE, HIT_COND_EQ, HIT_COND_MOD};
+
+typedef struct {
+    int   id;
+    enum bp_type type;
+    VALUE source;
+    union
+    {
+        int line;
+        ID  mid;
+    } pos;
+    VALUE expr;
+    VALUE enabled;
+    int hit_count;
+    int hit_value;
+    enum hit_condition hit_condition;
+} debug_breakpoint_t;
+
+/* routines in breakpoint.c */
+extern int   check_breakpoint_expression(VALUE breakpoint, VALUE binding);
+extern int   check_breakpoint_hit_condition(VALUE breakpoint);
+extern VALUE check_breakpoints_by_method(debug_context_t *debug_context, 
+    VALUE klass, ID mid, VALUE self);
+extern VALUE check_breakpoints_by_pos(debug_context_t *debug_context, 
+    char *file, int line);
+extern VALUE create_breakpoint_from_args(int argc, VALUE *argv, int id);
+extern VALUE context_breakpoint(VALUE self);
+extern VALUE context_set_breakpoint(int argc, VALUE *argv, VALUE self);
+extern VALUE rdebug_add_catchpoint(VALUE self, VALUE value);
+extern VALUE debug_catchpoints(VALUE self);
+extern VALUE rdebug_remove_breakpoint(VALUE self, VALUE id_value);
+
+extern void Init_breakpoint();

data/ext/ruby_debug/extconf.rb

@@ -3,10 +3,10 @@ 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}"
+    ruby_include = "#{$1}/#{$2}/include/ruby-#{RUBY_VERSION.start_with?("1.9") ? "1.9.1" : RUBY_VERSION}/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 = "#{$1}/#{$2}/include/ruby-#{RUBY_VERSION.start_with?("1.9") ? "1.9.1" : RUBY_VERSION}/#{$2}"
     ruby_include = "#{ENV['rvm_path']}/src/#{$2}" unless File.exist?(ruby_include)
     ARGV << "--with-ruby-include=#{ruby_include}"
   end
@@ -27,7 +27,7 @@ hdrs = if RUBY_VERSION == '1.9.2'
     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")
   }
-else
+elsif RUBY_VERSION == '1.9.3'
   lambda {
     iseqs = %w[vm_core.h iseq.h]
     begin
@@ -49,9 +49,35 @@ SRC
       $defs << '-DRB_ISEQ_COMPILE_5ARGS'
     end
   }
+elsif RUBY_VERSION == '2.0.0'
+  lambda {
+    iseqs = %w[vm_core.h iseq.h]
+    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
+        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") or return(false)
+    have_type("struct iseq_line_info_entry", iseqs) or
+        have_type("struct iseq_insn_info_entry", iseqs) or
+        return(false)
+    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 << "-DHAVE_RB_ISEQ_COMPILE_ON_BASE  -DVM_DEBUG_BP_CHECK -DHAVE_RB_CONTROL_FRAME_T_EP -DHAVE_RB_ISEQ_T_LOCATION -DHAVE_RB_ISEQ_T_LINE_INFO_SIZE "
+    end
+  }
+else
+  STDERR.puts "Ruby version #{RUBY_VERSION} is not supported."
+  exit(1)
 end
 
-header_dir = RUBY_VERSION == '1.9.2' ? '192' : '193'
+
+header_dir = RUBY_VERSION.gsub('.', '')
 current_dir = File.dirname(__FILE__)
 %w{ruby_debug.h ruby_debug.c breakpoint.c}.each do |file|
   FileUtils.cp("#{current_dir}/#{header_dir}/#{file}", current_dir)

data/lib/debugger/version.rb

@@ -1,5 +1,5 @@
 module Debugger
   # TODO: remove version from C ext
   send :remove_const, :VERSION if const_defined? :VERSION
-  VERSION = '1.3.3'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: debugger
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-24 00:00:00.000000000Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: columnize
@@ -206,6 +206,9 @@ files:
 - ext/ruby_debug/193/breakpoint.c
 - ext/ruby_debug/193/ruby_debug.c
 - ext/ruby_debug/193/ruby_debug.h
+- ext/ruby_debug/200/breakpoint.c
+- ext/ruby_debug/200/ruby_debug.c
+- ext/ruby_debug/200/ruby_debug.h
 - ext/ruby_debug/extconf.rb
 - lib/debugger.rb
 - lib/debugger/version.rb
@@ -346,7 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Fast Ruby debugger - base + cli