rbx-trepanning 0.0.8-universal-rubinius-1.2 → 0.1.0-universal-rubinius-1.2

data/io/tcpclient.rb

@@ -4,7 +4,7 @@
 
 require 'socket'
 require 'rubygems'; require 'require_relative'
-require_relative 'base_io'
+require_relative '../io'
 require_relative 'tcpfns'
 
 class Trepan 

data/io/tcpserver.rb

@@ -5,7 +5,7 @@
 require 'socket'
 require 'rubygems'; require 'require_relative'
 require_relative '../app/default' # For host and port
-require_relative 'base_io'
+require_relative '../io'
 require_relative 'tcpfns'
 
 class Trepan 

data/lib/trepanning.rb

@@ -8,7 +8,7 @@ require 'rubygems'; require 'require_relative'
 require_relative '../app/complete'       # command completion
 require_relative '../app/frame'
 require_relative '../app/util'           # get_dollar_0
-require_relative '../processor/main'
+require_relative '../processor'
 require_relative '../app/breakpoint'
 require_relative '../app/default'        # default debugger settings
 require_relative '../app/breakpoint'
@@ -50,7 +50,8 @@ class Trepan
     @input  = @settings[:input] || STDIN
     @output = @settings[:output] || STDOUT
 
-    cmdproc_settings = {:highlight => @settings[:highlight]}
+    cmdproc_settings = {:highlight  => @settings[:highlight],
+                        :traceprint => @settings[:traceprint]}
 
     @processor = CmdProcessor.new(self, cmdproc_settings)
     @completion_proc = method(:completion_method)
@@ -73,7 +74,7 @@ class Trepan
         opts[:host] = @settings[:host] if @settings[:host]
         opts[:complete] = @completion_proc
         opts[:readline] ||= @settings[:readline]
-        [Trepan::ClientInterface.new(nil, nil, nil, nil, opts)]
+        [Trepan::ClientInterface.new(nil, nil, nil, {}, opts)]
       else
         opts = {:complete => @completion_proc,
                 :readline => @settings[:readline]}
@@ -159,7 +160,7 @@ class Trepan
          'step', 'set hidelevel -1'
         ]
       else
-        ['next', 'next', 
+        ['next', 'next', 'next',
          # 'set kernelstep off',  # eventually would like 'on'
          'set hidelevel -1',
          'step', ]
@@ -204,15 +205,10 @@ class Trepan
       @processor.hidelevels[@thread] = @settings[:hide_level]
     end
 
-    # unless defined?(PROG_UNRESOLVED_SCRIPT)
-    #   # We may later do more sophisticated things...
-    #  Trepan.const_set('PROG_UNRESOLVED_SCRIPT', 
-    #                   Rubinius::OS_ARGV.index($0) ? $0 : nil)
-    # end
-
     process_cmdfile_setting(settings)
 
-    # Feed info to the debugger thread!
+    # Feed info (breakpoint, debugged program thread, channel and backtrace 
+    # info) to the debugger thread
     locs = Rubinius::VM.backtrace(@settings[:offset] + 1, true)
 
     method = Rubinius::CompiledMethod.of_sender
@@ -226,6 +222,8 @@ class Trepan
     # wait for the debugger to release us
     channel.receive
 
+    # Now that there is a debugger on the other end, set the debugged 
+    # program thread to call us when it hits a breakpoint.
     Thread.current.set_debugger_thread @thread
     self
   end
@@ -233,7 +231,7 @@ class Trepan
 
   def stop(settings = {})
     @processor.finalize
-    Rubinius::VM.debug_channel = nil
+    # Rubinius::VM.debug_channel = nil
   end
 
   def add_command_file(cmdfile, opts={}, stderr=$stderr)
@@ -301,7 +299,7 @@ class Trepan
         status = @breakpoint.hit!(@vm_locations.first.variables)
         if status
           break
-        elsif status.nil? 
+        elsif @breakpoint.enabled? && status.nil? 
           # A permanent breakpoint. Check the condition.
           break if @breakpoint.condition?(@current_frame.binding)
         end

data/{processor/main.rb → processor.rb}

@@ -10,12 +10,12 @@ require 'rubygems'; require 'require_relative'
 %w(default breakpoint disassemble display eval eventbuf load_cmds location 
    frame hook msg running stepping validate).each do
   |mod_str|
-  require_relative mod_str
+  require_relative "processor/#{mod_str}"
 end
-## require_relative '../app/brkptmgr'
+require_relative 'app/brkptmgr'
 
 class Trepan
-  class CmdProcessor
+  class CmdProcessor < VirtualCmdProcessor
 
     # SEE ALSO attr's in require_relative's of loop above.
 
@@ -42,6 +42,9 @@ class Trepan
                                    # the command loop (which often continues to 
                                    # run the debugged program). 
     attr_accessor :line_no         # Last line shown in "list" command
+    attr_accessor :next_level      # Fixnum. frame.stack_size has to
+                                   # be <= than this.  If next'ing,
+                                   # this will be > 0.
     attr_accessor :next_thread     # Thread. If non-nil then in
                                    # stepping the thread has to be
                                    # this thread.
@@ -58,34 +61,6 @@ class Trepan
                                   #  current_thread, pc_offset]
 
 
-    unless defined?(EVENT2ICON)
-      # Event icons used in printing locations.
-      EVENT2ICON = {
-        'brkpt'          => 'xx',
-        'tbrkpt'         => 'x1',
-        'c-call'         => 'C>',
-        'c-return'       => '<C',
-        'step-call'      => '->',
-        'call'           => '->',
-        'class'          => '::',
-        'coverage'       => '[]',
-        'debugger-call'  => ':o',
-        'end'            => '-|',
-        'line'           => '--',
-        'raise'          => '!!',
-        'return'         => '<-',
-        'start'          => '>>',
-        'switch'         => 'sw',
-        'trace-var'      => '$V',
-        'unknown'        => '?!',
-        'vm'             => 'VM',
-        'vm-insn'        => '..',
-      } 
-      # These events are important enough event that we always want to
-      # stop on them.
-      UNMASKABLE_EVENTS = Set.new(['end', 'raise', 'unknown'])
-    end
-
     def initialize(dbgr, settings={})
       @cmd_queue       = []
       @dbgr            =  dbgr
@@ -93,6 +68,7 @@ class Trepan
       @hidelevels      = {}
       @last_command    = nil
       @last_pos        = [nil, nil, nil, nil, nil, nil]
+      @next_level      = 32000
       @next_thread     = nil
       @user_variables = 0
       
@@ -121,6 +97,8 @@ class Trepan
         self.send("#{submod}_initialize")
       end
       hook_initialize(commands)
+      # unconditional_prehooks.insert_if_new(-1, *@trace_hook) if
+      # settings[:traceprint]
     end
 
     def compute_prompt
@@ -184,11 +162,7 @@ class Trepan
               @cmd_queue.shift
             end
           if @current_command.empty? 
-            if @last_command && intf.interactive?
-              @current_command = @last_command 
-            else
-              next
-            end
+            next unless @last_command && intf.interactive?;
           end
           next if @current_command[0..0] == '#' # Skip comment lines
           break
@@ -200,7 +174,6 @@ class Trepan
             @last_command = nil
             print_location
           else
-            msg "That's all folks..."
             ## FIXME: think of something better.
             quit('exit!')
             return true
@@ -228,14 +201,18 @@ class Trepan
       if breakpoint?
         delete_breakpoint(@brkpt) if @brkpt.temp?
         @last_pos = [@frame.vm_location, @stack_size, @current_thread, @event] 
-      else
-        if stepping_skip? # || @stack_size <= @hide_level
+      end
+
+      if stepping_skip? # || @stack_size <= @hide_level
+        if @next_thread
+          self.next(@step_count, :next_level => @next_level)
+        else
           step(@return_to_program, @step_count, {}, @stop_condition)
-          return true
-        elsif @event == 'start'
-          step('step', 0)
-          return true
         end
+        return true
+      elsif @event == 'start'
+        step('step', 0)
+        return true
       end
 
       @prompt = compute_prompt
@@ -259,14 +236,18 @@ class Trepan
       skip_command = before_cmdloop
       while not @leave_cmd_loop do
         begin
-          if !skip_command 
-            break if process_command_and_quit?()
-          end
+#          if settings[:traceprint]
+#            @return_to_program = 'step'
+#          else
+            if !skip_command 
+              break if process_command_and_quit?()
+            end
+#          end
           if @return_to_program
             after_cmdloop
             if @step_count >= 0 && 'finish' != @return_to_program
               @step_bp = step_over_by(1)
-              run_command('disassemble') if settings[:debugstep]
+              run_command('disassemble all') if settings[:debugstep]
               dbgr.listen('step' == @return_to_program)
             else
               @step_bp = nil
@@ -278,7 +259,12 @@ class Trepan
           @dbgr.stop
           raise
         rescue Exception => exc
-          errmsg("Internal debugger error: #{exc.inspect}")
+          # If we are inside the script interface errmsg may fail.
+          begin
+            errmsg("Internal debugger error: #{exc.inspect}")
+          rescue IOError
+            $stderr.puts "Internal debugger error: #{exc.inspect}"
+          end
           exception_dump(exc, @settings[:debugexcept], $!.backtrace)
         end
       end
@@ -330,7 +316,10 @@ class Trepan
           else
             @cmd_name
           end
-            
+        
+        run_cmd_name = uniq_abbrev(@commands.keys, run_cmd_name) if
+          !@commands.member?(run_cmd_name) && @settings[:abbrev]
+          
         if @commands.member?(run_cmd_name)
           cmd = @commands[run_cmd_name]
           if ok_for_running(cmd, run_cmd_name, args.size-1)
@@ -345,16 +334,23 @@ class Trepan
       # Eval anything that's not a command or has been
       # requested to be eval'd
       if settings[:autoeval] || eval_command
-        eval_code(current_command, @settings[:maxstring])
-      else
-        undefined_command(cmd_name)
+        begin
+          eval_code(current_command, @settings[:maxstring])
+          return false
+        rescue NameError
+        end
       end
+      undefined_command(cmd_name)
       return false
     end
 
     # Error message when a command doesn't exist
     def undefined_command(cmd_name)
-      errmsg('Undefined command: "%s". Try "help".' % cmd_name)
+      begin 
+        errmsg('Undefined command: "%s". Try "help".' % cmd_name)
+      rescue
+        $stderr.puts 'Undefined command: "%s". Try "help".' % cmd_name
+      end
     end
 
     # FIXME: Allow access to both Trepan::CmdProcessor and Trepan
@@ -368,7 +364,7 @@ end
 
 if __FILE__ == $0
   $0 = 'foo' # So we don't get here again
-  require_relative '../lib/trepanning'
+  require_relative 'lib/trepanning'
   dbg =  Trepan.new(:nx => true)
   cmdproc = dbg.instance_variable_get('@processor')
   cmdproc.msg('I am main')

data/processor/breakpoint.rb

@@ -1,154 +1,167 @@
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
+require_relative 'virtual'
 require_relative '../app/brkptmgr'
-class Trepan
-
-  class CmdProcessor
-
-    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.
-
-    def breakpoint_initialize
-      @brkpts = BreakpointMgr.new
-      @brkpt  = nil
+class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
+
+  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.
+
+  def breakpoint_initialize
+    @brkpts = Trepan::BreakpointMgr.new
+    @brkpt  = nil
+  end
+  
+  def breakpoint_finalize
+    @brkpts.finalize
+  end
+  
+  def breakpoint?
+    @brkpt = @dbgr.breakpoint
+    return !!@brkpt && %w(tbrkpt brkpt).member?(@brkpt.event)
+  end
+  
+  def breakpoint_find(bpnum, show_errmsg = true)
+    if 0 == @brkpts.size 
+      errmsg('No breakpoints set.') if show_errmsg
+      return nil
+    elsif bpnum > brkpts.size || bpnum < 1
+      errmsg('Breakpoint number %d is out of range 1..%d' %
+             [bpnum, brkpts.size]) if show_errmsg
+      return nil
     end
-
-    def breakpoint_finalize
-      @brkpts.finalize
+    bp = @brkpts[bpnum]
+    unless bp
+      errmsg "Unknown breakpoint '#{bpnum}'" if show_errmsg
+      return nil
     end
-
-    def breakpoint?
-      @brkpt = @dbgr.breakpoint
-      return !!@brkpt && %w(tbrkpt brkpt).member?(@brkpt.event)
-    end
-
-    def breakpoint_find(bpnum, show_errmsg = true)
-      if 0 == @brkpts.size 
-        errmsg('No breakpoints set.') if show_errmsg
-        return nil
-      elsif bpnum > brkpts.size || bpnum < 1
-        errmsg('Breakpoint number %d is out of range 1..%d' %
-               [bpnum, brkpts.size]) if show_errmsg
-        return nil
-      end
-      bp = @brkpts[bpnum]
-      unless bp
-        errmsg "Unknown breakpoint '#{bpnum}'" if show_errmsg
-        return nil
+    bp
+  end
+  
+  def set_breakpoint_method(meth, line=nil, ip=nil,
+                            opts={:event => 'brkpt', :negate=>false,
+                              :temp => false})
+    cm =  
+      if meth.kind_of?(Method) || meth.kind_of?(UnboundMethod)
+        meth.executable 
+      else
+        meth
       end
-      bp
+    
+    unless cm.kind_of?(Rubinius::CompiledMethod)
+      errmsg "Unsupported method type: #{cm.class}"
+      return nil
     end
     
-    def set_breakpoint_method(meth, line=nil, ip=nil,
-                              opts={:event => 'brkpt', :negate=>false,
-                                    :temp => false})
-      cm =  
-        if meth.kind_of?(Method) || meth.kind_of?(UnboundMethod)
-          meth.executable 
-        else
-          meth
-        end
-        
-      unless cm.kind_of?(Rubinius::CompiledMethod)
-        errmsg "Unsupported method type: #{cm.class}"
+    if line && line > 0
+      ip = cm.first_ip_on_line(line, -2) unless ip
+      
+      unless ip
+        errmsg "Unknown line '#{line}' in method '#{cm.name}'"
         return nil
       end
-
-      if line
-        ip = cm.first_ip_on_line(line, -2)
-        
-        unless ip
-          errmsg "Unknown line '#{line}' in method '#{cm.name}'"
-          return nil
-        end
-      elsif !ip
-        line = cm.first_line
-        ip = 0
-      end
-
-      # def lines without code will have value -1.
-      ip = 0 if -1 == ip
-
-      bp = @brkpts.add(meth.name, cm, ip, line, @brkpts.max+1, opts)
-      bp.activate
-      msg("Set %sbreakpoint #{bp.id}: #{meth.name}() at #{bp.location}" % 
-          (opts[:temp] ? 'temporary ' : ''))
-      return bp
-    end
-
-    # MRI 1.9.2 code
-    # 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, iseq, temp=false)
-    #   # FIXME: handle breakpoint conditions.
-    #   iseq = iseq.child_iseqs.detect do |iseq|
-    #     iseq.lineoffsets.keys.member?(line_number) 
-    #   end
-    #   offset = 
-    #     if iseq 
-    #       # FIXME
-    #       iseq.line2offsets(line_number)[1] || iseq.line2offsets(line_number)[0]
-    #     else
-    #       nil
-    #     end
-    #   unless offset
-    #     place = "in #{iseq.source_container.join(' ')} " if iseq 
-    #     errmsg("No line #{line_number} found #{place}for breakpoint.")
-    #     return nil
-    #   end
-    #   @brkpts.add(iseq, offset, :temp => temp)
-    # end
-
-    # def breakpoint_offset(offset, iseq, 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, :type => 'offset')
-    # end
-
-    # Delete a breakpoint given its breakpoint number.
-    # FIXME: use do_enable 
-    def delete_breakpoint_by_number(bpnum, do_enable=true)
-      bp = breakpoint_find(bpnum)
-      return false unless bp
-      delete_breakpoint(bp)
+    elsif !ip
+      line = cm.first_line
+      ip = 0
     end
-
-    def delete_breakpoint(bp)
-      @brkpts.delete_by_brkpt(bp)
-      return true
+    
+    # def lines without code will have value -1.
+    ip = 0 if -1 == ip
+    
+    bp = @brkpts.add(meth.name, cm, ip, line, @brkpts.max+1, opts)
+    bp.activate
+    msg("Set %sbreakpoint #{bp.id}: #{meth.name}() at #{bp.location}" % 
+        (opts[:temp] ? 'temporary ' : ''))
+    return bp
+  end
+  
+  # MRI 1.9.2 code
+  # 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, iseq, temp=false)
+  #   # FIXME: handle breakpoint conditions.
+  #   iseq = iseq.child_iseqs.detect do |iseq|
+  #     iseq.lineoffsets.keys.member?(line_number) 
+  #   end
+  #   offset = 
+  #     if iseq 
+  #       # FIXME
+  #       iseq.line2offsets(line_number)[1] || iseq.line2offsets(line_number)[0]
+  #     else
+  #       nil
+  #     end
+  #   unless offset
+  #     place = "in #{iseq.source_container.join(' ')} " if iseq 
+  #     errmsg("No line #{line_number} found #{place}for breakpoint.")
+  #     return nil
+  #   end
+  #   @brkpts.add(iseq, offset, :temp => temp)
+  # end
+  
+  # def breakpoint_offset(offset, iseq, 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, :type => 'offset')
+  # end
+  
+  # Delete a breakpoint given its breakpoint number.
+  # FIXME: use do_enable 
+  def delete_breakpoint_by_number(bpnum, do_enable=true)
+    bp = breakpoint_find(bpnum)
+    return false unless bp
+    delete_breakpoint(bp)
+  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_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
+  
+  def delete_breakpoint(bp)
+    @brkpts.delete_by_brkpt(bp)
+    return true
   end
+  
 end
 
 if __FILE__ == $0
-  cmdproc = Trepan::CmdProcessor.new
+  cmdproc = Trepan::CmdProcessor.new([])
   cmdproc.breakpoint_initialize
 end