trepanning 1.93.35 → 2.15.33

data/processor/command/info_subcmd/frame.rb

@@ -1,11 +1,13 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2010-2011, 2015 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative '../base/subcmd'
+require_relative '../../../app/frame'
 
 class Trepan::Subcommand::InfoFrame < Trepan::Subcommand
-  unless defined?(HELP)
-    Trepanning::Subcommand.set_name_prefix(__FILE__, self)
-    HELP = <<-EOH
+    include Trepan::Frame
+    unless defined?(HELP)
+        Trepanning::Subcommand.set_name_prefix(__FILE__, self)
+        HELP = <<-EOH
 **#{CMD}**
 
 Show information about the selected frame. The fields we list are:
@@ -77,8 +79,9 @@ See also:
             frame, frame_num = @proc.get_frame(frame_num, true)
         end
         meth = frame.method rescue nil
+        call_info = meth ? format_stack_call(frame, {}) : ''
 
-        section "Frame %2d: #{frame.method}" % @proc.frame_index
+        section "Frame %2d: %s" % [frame_num, call_info]
         msg "  %-6s: %s" % frame.source_container if frame.source_container
         msg "  line  : %s" % @proc.frame_line
         msg "  argc  : %d" % frame.argc if frame.argc

data/processor/command/info_subcmd/locals.rb

@@ -1,21 +1,38 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2011, 2015 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative '../base/subcmd'
+require_relative './variables_subcmd/locals'
 
 class Trepan::Subcommand::InfoLocals < Trepan::Subcommand
-  unless defined?(HELP)
-    Trepanning::Subcommand.set_name_prefix(__FILE__, self)
-    HELP = 'Same thing as "info locals"'
-    NEED_LOCALS   = true
-   end
+    unless defined?(HELP)
+        Trepanning::Subcommand.set_name_prefix(__FILE__, self)
+        HELP = 'Same thing as "info variables locals"'
+        NEED_LOCALS   = true
+    end
 
-  def run(args)
-    @proc.commands['info'].run(%w(info variables locals))
-  end
+    def complete(prefix)
+        if @proc && @proc.frame
+            argc =
+                if 'CFUNC' == @proc.frame.type
+                    @proc.frame.argc
+                else
+                    iseq = @proc.frame.iseq
+                    iseq.local_size - 2
+                end
+            ary = (0..argc).map{|i| i.to_s}
+            ['names'] + ary
+        else
+            []
+        end
+    end
+
+    def run(args)
+        @proc.commands['info'].run(%w(info variables) + args[1..-1])
+    end
 end
 
 if __FILE__ == $0
-  # Demo it.
-  require_relative '../../mock'
-  # ???
+    # Demo it.
+    require_relative '../../mock'
+    # ???
 end

data/processor/command/info_subcmd/program.rb

@@ -1,52 +1,61 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2015 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative '../base/subcmd'
 
 class Trepan::Subcommand::InfoProgram < Trepan::Subcommand
-  unless defined?(HELP)
-    Trepanning::Subcommand.set_name_prefix(__FILE__, self)
-    HELP         = 'Information about debugged program and its environment'
-    MIN_ARGS     = 0
-    MAX_ARGS     = 0
-    MIN_ABBREV   = 'pr'.size
-    NEED_STACK   = true
-  end
+    unless defined?(HELP)
+        Trepanning::Subcommand.set_name_prefix(__FILE__, self)
+        SHORT_HELP   = 'Information about debugged program and its environment'
+        MIN_ARGS     = 0
+        MAX_ARGS     = 0
+        MIN_ABBREV   = 'pr'.size
+        NEED_STACK   = true
+        HELP = <<-EOH
+**#{CMD}**
 
-  def run(args)
-    frame = @proc.frame
-    m = 'Program stop event: %s' % @proc.event
-    m +=
-      if frame.iseq
-        '; PC offset %d of instruction sequence: %s' %
-          [frame.pc_offset, frame.iseq.name]
-      else
-        '.'
-      end
-    msg m
-    if 'return' == @proc.event
-      msg 'R=> %s' % @proc.frame.sp(1).inspect
-    elsif 'raise' == @proc.event
-        msg @proc.core.hook_arg.inspect if @proc.core.hook_arg
-        if @proc.frame.iseq.catch_table_size == 0
-            msg "Warning: exception raised is non-local!"
-        end
-    end
+Show information about the debugged program and its environment.
 
-    if @proc.brkpt
-      msg('It is stopped at %sbreakpoint %d.' %
-          [@proc.brkpt.temp? ? 'temporary ' : '',
-           @proc.brkpt.id])
+See also:
+---------
+`info frame`, `info file`
+EOH
     end
-  end
 
+    def run(args)
+        frame = @proc.top_frame
+        m = 'Program stop event: %s' % @proc.event
+        m +=
+            if frame.iseq
+                '; PC offset %d of instruction sequence: %s' %
+                    [frame.pc_offset, frame.iseq.label]
+            else
+                '.'
+            end
+        msg m
+        if :return == @proc.event
+            msg 'R=> %s' % frame.sp(1).inspect
+        elsif :raise == @proc.event
+            exc = @proc.core.trace_point.raised_exception
+            msg "#{exc.class}: #{exc}"
+            if frame.iseq.catch_table_size == 0
+                msg "Warning: exception raised is non-local!"
+            end
+        end
+
+        if @proc.brkpt
+            msg('It is stopped at %sbreakpoint %d.' %
+                [@proc.brkpt.temp? ? 'temporary ' : '',
+                 @proc.brkpt.id])
+        end
+    end
 end
 
 if __FILE__ == $0
-  # Demo it.
-  require_relative '../../mock'
-  name = File.basename(__FILE__, '.rb')
+    # Demo it.
+    require_relative '../../mock'
+    name = File.basename(__FILE__, '.rb')
 
-  # FIXME: DRY the below code
-  cmd = MockDebugger::sub_setup(Trepan::Subcommand::InfoProgram, false)
-  cmd.run(cmd.prefix)
+    # FIXME: DRY the below code
+    cmd = MockDebugger::sub_setup(Trepan::Subcommand::InfoProgram, false)
+    cmd.run(cmd.prefix)
 end

data/processor/command/info_subcmd/registers_subcmd/ep.rb

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2010-2011, 2015 Rocky Bernstein <rockyb@rubyforge.net>
+require_relative '../../base/subsubcmd'
+require_relative 'helper'
+
+class Trepan::Subcommand::InfoRegistersEp < Trepan::SubSubcommand
+    unless defined?(HELP)
+        Trepanning::SubSubcommand.set_name_prefix(__FILE__, self)
+        HELP = <<EOH
+**#{CMD}**
+
+Show the value of the VM local EP pointer. The EP (environment
+pointer?) is used find the next enclosing scope.
+
+See also:
+---------
+
+`info register sp".`
+EOH
+
+        MIN_ABBREV   = 'ep'.size
+        MIN_ARGS     = 0
+        MAX_ARGS     = 0
+        NEED_STACK   = true
+        SHORT_HELP   = "Show the value of the VM EP."
+  end
+
+    def run(args)
+        frame = @proc.frame
+        if 'CFUNC' == frame.type
+            msg "ep not available for C functions"
+        else
+            msg "ep=%s" % frame.ep
+        end
+    end
+end
+
+if __FILE__ == $0
+  # Demo it.
+    require_relative '../../../mock'
+    require_relative '../registers'
+    cmd = MockDebugger::subsub_setup(Trepan::SubSubcommand::InfoRegisters,
+                                     Trepan::SubSubcommand::InfoRegistersLfp,
+                                     false)
+    cmd.run([])
+end

data/processor/command/info_subcmd/registers_subcmd/helper.rb

@@ -1,39 +1,36 @@
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2015 Rocky Bernstein <rockyb@rubyforge.net>
 module Registers
-  def register_array_index(name, arg, max_value=nil)
-    if !arg or arg.empty?
-      # Form is: "info xx" which means "info xx 0"
-      lookup_pos = position = 0
-    else
-      opts = {
-        :msg_on_error => 
-        "The 'info registers %s' command argument must eval to an integer. Got: %s" % [name, arg],
-        :min_value => -10,
-        :max_value => max_value + 10
-      }
-      position = @proc.get_an_int(arg, opts)
-      return nil unless position
-    end
-    lookup_pos = 
-      if 'lfp' == name
-        max_value + 1 - position 
-      elsif 'sp' == name && 'CFUNC' == @proc.frame.type 
-        # && @proc.frame.next.type == 'IFUNC" # ? 
+    def register_array_index(name, arg, max_value=nil)
+        if !arg or arg.empty?
+            # Form is: "info xx" which means "info xx 0"
+            lookup_pos = position = 0
+        else
+            opts = {
+                :msg_on_error =>
+                "The 'info registers %s' command argument must eval to an integer. Got: %s" % [name, arg],
+                :min_value => -10,
+                :max_value => max_value + 10
+            }
+            position = @proc.get_an_int(arg, opts)
+            return nil unless position
+        end
+        ### FIXME: not sure if this is correct
+        lookup_pos =
+            if 'ep' == name
+                max_value + 1 - position
+            elsif 'sp' == name && 'CFUNC' == @proc.frame.type
+                # In C frames, the "local_size" parameter is always 1.
+                # I guess this is for the return parameter.
+                # There is a magic number 2 that we also always have
+                # to add.
+                position + 3
+            else
+                position
+            end
 
-        # FIXME: In C frames there seems to be some vm_push_frame's
-        # via perhaps vm_yield_with_cfunc along with sp adjustments.
-        # I am not sure if this is under what conditions this
-        # *doesn't* happen so until I can figure out the better thing
-        # to do, possibly in the Ruby 1.9 interpeter, we'll handle
-        # this here.  It is also conceivable to handle this in
-        # thread_frame's sp handling.
-        position + 3
-      else
-        position
-      end
-    msg("VM %s(%d) = %s" % [name, position, 
-                            @proc.frame.send(name, lookup_pos).inspect])
-    return position
-  end
+        val = @proc.frame.send(name, lookup_pos)
+        msg("VM %s(%d) = %s (%s)" % [name, position, val.inspect, val.class])
+        return position
+    end
 
 end

data/processor/command/info_subcmd/registers_subcmd/sp.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2015 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative '../../base/subsubcmd'
 require_relative 'helper'
 
@@ -7,20 +7,25 @@ class Trepan::Subcommand::InfoRegistersSp < Trepan::SubSubcommand
   unless defined?(HELP)
     Trepanning::SubSubcommand.set_name_prefix(__FILE__, self)
     HELP = <<EOH
-#{CMD} [NUMBER NUMBER ...|size]
+**#{CMD}** [*number* *number*...| **size**]
 
-With no arguments, all SP values for the current frame of the debugged
+With no arguments, all *sp* values for the current frame of the debugged
 program are shown.  If a number is given, then the entry at that
-location is shown. If "size" is given, then we show the number items
+location is shown. If `size` is given, then we show the number items
 in the stack of the current frame.
 
-The VM uses a stack to store temporary values in computations. For
-example to compute "a + b", the values of "a" and "b" are pushed onto
-a stack pointed to by SP. Just before the addition is perofrmed, sp(1)
-will have the value "a" contians and sp(2) will contain the value of
-"b"
+The VM uses a stack to store both local variables and temporary values
+in computations. The stack grows downward (toward lower numbers).
+As a result, local values and parameters in the stack in the reverse
+order as they appear in a call and are as they are defined.
 
-See also "info register LFP"
+The entry before the end of the stack contains the return value and
+the top entry is a fake RubyVM::Env value.
+
+See also:
+---------
+
+`info register ep`, `info register pc`
 EOH
 
     MIN_ABBREV   = 'sp'.size
@@ -28,20 +33,21 @@ EOH
     SHORT_HELP   = "Show value(s) of the VM stack pointer (SP)."
   end
 
-  include Registers
-  def run(args)
-    if args.size == 0
-      1.upto(@proc.frame.sp_size-1) do |i|
-        msg "%s%d: %s" % [' ' * 2, i, @proc.frame.sp(i).inspect]
-      end if @proc.frame.sp_size
-    elsif args.size == 1 and 'size' == args[0] 
-      msg "Number of stack items in frame is #{@proc.frame.sp_size}."
-    else
-      args.each do |arg|
-        register_array_index(PREFIX[-1], arg, @proc.frame.sp_size)
-      end
+    include Registers
+    def run(args)
+        if args.size == 0
+            1.upto(@proc.frame.sp_size) do |i|
+                val = @proc.frame.sp(i)
+                msg "%s%d: %s (%s)" % [' ' * 2, i, val.inspect, val.class]
+            end if @proc.frame.sp_size
+        elsif args.size == 1 and 'size' == args[0]
+            msg "Number of stack items in frame is #{@proc.frame.sp_size}."
+        else
+            args.each do |arg|
+                register_array_index(PREFIX[-1], arg, @proc.frame.sp_size)
+            end
+        end
     end
-  end
 end
 
 if __FILE__ == $0

data/processor/command/info_subcmd/return.rb

@@ -1,24 +1,42 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2015 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative '../base/subcmd'
 
 class Trepan::Subcommand::InfoReturn < Trepan::Subcommand
   unless defined?(HELP)
     Trepanning::Subcommand.set_name_prefix(__FILE__, self)
-    HELP         = 'Show the value about to be returned'
+    HELP         = <<-EOH
+**#{CMD}**
+
+Show the value about to be returned.
+
+You have to be at some sort of return event for this command to work.
+
+See also:
+---------
+
+`set return`, `info frame`, `info program`
+
+EOH
     MIN_ABBREV   = 'ret'.size # Note we have "info registers"
     NEED_STACK   = true
   end
 
   def run(args)
-    event = @proc.event
-    if %w(return c-return).member?(event)
-      ret_val = Trepan::Frame.value_returned(@proc.frame, event)
-      msg('Return value: %s' % ret_val.inspect)
-    else
-      errmsg('You need to be in a return event to do this. Event is %s' % 
-             event)
-    end
+      event = @proc.event
+      frame = @proc.frame
+      if %w(return b_return).member?(event.to_s)
+          ret_val = frame.sp(1)
+          msg('Return class: %s' % ret_val.class)
+          msg('Return value: %s' % ret_val.inspect)
+      elsif %w(c_return).member?(event.to_s)
+          ret_val = frame.sp(frame.argc + 3)
+          msg('Return class: %s' % ret_val.class)
+          msg('Return value: %s' % ret_val.inspect)
+      else
+          errmsg('You need to be in a return event to do this. Event is %s' %
+                 event)
+      end
   end
 
 end

data/processor/command/info_subcmd/variables_subcmd/class.rb

@@ -2,7 +2,7 @@
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative 'locals'
 
-class Trepan::Subcommand::InfoVariablesClass < 
+class Trepan::Subcommand::InfoVariablesClass <
     Trepan::Subcommand::InfoVariablesLocals
   Trepan::Util.suppress_warnings {
     Trepanning::Subcommand.set_name_prefix(__FILE__, self)
@@ -32,9 +32,9 @@ end
 if __FILE__ == $0
   # Demo it.
   require_relative '../../mock'
-  cmd = 
+  cmd =
     MockDebugger::subsub_setup(Trepan::Subcommand::InfoVariables,
                                Trepan::Subcommand::InfoVariablesClass)
   cmd.run(cmd.prefix)
-  cmd.run(cmd.prefix + ['name'])
+  cmd.run(cmd.prefix + ['--name'])
 end