trepanning 1.93.35 → 2.15.33

data/processor/frame.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 'linecache'
 require_relative '../app/complete'
 require_relative '../app/frame'
@@ -21,7 +21,7 @@ class Trepan
     # don't need to store this for all threads, just those we want to
     # hide frame on. A value of 1 means to hide just the oldest
     # level. The default or showing all levels is 0.
-    attr_accessor :hidelevels      
+    attr_accessor :hidelevels
 
     # Hash[container] -> file container. This gives us a way to map non-file
     # container objects to a file container for display.
@@ -29,20 +29,20 @@ class Trepan
 
     # Hash[iseq] -> file container. This gives as a way to map instruction
     # sequences to a file container for display.
-    attr_accessor :remap_iseq      
+    attr_accessor :remap_iseq
 
     # top frame of current thread. Since right now the ThreadFrame
     # method has "prev" but no way to move in the other direction.  So
     # we store the top frame.
-    attr_accessor :top_frame 
+    attr_accessor :top_frame
 
     # Hash[thread_id] -> top_frame
     attr_reader   :threads2frames
-    
+
 
     def adjust_frame(frame_num, absolute_pos)
       frame, frame_num = get_frame(frame_num, absolute_pos)
-      if frame 
+      if frame
         @frame = frame
         @frame_index = frame_num
         unless @settings[:traceprint]
@@ -52,7 +52,7 @@ class Trepan
             :maxwidth    => settings[:maxwidth],
           }
           print_stack_trace_from_to(frame_num, frame_num, frame, opts)
-          print_location 
+          print_location
         end
         @line_no = frame_line() - 1
         @frame
@@ -64,7 +64,7 @@ class Trepan
     def frame_low_high(direction)
       stack_size = @top_frame.stack_size - @hide_level
       if direction
-        low, high = [ @frame_index * -direction, 
+        low, high = [ @frame_index * -direction,
                       (stack_size - 1 - @frame_index) * direction ]
         low, high = [high, low] if direction < 0
         [low, high]
@@ -72,7 +72,7 @@ class Trepan
         [-stack_size, stack_size-1]
       end
     end
-    
+
     def frame_complete(prefix, direction)
       low, high = frame_low_high(direction)
       ary = (low..high).map{|i| i.to_s}
@@ -80,11 +80,11 @@ class Trepan
     end
 
     def frame_container(frame, canonicalize=true)
-      container = 
+      container =
         if @remap_container.member?(frame.source_container)
           @remap_container[frame.source_container]
-        elsif frame.iseq && @remap_iseq.member?(frame.iseq.sha1)
-          @remap_iseq[frame.iseq.sha1]
+        # elsif frame.iseq && @remap_iseq.member?(frame.iseq.sha1)
+        #   @remap_iseq[frame.iseq.sha1]
         else
           frame.source_container
         end
@@ -103,28 +103,35 @@ class Trepan
       end
     end
 
-    # Initializes the thread and frame variables: @frame, @top_frame, 
+    # Initializes the thread and frame variables: @frame, @top_frame,
     # @frame_index, @current_thread, and @threads2frames
-    def frame_setup(frame_thread)
-      @frame_index        = 0
-      @frame = @top_frame = frame_thread
-      @current_thread     = @frame.thread
-      @stack_size         = @frame.stack_size
-
-      @threads2frames   ||= {} 
-      @threads2frames[@current_thread] = @top_frame
-      @hide_level         = 
-        if @settings[:debugstack]
-          0
-        else
-          @hidelevels[@current_thread]
+    def frame_setup(frame_thread, top_skip=0)
+        @frame_index        = 0
+        unless frame_thread
+            @stack_size = 0
+            @current_thread = nil
+            @top_frame = @frame = nil
+            return
         end
-      
+
+        @frame = @top_frame = frame_thread.prev(top_skip)
+        @current_thread     = @frame.thread
+        @stack_size         = @frame.stack_size
+
+        @threads2frames   ||= {}
+        @threads2frames[@current_thread] = @top_frame
+        @hide_level         =
+            if @settings[:debugstack]
+                0
+            else
+                @hidelevels[@current_thread]
+            end
+
     end
 
     # Remove access to thread and frame variables
     def frame_teardown
-      @top_frame = @frame = @frame_index = @current_thread = nil 
+      @top_frame = @frame = @frame_index = @current_thread = nil
       @threads2frames = {}
     end
 
@@ -164,7 +171,7 @@ class Trepan
     def get_nonsync_frame(tf)
       if (tf.stack_size > 10)
         check_frames = (0..5).map{|i| tf.prev(i).method}
-        if check_frames == 
+        if check_frames ==
             %w(synchronize event_processor IFUNC call trace_hook IFUNC)
           return tf.prev(6)
         end
@@ -187,14 +194,14 @@ class Trepan
     #    `frame', which is in the thread with id `thread_id'. We may
     #    need to the hide initial debugger frames.
     def find_and_set_debugged_frame(th, position)
-      
+
       thread = threading._active[thread_id]
       thread_name = thread.getName()
       if (!@settings['dbg_pydbgr'] &&
           thread_name == Mthread.current_thread_name())
         # The frame we came in on ('current_thread_name') is
         # the same as the one we want to switch to. In this case
-        # we need to some debugger frames are in this stack so 
+        # we need to some debugger frames are in this stack so
         # we need to remove them.
         newframe = Mthread.find_debugged_frame(frame)
         frame = newframe unless newframe
@@ -202,12 +209,12 @@ class Trepan
       ## FIXME: else: we might be blocked on other threads which are
       # about to go into the debugger it not for the fact this one got there
       # first. Possibly in the future we want
-      # to hide the blocks into threading of that locking code as well. 
-      
+      # to hide the blocks into threading of that locking code as well.
+
       # Set stack to new frame
       @frame, @curindex = Mcmdproc.get_stack(frame, nil, self.proc)
       @proc.stack, @proc.curindex = self.stack, self.curindex
-      
+
       # @frame_thread_name = thread_name
     end
   end
@@ -229,7 +236,7 @@ if __FILE__ == $0
   end
 
   proc = Trepan::CmdProcessor.new(Trepan::MockCore.new())
-  proc.frame_setup(RubyVM::Frame.current)
+  proc.frame_setup(RubyVM::Frame.get)
   proc.frame_initialize
   puts "stack size: #{proc.top_frame.stack_size}"
   0.upto(proc.top_frame.stack_size) { |i| proc.adjust_frame(i, true) }
@@ -241,5 +248,5 @@ if __FILE__ == $0
   puts '*' * 10
   proc.adjust_frame(proc.top_frame.stack_size-1, true)
   proc.top_frame.stack_size.times { proc.adjust_frame(-1, false) }
-    
+
 end

data/processor/help.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2015 Rocky Bernstein <rockyb@rubyforge.net>
 
 class Trepan
   # class SubHelp
@@ -9,7 +9,7 @@ class Trepan
   #   end
 
   #   def load_sub_help_files(dir)
-  #     Dir.glob(dir, '*.txt').each do |txt| 
+  #     Dir.glob(dir, '*.txt').each do |txt|
   #       basename = File.basename(txt, '.txt')
   #       @list << basename
   #     end
@@ -38,9 +38,9 @@ class Trepan
         short_help = subcmd.class.const_get('HELP').split("\n")[0].chomp('.')
         subcmd.class.const_set(:SHORT_HELP, short_help)
       end
-      
+
       '  %-12s -- %s' %
-          [abbrev_stringify(obj_const(subcmd, :NAME), 
+          [abbrev_stringify(obj_const(subcmd, :NAME),
                             obj_const(subcmd, :MIN_ABBREV)),
            obj_const(subcmd, :SHORT_HELP)]
     end
@@ -77,7 +77,7 @@ Long description goes here.'
     MIN_ABBREV = 1
     NAME       = File.basename(__FILE__)
     def obj_const(obj, name)
-      obj.class.const_get(name) 
+      obj.class.const_get(name)
     end
     def msg(mess)
       puts mess

data/processor/hook.rb

@@ -13,63 +13,63 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
   attr_reader   :unconditional_prehooks
   attr_reader   :cmdloop_posthooks
   attr_reader   :cmdloop_prehooks
-  
+
   # Used to time how long a debugger action takes
   attr_accessor :time_last
-  
+
   class Hook
     attr_accessor :list
-    
+
     def initialize(list=[])
       @list = list
     end
-    
+
     def delete_by_name(delete_name)
       @list.delete_if {|hook_name, priority, hook| hook_name == delete_name}
     end
-    
+
     def empty?
       @list.empty?
     end
-    
+
     def insert(priority, name, hook)
       insert_loc = @list.size  # at end
       @list.each_with_index do |entry, index|
         n, p, h = entry
-        if priority > p 
+        if priority > p
           insert_loc = index
           break
         end
       end
       @list.insert(insert_loc, [name, priority, hook])
     end
-    
+
     def insert_if_new(priority, name, hook)
       insert(priority, name, hook) unless
         @list.find {|try_name, try_priority, try_hook| try_name == name}
     end
-    
+
     # Run each function in `hooks' with args
     def run(*args)
-      @list.each do |name, priority, hook| 
-        hook.call(name, *args) 
+      @list.each do |name, priority, hook|
+        hook.call(name, *args)
       end
     end
-    
+
     # Could add delete_at and delete if necessary.
   end
-  
+
   def hook_initialize(commands)
     @cmdloop_posthooks      = Hook.new
     @cmdloop_prehooks       = Hook.new
     @unconditional_prehooks = Hook.new
-    
+
     irb_cmd = commands['shell']
-    @autoirb_hook  = ['autoirb', 
+    @autoirb_hook  = ['autoirb',
                       Proc.new{|*args| irb_cmd.run(['shell']) if irb_cmd}]
-    
+
     @debug_dbgr_hook = ['dbgdbgr',
-                        Proc.new{|*args| 
+                        Proc.new{|*args|
                           if settings[:debugdbgr]
                             $trepan_cmdproc  = self
                             $trepan_frame    = @frame
@@ -77,29 +77,26 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
                             $trepan_cmdproc  = nil
                             $trepan_frame    = nil
                           end}]
-    
+
     display_cmd = commands['display']
-    @display_hook   = ['display', 
-                       Proc.new{|*args| display_cmd.run(['display']) if 
+    @display_hook   = ['display',
+                       Proc.new{|*args| display_cmd.run(['display']) if
                          display_cmd}]
-    
+
     list_cmd = commands['list']
-    @autolist_hook  = ['autolist', 
+    @autolist_hook  = ['autolist',
                        Proc.new{|*args| list_cmd.run(['list']) if list_cmd}]
-    
-    @timer_hook     = ['timer', 
+
+    @timer_hook     = ['timer',
                        Proc.new{|*args|
                          now = Time.now
-                         msg("%g seconds" % 
+                         msg("%g seconds" %
                              (now - @time_last)) if @time_last
                          @time_last = now
                        }]
     @timer_posthook = ['timer', Proc.new{|*args| @time_last = Time.now}]
-    @trace_hook     = ['trace', 
+    @trace_hook     = ['trace',
                        Proc.new{|*args| print_location}]
-    @tracebuf_hook  = ['tracebuffer', 
-                       Proc.new{|*args| @eventbuf.append(@event, @frame, 
-                                                         @core.hook_arg)}]
   end
 end
 

data/processor/location.rb

@@ -13,8 +13,8 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
     EVENT2ICON = {
       'brkpt'          => 'xx',
       'tbrkpt'         => 'x1',
-      'c-call'         => 'C>',
-      'c-return'       => '<C',
+      'c_call'         => 'C>',
+      'c_return'       => '<C',
       'call'           => '->',
       'send'           => '=>',
       'leave'          => '<=',
@@ -35,9 +35,9 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
     }
   end
 
-  def canonic_container(container)
-    [container[0], canonic_file(container[1])]
-  end
+    def canonic_container(container)
+        [container[0], canonic_file(container[1])]
+    end
 
     def canonic_file(filename, resolve=true)
         # For now we want resolved filenames
@@ -141,41 +141,39 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
   end
 
   def print_location
-      if %w(c-call call).member?(@event)
-          # FIXME: Fix Ruby so we don't need this workaround?
-          # See also where.rb
-          opts = {}
-          opts[:class] = @core.hook_arg if
-              'CFUNC' == @frame.type && @core.hook_arg && 0 == @frame_index
-          msg format_stack_call(@frame, opts)
-      elsif 'raise' == @event
-          msg @core.hook_arg.inspect if @core.hook_arg # Exception object
-      end
-
       text      = nil
-      source_container = frame_container(@frame, false)
+
       ev        = if @event.nil? || 0 != @frame_index
                       '  '
                   else
-                      (EVENT2ICON[@event] || @event)
+                      @event
+                      # (EVENT2ICON[@event] || @event)
                   end
-      @line_no  = frame_line
-
-      loc = source_location_info(source_container, @line_no, @frame)
-      loc, @line_no, text, found_line =
-          loc_and_text(loc, @frame, @line_no, source_container)
-
-      ip_str = @frame.iseq ? " @#{frame.pc_offset}" : ''
-      msg "#{ev} (#{loc}#{ip_str})"
-
-      if %w(return c-return).member?(@event)
-          retval = Trepan::Frame.value_returned(@frame, @event)
-          msg 'R=> %s' % retval.inspect
-      elsif @event == 'raise'
-          # msg @proc.core.hook_arg.inspect if @proc.core.hook_arg
-          if @frame.iseq and @frame.iseq.catch_table_size == 0
-              msg "Warning: exception raised is non-local!"
-          end
+      if @frame
+          source_container = frame_container(@frame, false)
+          @line_no  = frame_line
+
+          loc = source_location_info(source_container, @line_no, @frame)
+          loc, @line_no, text, found_line =
+              loc_and_text(loc, @frame, @line_no, source_container)
+
+          ip_str = @frame.iseq ? " @#{frame.pc_offset}" : ''
+          msg "#{ev} (#{loc}#{ip_str})"
+      else
+          msg "#{ev}"
+      end
+
+      if @core.trace_point
+          if %w(return c_return b_return).member?(@event.to_s)
+              retval = @core.trace_point.return_value
+              msg 'R=> %s' % retval.inspect
+          elsif @event == :raise
+              exc = @core.trace_point.raised_exception
+              msg "#{exc.class}: #{exc}"
+              if @frame.iseq and @frame.iseq.catch_table_size == 0
+                  msg "Warning: exception raised is non-local!"
+              end
+           end
       end
 
       if text && !text.strip.empty?
@@ -183,25 +181,30 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
           @line_no -= 1
       end
       unless found_line
-          # Can't find source line, so give assembly as consolation.
-          # This great idea comes from the Rubinius reference debugger.
-          run_command('disassemble')
+          if @frame
+              # Can't find source line, so give assembly as consolation.
+              # This great idea comes from the Rubinius reference debugger.
+              run_command('disassemble') unless source_container[0] == 'binary'
+          end
       end
   end
 
   def source_location_info(source_container, line_no, frame)
-    filename  = source_container[1]
-    ## FIXME: condition is too long.
-    canonic_filename =
-      if 'string' == source_container[0] && frame.iseq &&
-          frame.iseq.eval_source
-        eval_str = frame.iseq.eval_source
-        'eval "' + safe_repr(eval_str.gsub(/\n/,';'), 15) + '"'
-      else
-        canonic_file(filename, false)
+      filename  = source_container[1]
+      ## FIXME: condition is too long.
+      if 'binary' == source_container[0]
+          return "address 0x%x" % line_no
       end
-    loc = "#{canonic_filename}:#{line_no}"
-    return loc
+      canonic_filename =
+          if 'string' == source_container[0] && frame.iseq &&
+                  frame.iseq.eval_source
+              eval_str = frame.iseq.eval_source
+              'eval "' + safe_repr(eval_str.gsub(/\n/,';'), 15) + '"'
+          else
+              canonic_file(filename, false)
+          end
+      loc = "#{canonic_filename}:#{line_no}"
+      return loc
   end # source_location_info
 end
 
@@ -222,7 +225,7 @@ if __FILE__ == $0 && caller.size == 0
   proc = Trepan::CmdProcessor.new(Trepan::MockCore.new())
   proc.instance_variable_set('@settings', {})
   proc.frame_initialize
-  proc.frame_setup(RubyVM::Frame.current)
+  proc.frame_setup(RubyVM::Frame.get)
   proc.frame_initialize
 
   puts proc.canonic_file(__FILE__)
@@ -231,7 +234,7 @@ if __FILE__ == $0 && caller.size == 0
   puts proc.current_source_text
   xx = eval <<-END
      proc.frame_initialize
-     proc.frame_setup(RubyVM::Frame.current)
+     proc.frame_setup(RubyVM::Frame.get)
      puts proc.current_source_text
   END
 end