trepanning 1.93.35 → 2.15.33

data/processor/breakpoint.rb

@@ -1,113 +1,115 @@
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2015 Rocky Bernstein <rockyb@rubyforge.net>
+require 'rubyvm-frame'
 require_relative 'virtual'
 class Trepan
 
-  class CmdProcessor < VirtualCmdProcessor
+    class CmdProcessor < VirtualCmdProcessor
 
-    attr_reader   :brkpts          # BreakpointManager. 
+        attr_reader   :brkpts          # BreakpointManager.
 
-    attr_reader   :brkpt           # Breakpoint. If we are stopped at a
-                                   # breakpoint this is the one we
-                                   # found.  (There may be other
-                                   # breakpoints that would have caused a stop
-                                   # as well; this is just one of them).
-                                   # If no breakpoint stop this is nil.
+        attr_reader   :brkpt           # Breakpoint. If we are stopped at a
+                                       # breakpoint this is the one we
+                                       # found.  (There may be other
+                                       # breakpoints that would have caused a stop
+                                       # as well; this is just one of them).
+                                       # If no breakpoint stop this is nil.
 
-    def breakpoint_initialize
-      @brkpts = BreakpointMgr.new
-      @brkpt  = nil
-    end
+        def breakpoint_initialize
+            @brkpts = BreakpointMgr.new
+            @brkpt  = nil
+        end
 
-    def breakpoint_finalize
-      @brkpts.finalize
-    end
+        def breakpoint_finalize
+            @brkpts.finalize
+        end
 
-    def breakpoint?
-      @brkpt = @brkpts.find(@frame.iseq, @frame.pc_offset, @frame.binding)
-      @brkpts.delete_by_brkpt(@brkpt) if @brkpt && @brkpt.temp?
-      return !!@brkpt
-    end
+        def breakpoint?
+            return nil unless @frame && @frame.iseq
+            @brkpt = @brkpts.find(@frame.iseq, @frame.pc_offset, @frame.binding)
+            @brkpts.delete_by_brkpt(@brkpt) if @brkpt && @brkpt.temp?
+            return !!@brkpt
+        end
 
-    def breakpoint_find(bpnum, show_errmsg = true)
-      if 0 == @brkpts.size 
-        errmsg('No breakpoints set.') if show_errmsg
-        return nil
-      elsif bpnum > @brkpts.max || bpnum < 1
-        errmsg('Breakpoint number %d is out of range 1..%d' %
-               [bpnum, @brkpts.max]) if show_errmsg
-        return nil
-      end
-      bp = @brkpts[bpnum]
-      if bp
-        return bp
-      else
-        errmsg('Breakpoint number %d previously deleted.' %
-               bpnum) if show_errmsg
-        return nil
-      end
-    end
+        def breakpoint_find(bpnum, show_errmsg = true)
+            if 0 == @brkpts.size
+                errmsg('No breakpoints set.') if show_errmsg
+                return nil
+            elsif bpnum > @brkpts.max || bpnum < 1
+                errmsg('Breakpoint number %d is out of range 1..%d' %
+                       [bpnum, @brkpts.max]) if show_errmsg
+                return nil
+            end
+            bp = @brkpts[bpnum]
+            if bp
+                return bp
+            else
+                errmsg('Breakpoint number %d previously deleted.' %
+                       bpnum) if show_errmsg
+                return nil
+            end
+        end
 
-    # Does whatever needs to be done to set a breakpoint
-    def breakpoint_line(line_number, initial_iseq, temp=false)
-      # FIXME: handle breakpoint conditions.
-      found_iseq = initial_iseq.child_iseqs.detect do |iseq|
-        iseq.lineoffsets.keys.member?(line_number) 
-      end
-      unless found_iseq
-        found_iseq = initial_iseq.parent
-        while found_iseq do
-          break if found_iseq.lineoffsets.keys.member?(line_number)
-          found_iseq = found_iseq.parent
+        # Does whatever needs to be done to set a breakpoint
+        def breakpoint_line(line_number, initial_iseq, temp=false)
+            # FIXME: handle breakpoint conditions.
+            found_iseq = initial_iseq.child_iseqs.detect do |iseq|
+                iseq.lineoffsets.keys.member?(line_number)
+            end
+            unless found_iseq
+                found_iseq = initial_iseq.parent
+                while found_iseq do
+                    break if found_iseq.lineoffsets.keys.member?(line_number)
+                    found_iseq = found_iseq.parent
+                end
+            end
+            offset =
+                if found_iseq
+                    # FIXME
+                    found_iseq.line2offsets(line_number)[1] ||
+                        found_iseq.line2offsets(line_number)[0]
+                else
+                    nil
+                end
+            unless offset
+                place = "in #{iseq.source_container.join(' ')} " if found_iseq
+                errmsg("No line #{line_number} found #{place}for breakpoint.")
+                return nil
+            end
+            @brkpts.add(found_iseq, offset, :temp => temp)
         end
-      end
-      offset = 
-        if found_iseq 
-          # FIXME
-          found_iseq.line2offsets(line_number)[1] || 
-            found_iseq.line2offsets(line_number)[0]
-        else
-          nil
+
+        def breakpoint_offset(offset, iseq, condition, negate, temp=false)
+            # FIXME: handle breakpoint conditions.
+            unless iseq.offsetlines.keys.member?(offset)
+                errmsg("Offset #{offset} not found in #{iseq.label} for breakpoint.")
+                return nil
+            end
+            @brkpts.add(iseq, offset, :temp => temp, :condition => condition,
+                        :negate => negate, :type => 'offset')
         end
-      unless offset
-        place = "in #{iseq.source_container.join(' ')} " if found_iseq 
-        errmsg("No line #{line_number} found #{place}for breakpoint.")
-        return nil
-      end
-      @brkpts.add(found_iseq, offset, :temp => temp)
-    end
 
-    def breakpoint_offset(offset, iseq, condition, negate, temp=false)
-      # FIXME: handle breakpoint conditions.
-      unless iseq.offsetlines.keys.member?(offset)
-        errmsg("Offset #{offset} not found in #{iseq.name} for breakpoint.")
-        return nil
-      end
-      @brkpts.add(iseq, offset, :temp => temp, :condition => condition,
-                  :negate => negate, :type => 'offset')
-    end
+        # Delete a breakpoint given its breakpoint number.
+        def delete_breakpoint_by_number(bpnum, do_enable=true)
+            bp = breakpoint_find(bpnum)
+            return false unless bp
 
-    # Delete a breakpoint given its breakpoint number.
-    def delete_breakpoint_by_number(bpnum, do_enable=true)
-      bp = breakpoint_find(bpnum)
-      return false unless bp
-          
-      @brkpts.delete_by_brkpt(bp)
-      return true
-    end
+            @brkpts.delete_by_brkpt(bp)
+            return true
+        end
+
+        # Enable or disable a breakpoint given its breakpoint number.
+        def en_disable_breakpoint_by_number(bpnum, do_enable=true)
+            bp = breakpoint_find(bpnum)
+            return false unless bp
 
-    # Enable or disable a breakpoint given its breakpoint number.
-    def en_disable_breakpoint_by_number(bpnum, do_enable=true)
-      bp = breakpoint_find(bpnum)
-      return false unless bp
-          
-      enable_disable = do_enable ? 'en' : 'dis'
-      if bp.enabled? == do_enable
-        errmsg('Breakpoint %d previously %sabled.' % 
-               [bpnum, enable_disable])
-        return false
-      end
-      bp.enabled = do_enable
-      return true
+            enable_disable = do_enable ? 'en' : 'dis'
+            if bp.enabled? == do_enable
+                errmsg('Breakpoint %d previously %sabled.' %
+                       [bpnum, enable_disable])
+                return false
+            end
+            bp.enabled = do_enable
+            return true
+        end
     end
-  end
 end

data/processor/command/base/submgr.rb

@@ -13,7 +13,7 @@ class Trepan::SubcommandMgr < Trepan::Command
     CATEGORY      = 'status'
     MIN_ARGS      = 0
     MAX_ARGS      = nil
-    NAME          = '?' # FIXME: Need to define this, but should 
+    NAME          = '?' # FIXME: Need to define this, but should
                         # pick this up from class/file name.
     NEED_STACK    = false
   end
@@ -48,7 +48,7 @@ class Trepan::SubcommandMgr < Trepan::Command
     cmd_dir = File.dirname(__FILE__)
     subcmd_dir = File.join(cmd_dir, '..', name + '_subcmd')
     files = Dir.glob(File.join(subcmd_dir, '*.rb'))
-    files.each do |rb| 
+    files.each do |rb|
       basename = File.basename(rb, '.rb')
       if File.directory?(File.join(File.dirname(rb), basename + '_subcmd'))
         subcmd_names << name.capitalize + basename.capitalize
@@ -92,7 +92,7 @@ class Trepan::SubcommandMgr < Trepan::Command
   #        help cmd subcmd
   #        help cmd commands
   #
-  #  Our shtick is to give help for the overall command only if 
+  #  Our shtick is to give help for the overall command only if
   #  subcommand or 'commands' is not given. If a subcommand is given and
   #  found, then specific help for that is given. If 'commands' is given
   #  we will list the all the subcommands.
@@ -103,8 +103,8 @@ class Trepan::SubcommandMgr < Trepan::Command
       if doc
        return doc
       else
-        errmsg('Sorry - author mess up. ' + 
-               'No help registered for command' + 
+        errmsg('Sorry - author mess up. ' +
+               'No help registered for command' +
                @name)
         return nil
       end
@@ -128,9 +128,9 @@ class Trepan::SubcommandMgr < Trepan::Command
         if doc
           return doc
         else
-          errmsg('Sorry - author mess up. ' + 
-                 'No help registered for subcommand: ' + 
-                 subcmd_name + ', of command: ' + 
+          errmsg('Sorry - author mess up. ' +
+                 'No help registered for subcommand: ' +
+                 subcmd_name + ', of command: ' +
                  @name)
           return nil
         end
@@ -153,7 +153,7 @@ class Trepan::SubcommandMgr < Trepan::Command
 
   # Return an Array of subcommands that can start with +arg+. If none
   # found we just return +arg+.
-  # FIXME: Not used any more? 
+  # FIXME: Not used any more?
   def complete(prefix)
     Trepan::Complete.complete_token(@subcmds.subcmds.keys, prefix)
   end

data/processor/command/break.rb

@@ -30,51 +30,53 @@ See also:
 `condition`, `continue`, `help syntax location`, and `tbreak`
     HELP
 
-    ALIASES      = %w(b)
-    CATEGORY     = 'breakpoints'
-    SHORT_HELP  = 'Set a breakpoint'
+      ALIASES      = %w(b)
+      CATEGORY     = 'breakpoints'
+      SHORT_HELP  = 'Set a breakpoint'
   end
 
-  # This method runs the command
-  def run(args, temp=false)
-    # FIXME: handle more conditions
-    # a line number
-    if args.size == 1
-      # usage is "break"  which means break right here
-      # FIXME: should handle condition
-      bp = @proc.breakpoint_offset(@proc.frame.pc_offset,
-                                   @proc.frame.iseq, 'true', false)
-    else
-      iseq, line_number, vm_offset, condition, negate =
-        @proc.breakpoint_position(@proc.cmd_argstr, true)
-      return false unless iseq && vm_offset
-      bp = @proc.breakpoint_offset(vm_offset, iseq, condition, negate, temp)
-    end
-    if bp
-      bp.condition = condition
+    # This method runs the command
+    def run(args, temp=false)
+        # FIXME: handle more conditions
+        # a line number
+        if args.size == 1
+            # usage is "break"  which means break right here
+            # FIXME: should handle condition
+            frame = @proc.frame
+            iseq = frame.iseq
+            start_insn = iseq.start_insn(frame.pc_offset)
+            bp = @proc.breakpoint_offset(start_insn, iseq, 'true', false)
+        else
+            iseq, line_number, vm_offset, condition, negate =
+                @proc.breakpoint_position(@proc.cmd_argstr, true)
+            return false unless iseq && vm_offset
+            bp = @proc.breakpoint_offset(vm_offset, iseq, condition, negate, temp)
+        end
+        if bp
+            bp.condition = condition
 
-      if temp
-        mess = "Temporary breakpoint %d set at " % bp.id
-      else
-        mess = "Breakpoint %d set at " % bp.id
-      end
+            if temp
+                mess = "Temporary breakpoint %d set at " % bp.id
+            else
+                mess = "Breakpoint %d set at " % bp.id
+            end
 
-      line_loc = "line %s in %s" %
-        [bp.source_location.join(', '),
-         @proc.canonic_container(bp.iseq.source_container).join(' ')]
+            line_loc = "line %s in %s" %
+                [bp.source_location.join(', '),
+                 @proc.canonic_container(bp.iseq.source_container).join(' ')]
 
-      vm_loc = "VM offset %d of instruction sequence \"%s\"" %
-        [bp.offset, bp.iseq.name]
+            vm_loc = "VM offset %d of instruction sequence \"%s\"" %
+                [bp.offset, bp.iseq.label]
 
-      loc, other_loc =
-        if 'line' == bp.type
-          [line_loc, vm_loc]
-        else # 'offset' == bp.type
-          [vm_loc, line_loc]
+            loc, other_loc =
+                if 'line' == bp.type
+                    [line_loc, vm_loc]
+                else # 'offset' == bp.type
+                    [vm_loc, line_loc]
+                end
+            msg(mess + loc + ",\n\t" + other_loc + ".")
         end
-      msg(mess + loc + ",\n\t" + other_loc + ".")
     end
-  end
 end
 
 if __FILE__ == $0
@@ -89,7 +91,7 @@ if __FILE__ == $0
   run_cmd(cmd, [cmd.name])
   run_cmd(cmd, [cmd.name, __LINE__.to_s])
   require 'thread_frame'
-  tf = RubyVM::Frame.current
+  tf = RubyVM::Frame.get
   pc_offset = tf.pc_offset
   run_cmd(cmd, [cmd.name, "@#{pc_offset}"])
   def foo

data/processor/command/continue.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2015 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative '../command'
 require_relative '../running'
 require_relative '../../app/breakpoint' # FIXME: possibly temporary
@@ -7,24 +7,29 @@ class Trepan::Command::ContinueCommand < Trepan::Command
   unless defined?(HELP)
     NAME = File.basename(__FILE__, '.rb')
     HELP = <<-HELP
-#{NAME} [LOCATION]
+**#{NAME}** [*location*]
 
 Leave the debugger loop and continue execution. Subsequent entry to
 the debugger however may occur via breakpoints or explicit calls, or
 exceptions.
 
 If a parameter is given, a temporary breakpoint is set at that position
-before continuing. Offset are numbers prefixed with an "O" otherwise
+before continuing. Offset are numbers prefixed with an "O"; otherwise
 the parameter is taken as a line number.
 
 Examples:
-   #{NAME}
-   #{NAME} 10    # continue to line 10
-   #{NAME} o20   # continue to VM Instruction Sequence offset 20
-   #{NAME} gcd   # continue to first instruction of method gcd
-   #{NAME} IRB.start o7 # continue to IRB.start offset 7
+---------
 
-See also 'step', 'next', 'finish', 'nexti' commands and "help location".
+    #{NAME}
+    #{NAME} 10    # continue to line 10
+    #{NAME} o20   # continue to VM Instruction Sequence offset 20
+    #{NAME} gcd   # continue to first instruction of method gcd
+    #{NAME} IRB.start o7 # continue to IRB.start offset 7
+
+See also:
+---------
+
+`step`, `next`, `finish`, `nexti` `help syntax location`.
     HELP
 
     ALIASES      = %w(c cont)
@@ -40,7 +45,7 @@ See also 'step', 'next', 'finish', 'nexti' commands and "help location".
       # Form is: "continue"
       @proc.continue
     else
-      iseq, line_number, vm_offset, condition, negate = 
+      iseq, line_number, vm_offset, condition, negate =
         @proc.breakpoint_position(@proc.cmd_argstr, false)
       return false unless iseq && vm_offset
       bp = @proc.breakpoint_offset(vm_offset, iseq, condition, negate, true)

data/processor/command/debug.rb

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2010, 2012, 2015 Rocky Bernstein <rockyb@rubyforge.net>
-require 'thread_frame'
 require_relative '../command'
 
 class Trepan::Command::DebugCommand < Trepan::Command
@@ -27,46 +26,28 @@ Enter the debugger recursively on *ruby-code*.
     arg_str    = args[1..-1].join(' ')
     hidelevels = @proc.hidelevels[th]
 
-    stack_diff = RubyVM::Frame.current.stack_size - frame.stack_size
-
-    # Ignore tracing in support routines:
-    # FIXME remvoe 1.9.3 hack
-    if '1.9.3' != RUBY_VERSION
-      tf = @proc.dbgr.trace_filter
-      [self.method(:run), @proc.method(:debug_eval),
-       @proc.method(:debug_eval_with_exception),
-       @proc.method(:get_binding_and_filename),
-       @proc.method(:fake_eval_filename)].each do |m|
-        tf << m unless tf.member?(m)
-      end
-    end
+    stack_diff = RubyVM::Frame.stack_size - frame.stack_size
 
     @proc.hidelevels[th] += stack_diff + EXTRA_DEBUG_SETUP_CALLS
 
     # Values we need to save before munging them
-    old_tracing            = th.tracing?
-    old_exec_event_tracing = th.exec_event_tracing?
     old_mutex              = @proc.core.mutex
     old_next_level         = @proc.next_level
     old_step_count         = @proc.core.step_count
 
-    section 'ENTERING NESTED DEBUGGER'
 
     # Things we need to do to allow entering the debugger again
     @proc.debug_nest      += 1
     @proc.core.mutex       = Mutex.new
-    th.tracing             = false
-    th.exec_event_tracing  = false
     @proc.next_level       = 32000
 
-    RubyVM::Frame.current.trace_off = false
     @proc.core.step_count  = 0
-    retval = @proc.debug_eval(arg_str, 15,
-                              RUBY_VERSION == '1.9.3') # FIXME
+    section 'ENTERING NESTED DEBUGGER'
+    old_trace_arg          = RubyVM::TraceArg.save
+    retval = @proc.debug_eval(arg_str, 15)
 
     # Restore munged values
-    th.exec_event_tracing  = old_exec_event_tracing
-    th.tracing             = old_tracing
+    RubyVM::TraceArg.restore(old_trace_arg)
     @proc.core.mutex       = old_mutex
     @proc.frame_setup(frame)
     @proc.hidelevels[th]   = hidelevels
@@ -83,6 +64,6 @@ if __FILE__ == $0
   require_relative '../mock'
   dbgr, cmd = MockDebugger::setup
   cmd.proc.hidelevels[Thread.current] = 0
-  cmd.proc.frame_setup(RubyVM::Frame::current)
+  cmd.proc.frame_setup(RubyVM::Frame.get)
   cmd.run([cmd.name, 'x = 1; y = 2'])
 end