trepanning 1.93.35 → 2.15.33

data/processor/command/list.rb

@@ -1,6 +1,7 @@
 # Copyright (C) 2010-2011, 2015 Rocky Bernstein <rockyb@rubyforge.net>
 # -*- coding: utf-8 -*-
 require 'linecache'
+require 'rbconfig'
 require_relative '../command'
 require_relative '../list'
 
@@ -8,9 +9,8 @@ class Trepan::Command::ListCommand < Trepan::Command
     unless defined?(HELP)
         NAME = File.basename(__FILE__, '.rb')
         HELP = <<-HELP
-**#{NAME}**[**>**] [*module*] [*first* [*num*]]
-
-**#{NAME}**[**>**] *location* [*num*]
+**#{NAME}[>]** [*module*] [*first* [*num*]]
+**#{NAME}[>]** *location [*num*]
 
 List source code.
 
@@ -22,13 +22,13 @@ changing, then that is start the line after we last one previously
 shown.
 
 If the command has a ">" suffix, then line centering is disabled and
-listing begins at the specified location.
+listing begins at the specificed location.
 
 The number of lines to show is controlled by the debugger "listsize"
 setting. Use 'set max list' or 'show max list' to see or set the
 value.
 
-`#{NAME} -` shows lines before a previous listing.
+\"#{NAME} -\" shows lines before a previous listing.
 
 A *location* is a either:
 
@@ -113,6 +113,14 @@ See also:
         iseq, filename, first, last =
             @proc.parse_list_cmd(@proc.cmd_argstr, listsize, center_correction)
         return unless filename
+        unless @proc.text_file?(filename)
+            errmsg("File \"%s\" doesn't seem to contain source text." % filename)
+            if [RbConfig::CONFIG['DLEXT'],
+                RbConfig::CONFIG['DLEXT2']].member?(File.basename(filename))
+                msg("File has dynamic loader extension")
+            end
+            return
+        end
         container = iseq ? iseq.source_container : ['file', filename]
         breaklist = @proc.brkpts.line_breaks(container)
 
@@ -162,8 +170,6 @@ See also:
                 msg(s + "\t" + line, {:unlimited => true})
                 @proc.line_no = lineno
             end
-            @proc.list_lineno += listsize + center_correction + 1
-            @proc.list_lineno = max_line if @proc.list_lineno > max_line
         rescue => e
             errmsg e.to_s if settings[:debugexcept]
         end
@@ -252,5 +258,5 @@ if __FILE__ == $0
         run_cmd2(cmd, %W(#{cmd.name} run_cmd2))
         run_cmd2(cmd, %W(#{cmd.name} run_cmd2))
         run_cmd2(cmd, %W(#{cmd.name} @0))
-  end
+    end
 end

data/processor/command/macro.rb

@@ -42,7 +42,7 @@ macro called fin+ which issues two commands 'finish' followed by
 
     macro fin+ Proc.new{|*args| %w(finish step)}
 
-If you wanted to parameterize the argument of the 'finish' command
+If you wanted to parameterize the argument of the *finish* command
 you could do that this way:
 
     macro fin+ Proc.new{|*args| ["finish \#{args[0]}" 'step']}

data/processor/command/next.rb

@@ -47,6 +47,7 @@ See also:
     CATEGORY     = 'running'
     # execution_set = ['Running']
     MAX_ARGS     = 1   # Need at most this many. FIXME: will be eventually 2
+    NEED_STACK   = true
     NEED_RUNNING = true
     SHORT_HELP   = 'Step program without entering called functions'
   end

data/processor/command/set_subcmd/auto.rb

@@ -9,7 +9,7 @@ class Trepan::SubSubcommand::SetAuto < Trepan::SubSubcommandMgr
     HELP   = <<-EOH
 Set controls for things with some sort of "automatic" default behavior.
 
-See "#{PREFIX.join(' ')} *" for a list of subcommands or "#{PREFIX.join(' ')} <name>" 
+See "#{PREFIX.join(' ')} *" for a list of subcommands or "#{PREFIX.join(' ')} <name>"
 for help on a particular trace subcommand.
     EOH
     SHORT_HELP = 'Set controls for some "automatic" default behaviors'
@@ -21,9 +21,9 @@ if __FILE__ == $0
   dbgr, cmd = MockDebugger::setup('set')
   cmds = dbgr.core.processor.commands
   set_cmd = cmds['set']
-  command = Trepan::SubSubcommand::SetAuto.new(dbgr.core.processor, 
+  command = Trepan::SubSubcommand::SetAuto.new(dbgr.core.processor,
                                                set_cmd)
-  cmd_args = ['set', name]
+  cmd_args = Trepan::SubSubcommand::SetAuto::PREFIX
   set_cmd.instance_variable_set('@last_args', cmd_args)
   # require_relative '../../../lib/trepanning'
   # Trepan.debug

data/processor/command/set_subcmd/different.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/subcmd'
 
 class Trepan::Subcommand::SetDifferent < Trepan::SetBoolSubcommand
@@ -16,21 +16,22 @@ stopping points with possibly different event type. In a debugger it
 is sometimes desirable to continue but stop only when the position
 next changes.
 
-Setting 'different' to on will cause each 'step' or 'next' command to
+Setting to "different" to on will cause each `step` or `next` command to
 stop at a different position.
 
 Note though that the notion of different does take into account stack
-nesting. So in `ARGV.map {|arg| arg.to_i}` you get a stop before ARGV as
-well as one in the block.
+nesting. So in `ARGV.map {|arg| arg.to_i}`, you get a stop before
+*ARGV* as well as one in the block as well as before to call to
+*to_i*.
 
-If you to ignore stopping at added nesting levels, there are two
-possibilities. 'set step nostack' will ignore stack nestings levels on
-a given line. Also you can use 'next', but that also stepping into
-functions on different lines to also be skipped.
+If you wan to ignore stopping at added nesting levels, there are two
+possibilities. `set step nostack` will ignore stack nestings levels on
+a given line. Also you can use 'next', but that also skips stepping
+into functions.
 
 See also:
 ---------
-`step`, `next`' which have suffixes '+' and '-' and which
+The debugger command `step`, `next` have suffixes '+' and '-' which
 override this setting.
     EOH
 
@@ -41,31 +42,31 @@ override this setting.
 
   completion %w(on off nostack)
 
-  def run(args)
-    if args.size == 3 && 'nostack' == args[2]
-      @proc.settings[:different] = 'nostack'
-      msg("different is nostack.")
-    else
-      super
+    def run(args)
+        if args.size == 3 && 'nostack' == args[2]
+            @proc.settings[:different] = 'nostack'
+            msg("different is nostack.")
+        else
+            super
+        end
+        @proc.different_pos = @proc.settings[:different]
     end
-    @proc.different_pos = @proc.settings[:different]
-  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
-  dbgr, cmd = MockDebugger::setup('set')
-  subcommand = Trepan::Subcommand::SetDifferent.new(cmd)
-  testcmdMgr = Trepan::Subcmd.new(subcommand)
+    # FIXME: DRY the below code
+    dbgr, cmd = MockDebugger::setup('set')
+    subcommand = Trepan::Subcommand::SetDifferent.new(cmd)
+    testcmdMgr = Trepan::Subcmd.new(subcommand)
 
-  subcommand.run_show_bool
-  subcommand.summary_help(name)
-  puts
-  puts '-' * 20
-  puts subcommand.save_command
+    subcommand.run_show_bool
+    # subcommand.summary_help(name)
+    puts
+    puts '-' * 20
+    puts subcommand.save_command
 end

data/processor/command/set_subcmd/events.rb

@@ -1,72 +1,98 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
-require 'trace'
+# Copyright (C) 2010-2011, 2015 Rocky Bernstein <rockyb@rubyforge.net>
 require 'columnize'
 require_relative '../base/subcmd'
 
+
 class Trepan::Subcommand::SetEvents < Trepan::Subcommand
-  unless defined?(HELP)
-    Trepanning::Subcommand.set_name_prefix(__FILE__, self)
-    HELP         = "set events {event-name[,] ...}
 
-Set trace events that the debugger will stop on
 
-Valid event names come from the Trace module and include:
-#{Columnize::columnize(Trace.const_get('EVENTS'), 80, ' ' * 4, true, true, ' ' * 2)}
+    unless defined?(HELP)
+        TRACE_POINT_EVENTS = TracePoint.new{}.event_mask.map{|e| e.to_s}
+        Trepanning::Subcommand.set_name_prefix(__FILE__, self)
+        HELP         = <<-EOH
+**#{PREFIX.join(' ')}** {*event-name*[,] ...}
+
+Set trace events that the debugger will stop on.
+
+Event names are:
+
+#{Columnize::columnize(TRACE_POINT_EVENTS, 80, ' ' * 4,
+                       true, true, ' ' * 4)}
 
 Separate event names with space and an optional comma is also
 allowable after an event name.
 
 Examples:
-   set events call return
-   set ev call, c_call, return, c_return, c_return, insn
-"
+---------
+    set events call return
+    set ev call, c_call, return, c_return, c_return
+
+See also:
+---------
+
+`show events`
+
+EOH
     MIN_ABBREV   = 'ev'.size
     SHORT_HELP   = 'Set trace events we may stop on.'
   end
 
-  completion Trace.const_get("EVENTS").map{|event| event.to_s}
+  completion TRACE_POINT_EVENTS
 
-  def save_command
-    step_events_list = @proc.core.step_events_list
-    step_events_list = 'brkpt' unless step_events_list
-    ["#{subcmd_prefix_string} #{step_events_list}"]
-  end
+    def save_command
+        step_events_list = @proc.core.step_events_list
+        step_events_list = 'brkpt' unless step_events_list
+        ["#{subcmd_prefix_string} #{step_events_list}"]
+    end
+
+    def run(args)
+        unless args.size <= 2
+            events = args[2..-1]
+            invalid_names = []
+            valid_events = events.map do |event|
+                event.chomp!(',')
+                if TRACE_POINT_EVENTS.member?(event)
+                    event
+                else
+                    invalid_names << event
+                    nil
+                end
+            end.compact
 
-  def run(args)
-    unless args.size <= 2
-      events = args[2..-1]
-      events.each {|event| event.chomp!(',')}
-      bitmask, bad_events = Trace.events2bitmask(events)
-      bitmask |= Trace::BRKPT_EVENT_MASK
-      unless bad_events.empty?
-        errmsg("Event names unrecognized/ignored: %s" % bad_events.join(', '))
-      end
-      @proc.core.step_events = bitmask
+            # FIXME: check validity of events
+            if @proc.core.trace_point
+                @proc.core.trace_point.event_mask_set *valid_events
+            else
+                errmsg("No tracepoint currently set")
+            end
+            unless invalid_names.empty?
+                errmsg("Event names unrecognized/ignored: %s" % invalid_names.join(', '))
+            end
+        end
+        @proc.commands['show'].subcmds.subcmds[:events].run('events')
     end
-    @proc.commands['show'].subcmds.subcmds[:events].run('events')
-  end
 end
 
 if __FILE__ == $0
-  # Demo it.
-  require_relative '../../mock'
-  name = File.basename(__FILE__, '.rb')
-
-  # FIXME: DRY the below code
-  dbgr, cmd = MockDebugger::setup('set')
-  subcommand = Trepan::Subcommand::SetEvents.new(cmd)
-  testcmdMgr = Trepan::Subcmd.new(subcommand)
-
-  name = File.basename(__FILE__, '.rb')
-  subcommand.summary_help(name)
-  puts
-  subcommand.run([])
-  [%w(call line foo), %w(insn, c_call, c_return,)].each do |events|
-    subcommand.run(%w(set events) + events)
-    puts 'bitmask: %09b, events: %s ' % [dbgr.core.step_events, events.inspect]
-  end
-  puts '-' * 20
-  puts subcommand.save_command()
+    # Demo it.
+    require_relative '../../mock'
+    name = File.basename(__FILE__, '.rb')
+
+    # FIXME: DRY the below code
+    dbgr, cmd = MockDebugger::setup('set')
+    subcommand = Trepan::Subcommand::SetEvents.new(cmd)
+    testcmdMgr = Trepan::Subcmd.new(subcommand)
+
+    name = File.basename(__FILE__, '.rb')
+    # subcommand.summary_help(name)
+    puts
+    subcommand.run([])
+    [%w(call line foo), %w(c_call, c_return,)].each do |events|
+        subcommand.run(%w(set events) + events)
+        puts dbgr.core.step_events
+    end
+    puts '-' * 20
+    puts subcommand.save_command()
 
 end

data/processor/command/set_subcmd/max_subcmd/list.rb

@@ -1,23 +1,30 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2015 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative '../../base/subsubcmd'
 
 class Trepan::SubSubcommand::SetMaxList < Trepan::SubSubcommand
   unless defined?(HELP)
     NAME         = File.basename(__FILE__, '.rb')
-    HELP         = "Set max[imum] #{NAME} NUMBER
-
-Set number of source-code lines to list by default."
     IN_LIST      = true
     MIN_ABBREV   = 'lis'.size
     PREFIX       = %W(set max #{NAME})
     SHORT_HELP   = 'Set number of lines to list'
+    HELP         = <<-EOH
+**#{PREFIX.join(' ')}** *integer-expression*
+
+Set number of source-code lines to list by default in a debugger `list` command.
+
+See also:
+---------
+`list`, `show maximum list`
+EOH
+
   end
 
   def run(args)
     args.shift
     run_set_int(args.join(' '),
-                "The '#{PREFIX.join(' ')}' command requires a list size", 
+                "The '#{PREFIX.join(' ')}' command requires a list size",
                 0, nil)
   end
 

data/processor/command/set_subcmd/max_subcmd/width.rb

@@ -1,27 +1,36 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2015 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative '../../base/subsubcmd'
 
 class Trepan::SubSubcommand::SetMaxWidth < Trepan::SubSubcommand
-  unless defined?(HELP)
-    HELP         = 'Set max[imum] width NUMBER
+    unless defined?(HELP)
+        HELP         = 'Set max[imum] width NUMBER
 
 Set number of characters the debugger thinks are in a line.'
-    IN_LIST      = true
-    MIN_ABBREV   = 'wid'.size
-    NAME         = File.basename(__FILE__, '.rb')
-    PREFIX       = %w(set max width)
-    SHORT_HELP   = 'Set number of characters the debugger thinks are in a line'
-  end
-
-  def run(args)
-    args.shift
-    run_set_int(args.join(' '),
-                "The '#{PREFIX.join(' ')}' command requires a line width", 
-                0, nil)
-  end
-
-  alias save_command save_command_from_settings
+        IN_LIST      = true
+        MIN_ABBREV   = 'wid'.size
+        NAME         = File.basename(__FILE__, '.rb')
+        PREFIX       = %w(set max width)
+        SHORT_HELP   = 'Set number of characters the debugger thinks are in a line'
+    end
+
+    def display_width
+        (ENV['COLUMNS'] || `tput cols &2>/dev/null`).to_i rescue 80
+    end
+
+    def run(args)
+        args.shift
+        if args.size == 0
+            @proc.settings[:maxwidth] = display_width
+            run_show_int
+        else
+            run_set_int(args.join(' '),
+                        "The '#{PREFIX.join(' ')}' command requires a line width",
+                        0, nil)
+        end
+    end
+
+    alias save_command save_command_from_settings
 
 end
 
@@ -31,7 +40,7 @@ if __FILE__ == $0
   name = File.basename(__FILE__, '.rb')
 
   dbgr, set_cmd = MockDebugger::setup('set')
-  max_cmd       = Trepan::SubSubcommand::SetMax.new(dbgr.core.processor, 
+  max_cmd       = Trepan::SubSubcommand::SetMax.new(dbgr.core.processor,
                                                       set_cmd)
   cmd_ary       = Trepan::SubSubcommand::SetMaxWidth::PREFIX
   cmd_name      = cmd_ary.join(' ')

data/processor/command/set_subcmd/register.rb

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2015 Rocky Bernstein <rockyb@rubyforge.net>
+require_relative '../base/subsubcmd'
+require_relative '../base/subsubmgr'
+
+class Trepan::SubSubcommand::SetRegister < Trepan::SubSubcommandMgr
+    unless defined?(HELP)
+        Trepanning::Subcommand.set_name_prefix(__FILE__, self)
+        HELP   = <<-EOH
+**#{PREFIX.join(' ')}** {*register-name*[,] ...}
+
+Allows setting certain VM registers. *Warning*: these are potentially
+dangerous.
+
+See also:
+---------
+`#{PREFIX.join(' ')} *` for a list of subcommands or `#{PREFIX.join(' ')} *name*`
+for help on a particular register subcommand.
+    EOH
+        SHORT_HELP = 'Set VM registers'
+        MIN_ABBREV = 'reg'.size
+    end
+end
+
+if __FILE__ == $0
+  require_relative '../../mock'
+  dbgr, cmd = MockDebugger::setup('set')
+  cmds = dbgr.core.processor.commands
+  set_cmd = cmds['set']
+  command = Trepan::SubSubcommand::SetRegister.new(dbgr.core.processor,
+                                               set_cmd)
+  cmd_args = Trepan::SubSubcommand::SetRegister::PREFIX
+  set_cmd.instance_variable_set('@last_args', cmd_args)
+  # require_relative '../../../lib/trepanning'
+  # Trepan.debug
+  command.run(cmd_args)
+end