trepanning 1.93.35 → 2.15.33

data/processor/command/set_subcmd/register_subcmd/pc.rb

@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2012, 2015 Rocky Bernstein <rockyb@rubyforge.net>
+require_relative '../../base/subsubcmd'
+
+# Note: The class name has to end in Pc, not PC since it is
+# auto-instantiated.
+class Trepan::Subcommand::SetRegisterPc < Trepan::SubSubcommand
+    unless defined?(HELP)
+        NAME         = File.basename(__FILE__, '.rb')
+        SHORT_HELP   = 'Set VM program counter (PC)'
+        IN_LIST      = true
+        MIN_ABBREV   = 'pc'.size
+        PREFIX       = %w(set register #{name})
+        HELP         = <<-EOH
+**#{PREFIX.join(' ')}** *integer-expression*
+
+Set VM program-counter register (PC) to *integer-expression*
+
+Warning: this is potentially dangerous.
+
+See also:
+---------
+`set register sp`, `info register sp`, `set return`
+EOH
+    end
+
+    def run(args)
+        if args.size < 2
+            errmsg "Too few arguments - the 'pc' command requires a value"
+            return
+        end
+        new_val_str = args[1..-1].join(' ')
+        begin
+            new_val = @proc.debug_eval(new_val_str)
+        rescue StandardError, ScriptError => e
+            return
+        end
+        msg("Old value was: %s" % @proc.frame.pc_offset.inspect)
+        @proc.frame.pc_offset =  new_val
+        msg("New value is: %s" % new_val.inspect)
+    end
+end
+
+if __FILE__ == $0
+  # Demo it.
+  require_relative '../../../mock'
+  require_relative '../../../subcmd'
+  name = File.basename(__FILE__, '.rb')
+
+  # # FIXME: DRY the below code
+  # dbgr, cmd = MockDebugger::setup('set')
+  # subcommand = Debugger::Subcommand::SetPC.new(cmd)
+  # testcmdMgr = Debugger::Subcmd.new(subcommand)
+
+  # def subcommand.msg(message)
+  #   puts message
+  # end
+  # def subcommand.msg_nocr(message)
+  #   print message
+  # end
+  # def subcommand.errmsg(message)
+  #   puts message
+  # end
+  # subcommand.run(%w(20))
+  # name = File.basename(__FILE__, '.rb')
+  # subcommand.summary_help(name)
+end

data/processor/command/set_subcmd/register_subcmd/sp.rb

@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2010-2012, 2015 Rocky Bernstein <rockyb@rubyforge.net>
+require_relative '../../base/subsubcmd'
+
+# Note: The class name has to end in Sp, not SP since it is
+# auto-instantiated.
+class Trepan::Subcommand::SetRegisterSp < Trepan::SubSubcommand
+    unless defined?(HELP)
+        NAME         = File.basename(__FILE__, '.rb')
+        SHORT_HELP   = 'Set a stack pointer register'
+        IN_LIST      = true
+        MIN_ABBREV   = 'sp'.size
+        PREFIX       = %w(set register #{name})
+        HELP         = <<-EOH
+**#{PREFIX.join(' ')}** *integer-expression*
+
+Set VM stack-pointer register (SP) to *integer-expression*
+
+Warning: this is potentially dangerous.
+
+See also:
+---------
+
+`info register sp`, `set return`
+EOH
+  end
+
+  def run(args)
+      # FIXME handle c-return
+      # unless %w(return c-return).member?(@proc.event)
+      if args.size < 3
+          errmsg "Too few arguments - the 'sp' command requires number and a value"
+          return
+      end
+      msg_on_error = "set SP requires an integer index"
+      index = @proc.get_an_int(args[1],
+                               :msg_on_error => msg_on_error
+                               )
+      return unless index
+      new_val_str = args[2..-1].join(' ')
+      begin
+          new_val = @proc.debug_eval(new_val_str)
+      rescue StandardError, ScriptError => e
+          return
+      end
+      msg("Old value was: %s" % @proc.frame.sp(index).inspect)
+      @proc.frame.sp_set(index, new_val)
+      msg("New value is: %s" % new_val.inspect)
+  end
+end
+
+if __FILE__ == $0
+  # Demo it.
+  require_relative '../../../mock'
+  require_relative '../../../subcmd'
+  name = File.basename(__FILE__, '.rb')
+
+  # # FIXME: DRY the below code
+  # dbgr, cmd = MockTrepan::setup('set')
+  # subcommand = Trepan::Subcommand::SetSp.new(cmd)
+  # testcmdMgr = Trepan::Subcmd.new(subcommand)
+
+  # def subcommand.msg(message)
+  #   puts message
+  # end
+  # def subcommand.msg_nocr(message)
+  #   print message
+  # end
+  # def subcommand.errmsg(message)
+  #   puts message
+  # end
+  # subcommand.run(%w(20))
+  # name = File.basename(__FILE__, '.rb')
+  # subcommand.summary_help(name)
+end

data/processor/command/set_subcmd/reload.rb

@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2011, 2015 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative '../base/subcmd'
 
 class Trepan::Subcommand::SetReload < Trepan::SetBoolSubcommand
-  unless defined?(HELP)
-    Trepanning::Subcommand.set_name_prefix(__FILE__, self)
-    SHORT_HELP = "Set whether to reread source text when it changes."
-    IN_LIST    = true
-    MIN_ABBREV = 're'.size
-    HELP         = <<-EOH
-#{CMD} {on|off}
+    unless defined?(HELP)
+        Trepanning::Subcommand.set_name_prefix(__FILE__, self)
+        SHORT_HELP = "Set whether to reread source text when it changes."
+        IN_LIST    = true
+        MIN_ABBREV = 'rel'.size
+        HELP         = <<-EOH
+**#{CMD}** {**on**|**off**}
 
 Source text is cached on the first read. This ensures that if you
 change the source text after the debugged program is runnning you will
@@ -23,10 +23,12 @@ will reload the source code. So here the debugger will be out of sync.
 Set this to true, and the debugger will notice such changes and reread
 the source text when it discovers it has changed.
 
-See also "info source" and "info files" and note the SHA1
+See also:
+--------
+`info source` and `info files` and note the SHA1
 and file modification time.
     EOH
-  end
+    end
 end
 
 if __FILE__ == $0

data/processor/command/set_subcmd/return.rb

@@ -1,12 +1,27 @@
 # -*- 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'
 require_relative '../../../app/frame'
 
 class Trepan::Subcommand::SetReturn < Trepan::Subcommand
   unless defined?(HELP)
     Trepanning::Subcommand.set_name_prefix(__FILE__, self)
-    HELP         = 'Set the value that will be returned in the current method'
+    HELP         = <<-EOH
+**#{PREFIX.join(' ')}** *expression*
+
+Set return value to *expression*
+
+There are currently a number of restrictions here. First, you have to
+be at some sort of return event. Second, the opcode you are stopped at
+has to be a `leave` instruction.
+
+Warning: this is potentially dangerous.
+
+See also:
+---------
+
+`set register sp`, `info register sp`
+EOH
     IN_LIST      = true
     MIN_ABBREV   = 'ret'.size
   end
@@ -14,52 +29,61 @@ class Trepan::Subcommand::SetReturn < Trepan::Subcommand
   include Trepan::Frame
 
   def run(args)
-    event = @proc.event
-    unless %w(return c-return).member?(event)
-      errmsg('You need to be in a return event to do this. Event is %s' % 
-             event)
-      return
-    end
-    if args.size < 3 
-      errmsg "Too few arguments - the 'return' command requires a return value"
-      return
-    end
-    new_val_str = args[2..-1].join(' ')
-    begin
-      new_val = @proc.debug_eval(new_val_str)
-    rescue StandardError, ScriptError => e
-      p $!
-      return
-    end
-    ret_val = Trepan::Frame.value_returned(@proc.frame, event)
-    msg('Return value was: %s' % ret_val.inspect)
-    Trepan::Frame.set_return_value(@proc.frame, event, new_val)
-    msg('New value is: %s' % new_val.inspect)
+      event = @proc.event.to_s
+      unless %w(return c_return b_return).member?(event)
+          errmsg('You need to be in a return event to do this. Event is %s' %
+                 event)
+          return
+      end
+      unless @proc.core.trace_point
+          msg('We need a trace-point to get this information')
+          return
+      end
+      if args.size < 3
+          errmsg "Too few arguments - the 'return' command requires a return value"
+          return
+      end
+      frame = @proc.frame
+      if %w(return b_return).member?(event)
+          index = 1
+          opname = frame.iseq.op_at(frame.pc_offset)
+          if opname != 'leave'
+              msg("Need to be at a 'leave' instruction; at %s instruction" %
+                  opname)
+              return
+          end
+      else
+          # FIXME: Probably not quite right. Doesn't handle receiver methods
+          # would like to do via end of stack-1.
+          index = frame.argc + 3
+          msg("C functions not handled yet")
+          return
+      end
+      @proc.commands['set'].run(['set', 'register', 'sp', index.to_s, *args[2..-1]])
   end
-
 end
 
 if __FILE__ == $0
-  # Demo it.
-  require_relative '../../mock'
-  require_relative '../../subcmd'
-  name = File.basename(__FILE__, '.rb')
+    # Demo it.
+    require_relative '../../mock'
+    require_relative '../../subcmd'
+    name = File.basename(__FILE__, '.rb')
 
-  # FIXME: DRY the below code
-  dbgr, cmd = MockTrepan::setup('set')
-  subcommand = Trepan::Subcommand::SetReturn.new(cmd)
-  testcmdMgr = Trepan::Subcmd.new(subcommand)
+    # FIXME: DRY the below code
+    dbgr, cmd = MockDebugger::setup('set')
+    subcommand = Trepan::Subcommand::SetReturn.new(cmd)
+    testcmdMgr = Trepan::Subcmd.new(subcommand)
 
-  def subcommand.msg(message)
-    puts message
-  end
-  def subcommand.msg_nocr(message)
-    print message
-  end
-  def subcommand.errmsg(message)
-    puts message
-  end
-  subcommand.run(%w(20))
-  name = File.basename(__FILE__, '.rb')
-  subcommand.summary_help(name)
+    def subcommand.msg(message)
+        puts message
+    end
+    def subcommand.msg_nocr(message)
+        print message
+    end
+    def subcommand.errmsg(message)
+        puts message
+    end
+    subcommand.run(%w(20))
+    name = File.basename(__FILE__, '.rb')
+    subcommand.summary_help(name)
 end

data/processor/command/shell.rb

@@ -87,7 +87,8 @@ Here then is a loop to query VM stack values:
 
     # And just when you thought, we'd never get around to
     # actually running irb...
-    cont = IRB.start_session(@proc.frame.binding, @proc, conf)
+    bind = @proc.frame ? @proc.frame.binding : binding
+    cont = IRB.start_session(bind, @proc, conf)
     trap('SIGINT', save_trap) # Restore our old interrupt function.
 
     # Restore the debuggers' Readline history and the Readline completion
@@ -117,7 +118,7 @@ Here then is a loop to query VM stack values:
     when :step
       @proc.step # (1, {})
     else
-      @proc.print_location
+      @proc.print_location if @proc.frame
     end
   ensure
     $trepan_in_irb = false

data/processor/command/show_subcmd/different.rb

@@ -1,23 +1,26 @@
 # -*- 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::ShowDifferent < Trepan::ShowBoolSubcommand
-  unless defined?(HELP)
-    Trepanning::Subcommand.set_name_prefix(__FILE__, self)
-    HELP = "Show status of 'set different'"
-    MIN_ABBREV   = 'dif'.size
-  end
-
-  def run(args)
-    if 'nostack' == @proc.settings[:different]
-      msg("different is nostack.")
-    else
-      super
+    unless defined?(HELP)
+        Trepanning::Subcommand.set_name_prefix(__FILE__, self)
+        HELP = "Show status of 'set different'"
+        MIN_ABBREV   = 'dif'.size
     end
-  end
-
 
+    def run(args)
+        case @proc.settings[:different]
+         when 'nostack'
+            msg("different is nostack.")
+        when 'off'
+            msg("different is off.")
+        when 'on'
+            msg("different is on.")
+        else
+            msg("Unknown value of different %s"  % @proc.settings[:different].inspect)
+        end
+    end
 end
 
 if __FILE__ == $0

data/processor/command/show_subcmd/events.rb

@@ -1,38 +1,38 @@
 # -*- 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::ShowEvents < Trepan::Subcommand
-  unless defined?(HELP)
-    Trepanning::Subcommand.set_name_prefix(__FILE__, self)
-    HELP         = 'Show trace events we may stop on.'
-    MIN_ABBREV   = 'ev'.size
-  end
+    unless defined?(HELP)
+        Trepanning::Subcommand.set_name_prefix(__FILE__, self)
+        HELP         = 'Show trace events we may stop on.'
+        MIN_ABBREV   = 'ev'.size
+    end
 
-  # FIXME: this really should be a subcommand of "set trace"
-  def run(args)
-    step_events_list = @proc.core.step_events_list
-    if step_events_list
-      msg 'Trace events we may stop on:'
-      msg "\t" + step_events_list
-    else
-      msg 'No events trapped.'
+    # FIXME: this really should be a subcommand of "set trace"
+    def run(args)
+        step_events_list = @proc.core.step_events_list
+        if step_events_list
+            section 'Trace events we may stop on:'
+            msg columnize_commands(step_events_list.sort)
+        else
+            msg 'No events trapped.'
+        end
     end
-  end
 
 end
 
 if __FILE__ == $0
-  # Demo it.
-  require_relative '../../mock'
+    # Demo it.
+    require_relative '../../mock'
 
-  # FIXME: DRY the below code
-  dbgr, cmd = MockDebugger::setup('exit')
-  subcommand = Trepan::Subcommand::ShowEvents.new(cmd)
-  testcmdMgr = Trepan::Subcmd.new(subcommand)
+    # FIXME: DRY the below code
+    dbgr, cmd = MockDebugger::setup('exit')
+    subcommand = Trepan::Subcommand::ShowEvents.new(cmd)
+    testcmdMgr = Trepan::Subcmd.new(subcommand)
 
-  name = File.basename(__FILE__, '.rb')
-  subcommand.summary_help(name)
-  puts
-  subcommand.run([name])
+    name = File.basename(__FILE__, '.rb')
+    subcommand.summary_help(name)
+    puts
+    subcommand.run([name])
 end

data/processor/default.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2011, 2013 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2013, 2015 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative '../app/default'
 require_relative 'virtual'
 class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor

data/processor/eval.rb

@@ -4,22 +4,21 @@ require_relative 'virtual'
 class Trepan
   class CmdProcessor < VirtualCmdProcessor
 
-    def debug_eval(str, max_fake_filename=15, 
-                   ruby_193_hack=false) #FIXME: remove ruby_193_hack
+    def debug_eval(str, max_fake_filename=15)
       begin
-        debug_eval_with_exception(str, max_fake_filename, ruby_193_hack)
+        debug_eval_with_exception(str, max_fake_filename)
       rescue SyntaxError, StandardError, ScriptError => e
         exception_dump(e, @settings[:stack_trace_on_error], $!.backtrace)
         nil
       end
     end
 
-    def debug_eval_with_exception(str, max_fake_filename=15, 
-                                  ruby_193_hack=false) # FIXME: remove ruby_193_hack
-      RubyVM::Frame.current.trace_off = true if ruby_193_hack
-      filename, b = get_binding_and_filename(str, max_fake_filename)
-      RubyVM::Frame.current.trace_off = false if ruby_193_hack
-      eval(str, b, filename)
+    def debug_eval_with_exception(str, max_fake_filename=15)
+        # FIXME: Do we need to set trace_off?
+        RubyVM::Frame.get.trace_off = true
+        filename, b = get_binding_and_filename(str, max_fake_filename)
+        RubyVM::Frame.get.trace_off = false
+        eval(str, b, filename)
     end
 
     def debug_eval_no_errmsg(str, max_fake_filename=15)
@@ -32,10 +31,10 @@ class Trepan
 
     def eval_code(str, max_fake_filename)
       obj = debug_eval(str, max_fake_filename)
-      
+
       # idx = @user_variables
       # @user_variables += 1
-      
+
       # str = "$d#{idx}"
       # Rubinius::Globals[str.to_sym] = obj
       # msg "#{str} = #{obj.inspect}"
@@ -53,7 +52,7 @@ class Trepan
     end
 
     def fake_eval_filename(str, maxlen = 15)
-      fake_filename = 
+      fake_filename =
         if maxlen < str.size
           # FIXME: Guard against \" in positions 13..15?
           str.inspect[0..maxlen-1] + '"...'
@@ -62,9 +61,9 @@ class Trepan
         end
       "(eval #{fake_filename})"
     end
-    
+
     def get_binding_and_filename(str, maxlen)
-      b = 
+      b =
         begin
           @frame.binding
         rescue
@@ -89,7 +88,7 @@ if __FILE__ == $0
   def cmdp.msg(msg)
     puts "** #{msg}"
   end
-  begin 
+  begin
     1/0
   rescue Exception => exc
     cmdp.exception_dump(exc, true, $!.backtrace)