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

data/app/default.rb

@@ -22,7 +22,6 @@ class Trepan
 
     :restart_argv    => Rubinius::OS_ARGV,
                                # Command run when "restart" is given.
-    :restore_profile => nil,   # Profile used to set/restore debugger state
     :server          => false, # Out-of-process debugging?
     :skip_loader     => false, # If run via -Xdebug or trepanx
                                # command-line we need this to skip

data/app/method.rb

@@ -2,6 +2,7 @@
 module Trepanning
   module Method
 
+    module_function
     ## FIXME: until the next two routines find their way back into 
     ## Rubinius::CompiledMethod...
     ##
@@ -23,7 +24,6 @@ module Trepanning
       end
       return nil
     end
-    module_function :locate_line_in_cm
 
     ## FIXME: Try using Routine in Rubinius now.
     ##
@@ -54,7 +54,6 @@ module Trepanning
       # No child method is a match - fail
       return nil
     end
-    module_function :locate_line
 
     def lines_of_method(cm)
       lines = []
@@ -63,7 +62,6 @@ module Trepanning
       end
       return lines
     end
-    module_function :lines_of_method
 
     # Return true if ip is the start of some instruction in meth.
     # FIXME: be more stringent.
@@ -71,7 +69,6 @@ module Trepanning
       size = cm.lines.size
       ip >= 0 && ip < cm.lines[size-1]
     end
-    module_function :valid_ip?
 
     # Returns a CompiledMethod for the specified line. We search the
     # current method +meth+ and then up the parent scope.  If we hit
@@ -84,13 +81,11 @@ module Trepanning
       end
       
       lines = lines_of_method(cm)
-      ## p ['++++1', cm, lines]
       return cm if lines.member?(line) 
       scope = cm.scope
       return nil unless scope.current_script
       cm  = scope.current_script.compiled_method
       lines = lines_of_method(cm)
-      ## p ['++++2', cm, lines]
       until lines.member?(line) do
         child = scope
         scope = scope.parent
@@ -103,11 +98,19 @@ module Trepanning
         end
         cm = scope.current_script.compiled_method
         lines = lines_of_method(cm)
-        ## p ['++++3', cm, lines]
       end
       return cm
     end
-    module_function :find_method_with_line
+
+    def top_scope(cm)
+      scope = cm.scope
+      while true do
+        scope = scope.parent
+        break unless scope && scope.current_script
+        cm = scope.current_script.compiled_method
+      end
+      cm
+    end
   end
 
 end
@@ -165,6 +168,7 @@ if __FILE__ == $0
   p lines_of_method(cm)
   find_line(line)
   p find_method_with_line(cm, line+2)
+  puts "top scope: #{top_scope(cm)}"
   ip = locate_line( __LINE__, cm)[1]
   puts "Line #{__LINE__} has ip #{ip}" 
   [-1, 0, 10, ip, 10000].each do |i|

data/app/options.rb

@@ -9,7 +9,7 @@ class Trepan
   require 'rubygems'; require 'require_relative'
   require_relative 'default'
 
-  Trepan::VERSION = '0.0.7'
+  Trepan::VERSION = '0.0.8'
   Trepan::PROGRAM = 'trepanx'
 
   def self.show_version
@@ -82,13 +82,6 @@ EOB
         |num| 
         options[:port] = num
       end
-      opts.on("--restore PROFILE", String, 
-              "Restore debugger state using PROFILE") do |profile|
-        if File.readable?(profile)
-          options[:restore_profile] = profile
-          stderr.puts "Debugger command file #{profile} is not readable. --restore option ignored."
-        end
-      end
       opts.on('--server',
               "Set up for out-of-process debugging") do
         if options[:client]
@@ -98,7 +91,7 @@ EOB
         end
       end
       opts.on('--[no-]highlight',
-              "Use [no] syntax highligh output") do |v|
+              "Use [no] syntax highlight output") do |v|
         options[:highlight] = ((v) ? :term : nil)
       end
       opts.on('--[no-]readline',

data/app/validate.rb

@@ -5,7 +5,7 @@ class Trepan
     def line_or_ip(arg_str)
       arg=arg_str.dup
       is_ip = 
-        if 'o' == arg[0..0].downcase
+        if '@' == arg[0..0]
           arg[0] = ''
           true
         else
@@ -24,7 +24,7 @@ end
 
 if __FILE__ == $0
   include Trepan::Validate
-  %w(o1 O2 oink 1 12 -12).each do |arg|
+  %w(@1 oink 1 12 -12).each do |arg|
     puts "line_or_ip(#{arg})=#{line_or_ip(arg).inspect}"
   end
 end

data/bin/trepanx

@@ -50,9 +50,9 @@ if File.basename(__FILE__) == File.basename($0)
       end
     end
 
-    program_to_debug = ARGV.shift
-    program_to_debug = whence_file(program_to_debug) unless 
-      File.exist?(program_to_debug)
+    program_to_debug = (Trepan::PROG_UNRESOLVED_SCRIPT = ARGV.shift).dup
+    program_to_debug = whence_file(Trepan::PROG_UNRESOLVED_SCRIPT) unless 
+      File.exist?(Trepan::PROG_UNRESOLVED_SCRIPT)
     Trepan::PROG_SCRIPT = program_to_debug
 
     opts = {}

data/lib/trepanning.rb

@@ -124,8 +124,6 @@ class Trepan
 
     # Run user debugger command startup files.
     add_startup_files unless @settings[:nx]
-    add_command_file(@settings[:restore_profile]) if 
-      @settings[:restore_profile] && File.readable?(@settings[:restore_profile])
   end
 
   # The method is called when we want to do debugger command completion
@@ -155,7 +153,7 @@ class Trepan
   def skip_loader
     cmds = 
       if @settings[:skip_loader] == :Xdebug
-        ['continue Rubinius::CodeLoader#load_script',
+        ['continue Rubinius::CodeLoader.load_script',
          'continue 67',
          # 'set kernelstep off',   # eventually would like 'on'
          'step', 'set hidelevel -1'
@@ -197,7 +195,7 @@ class Trepan
   # Startup the debugger, skipping back +offset+ frames. This lets you start
   # the debugger straight into callers method.
   #
-  def start(settings = {:immediate => false})
+  def debugger(settings = {:immediate => false})
     @settings = @settings.merge(settings)
     skip_loader if @settings[:skip_loader]
     spinup_thread
@@ -206,6 +204,12 @@ 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!
@@ -225,8 +229,7 @@ class Trepan
     Thread.current.set_debugger_thread @thread
     self
   end
-  # ruby-debug compatibility
-  alias debugger start
+  alias start debugger
 
   def stop(settings = {})
     @processor.finalize

data/processor/breakpoint.rb

@@ -45,8 +45,9 @@ class Trepan
       bp
     end
     
-    def set_breakpoint_method(descriptor, meth, line=nil, ip=nil,
-                              opts={:event => 'brkpt',:temp => false})
+    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 
@@ -60,7 +61,7 @@ class Trepan
       end
 
       if line
-        ip = cm.first_ip_on_line(line)
+        ip = cm.first_ip_on_line(line, -2)
         
         unless ip
           errmsg "Unknown line '#{line}' in method '#{cm.name}'"
@@ -74,7 +75,7 @@ class Trepan
       # def lines without code will have value -1.
       ip = 0 if -1 == ip
 
-      bp = @brkpts.add(descriptor, cm, ip, line, @brkpts.max+1, opts)
+      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 ' : ''))
@@ -144,21 +145,6 @@ class Trepan
       return true
     end
 
-    # MRI 1.9.2 code
-    # # 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
   end
 end
 

data/processor/command/alias.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
 require_relative 'base/cmd'
 
@@ -11,12 +11,11 @@ class Trepan::Command::AliasCommand < Trepan::Command
 
 Add an alias for a COMMAND
 
-See also 'unalias'.
+See also 'unalias' and 'show #{NAME}'.
     HELP
 
     CATEGORY      = 'support'
     MAX_ARGS      = 2  # Need at most this many
-    NAME          = File.basename(__FILE__, '.rb')
     NEED_STACK    = true
     SHORT_HELP    = 'Add an alias for a debugger command'
   end
@@ -24,9 +23,9 @@ See also 'unalias'.
   # Run command. 
   def run(args)
     if args.size == 1
-      @proc.commands['show'].run(%w(show alias))
+      @proc.commands['show'].run(%W(show #{NAME}))
     elsif args.size == 2
-      @proc.commands['show'].run(%W(show alias #{args[1]}))
+      @proc.commands['show'].run(%W(show #{NAME} #{args[1]}))
     else
       junk, al, command = args
       old_command = @proc.aliases[al]

data/processor/command/base/submgr.rb

@@ -70,8 +70,8 @@ class Trepan::SubcommandMgr < Trepan::Command
       subcmd_class = Trepan::SubSubcommand.const_get(name)
       begin
         cmd = subcmd_class.send(:new, self, parent)
-      rescue
-        puts "Subcmd #{name} is bad"
+      rescue Exception => exc
+        puts "Subcmd #{name} in #{parent.name.inspect} is bad: #{exc}"
       end
       @subcmds.add(cmd)
     end

data/processor/command/break.rb

@@ -1,82 +1,47 @@
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
 require_relative './base/cmd'
 
-class Trepan::Command::SetBreakpointCommand < Trepan::Command
+class Trepan::Command::BreakCommand < Trepan::Command
 
   ALIASES      = %w(b brk)
   CATEGORY     = 'breakpoints'
   NAME         = File.basename(__FILE__, '.rb')
   HELP         = <<-HELP
-#{NAME} 
-#{NAME} [line number|offset]
-#{NAME} Class[.#]method[:line-or-offset]
+#{NAME} LOCATION [ {if|unless} CONDITION ]
 
-Sets a breakpoint. In the first form, a breakpoint is set at the
-current line you are stopped at. In the second form, you give a line
-number or an offset.  An offset is a number that is prefaced with 'O'
-or 'o' and represents a Rubinius VM PC offset. 
-
-The current method name is used for the start of the search. If a line
-number is given and the line number is not found in that method,
-enclosing scopes are searched for the line.
-
-The last form is the most explicit. Use '#' to specify an instance
-method and '.' to specify a class method. If a line number or offset
-is omitted, we use the first line of the method.
+Set a breakpoint. In the second form where CONDITIOn is given, the
+condition is evaluated in the context of the position. We stop only If
+CONDITION evalutes to non-false/nil and the "if" form used, or it is
+false and the "unless" form used.\
 
 Examples:
+   #{NAME}
+   #{NAME} 10               # set breakpoint on line 10
+   #{NAME} 10 if 1 == a     # like above but only if a is equal to 1
+   #{NAME} 10 unless 1 == a # like above but only if a is equal to 1
+   #{NAME} me.rb:10
+   #{NAME} @20   # set breakpoint VM Instruction Sequence offset 20
+   #{NAME} Kernel.pp # Set a breakpoint at the beginning of Kernel.pp
 
-  #{NAME}     # set breakpoint at the current line
-  #{NAME} 5   # set breakpoint on line 5
-  #{NAME} O5  # set breakpoint at offset 5
-  #{NAME} o5  # same as above
-  #{NAME} Array#pop::3 # Set break at instance method 'pop' in Array, line 3
-  #{NAME} Trepan.start:3  # Set break in class method 'start' of Trepan, line 3
-  #{NAME} Trepan.start:o3 # Same as above but at offset 3, not line 3.
-  #{NAME} Trepan.start    # Set break in class method 'start' of Trepan
-
-See also 'tbreak', 'info breakpoint', and 'delete'. 
+See also condition, continue and "help location".
       HELP
   SHORT_HELP   = 'Set a breakpoint at a point in a method'
 
+  # This method runs the command
   def run(args, temp=false)
-    arg_str = args[1..-1].join(' ')
-
-    describe, klass_name, which, name, line, ip = 
-      @proc.breakpoint_position(args[1..-1])
-    event = temp ? 'tbrkpt' : 'brkpt'
-    opts={:event => event, :temp => temp}      
-    if name.kind_of?(Rubinius::CompiledMethod)
-      bp = @proc.set_breakpoint_method(describe, name, line, ip, opts)
-    else
-      return unless klass_name
-    
-      begin
-        klass = @proc.debug_eval(klass_name, settings[:maxstring])
-      rescue NameError
-        errmsg "Unable to find class/module: #{klass_name}"
-        ask_deferred klass_name, which, name, line
-        return
-      end
-      
-      begin
-        if which == "#"
-          method = klass.instance_method(name)
-        else
-          method = klass.method(name)
-        end
-      rescue NameError
-        errmsg "Unable to find method '#{name}' in #{klass}"
-        ask_deferred klass_name, which, name, line
-        return
-      end
 
-      bp = @proc.set_breakpoint_method(arg_str.strip, method, line, ip, opts)
+    arg_str = args.size == 1 ? @proc.frame.line.to_s : @proc.cmd_argstr
+    cm, line, ip, condition, negate = 
+      @proc.breakpoint_position(arg_str, true)
+    if cm
+      event = temp ? 'tbrkpt' : 'brkpt'
+      opts={:event => event, :temp => temp, :condition => condition, 
+            :negate => negate}
+      bp = @proc.set_breakpoint_method(cm, line, ip, opts)
+      bp.set_temp! if temp
+      return bp
     end
-      
-    bp.set_temp! if temp
-    return bp
   end
   
   def ask_deferred(klass_name, which, name, line)
@@ -92,9 +57,22 @@ end
 if __FILE__ == $0
   require_relative '../mock'
   dbgr, cmd = MockDebugger::setup
-  cmd.run([cmd.name])
-  # require 'trepanning'
-  # Trepan.start(:set_restart => true)
-  cmd.run([cmd.name, __LINE__.to_s])
-  cmd.run([cmd.name, 'foo'])
+  # require_relative '../../lib/trepanning'
+  def run_cmd(cmd, args) 
+    cmd.proc.instance_variable_set('@cmd_argstr', args[1..-1].join(' '))
+    cmd.run(args)
+  end
+
+  run_cmd(cmd, [cmd.name])
+  run_cmd(cmd, [cmd.name, __LINE__.to_s])
+
+  def foo
+    5 
+  end
+  run_cmd(cmd, [cmd.name, 'foo', (__LINE__-2).to_s])
+  run_cmd(cmd, [cmd.name, 'foo'])
+  run_cmd(cmd, [cmd.name, "MockDebugger::setup"])
+  require 'irb'
+  run_cmd(cmd, [cmd.name, "IRB.start"])
+  run_cmd(cmd, [cmd.name, 'foo93'])
 end

data/processor/command/condition.rb

@@ -21,6 +21,8 @@ made unconditional.
 Examples:
    #{NAME} 5 x > 10  # Breakpoint 5 now has condition x > 10
    #{NAME} 5         # Remove above condition
+
+See also "break", "enable" and "disable".
     HELP
 
     ALIASES       = %w(cond)

data/processor/command/continue.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
 require_relative 'base/cmd'
 require_relative '../stepping'
@@ -7,7 +7,7 @@ class Trepan::Command::ContinueCommand < Trepan::Command
   unless defined?(HELP)
     NAME = File.basename(__FILE__, '.rb')
     HELP = <<-HELP
-#{NAME} [breakpoint-position]
+#{NAME} [LOCATION]
 
 Leave the debugger loop and continue execution. Subsequent entry to
 the debugger however may occur via breakpoints or explicit calls, or
@@ -24,7 +24,7 @@ Examples:
    #{NAME} gcd   # continue to first instruction of method gcd
    #{NAME} IRB.start o7 # continue to IRB.start offset 7
 
-See also 'step', 'next', 'finish', and 'nexti' commands.
+See also 'step', 'next', 'finish', 'nexti' commands and "help location".
     HELP
 
     ALIASES      = %w(c cont)
@@ -39,45 +39,15 @@ See also 'step', 'next', 'finish', and 'nexti' commands.
 
     ## FIXME: DRY this code, tbreak and break.
     unless args.size == 1
-      describe, klass_name, which, name, line, ip = 
-        @proc.breakpoint_position(args[1..-1])
-      unless describe
-        errmsg "Can't parse temporary breakpoint location"
-        return 
-      end
-      if name.kind_of?(Rubinius::CompiledMethod)
-        bp = @proc.set_breakpoint_method(describe, name, line, ip,
-                                         {:temp=>true, :event =>'tbrkpt'})
-        unless bp
-          errmsg "Trouble setting temporary breakpoint"
-          return 
-        end
+      cm, line, ip, condition, negate = 
+        @proc.breakpoint_position(@proc.cmd_argstr, false)
+      if cm
+        opts={:event => 'tbrkpt', :temp => true}
+        bp = @proc.set_breakpoint_method(cm, line, ip, opts)
+        bp.set_temp!
       else
-        return unless klass_name
-        begin
-          klass = @proc.debug_eval(klass_name, settings[:maxstring])
-        rescue NameError
-          errmsg "Unable to find class/module: #{klass_name}"
-          return
-        end
-        
-        begin
-          if which == "#"
-            method = klass.instance_method(name)
-          else
-            method = klass.method(name)
-          end
-        rescue NameError
-          errmsg "Unable to find method '#{name}' in #{klass}"
-          return
-        end
-        arg_str = args[1..-1].join(' ')
-        bp = @proc.set_breakpoint_method(arg_str.strip, method, line, nil,
-                                         {:temp=>true, :event =>'tbrkpt'})
-        unless bp
-          errmsg "Trouble setting temporary breakpoint"
-          return 
-        end
+        errmsg "Trouble setting temporary breakpoint"
+        return 
       end
     end
     @proc.continue('continue')

data/processor/command/disassemble.rb

@@ -140,6 +140,8 @@ if __FILE__ == $0
     cmd.run([cmd.name, 'self.setup'])
     puts '=' * 40
     cmd.run([cmd.name, __LINE__.to_s])
+    require 'irb'
+    cmd.run([cmd.name, 'IRB.start'])
   end
   foo(cmd)
 end

data/processor/command/eval.rb

@@ -18,17 +18,18 @@ may be used again easily. The name of the global variable is printed
 next to the inspect output of the value.
 
 If no string is given we run the string from the current source code
-about to be run. If the command ends ? (via an alias) and no string
-is given we will also strip off any leading 'if', 'while', 'elseif' or
-'until' in the string. 
+about to be run. If the command ends ? (via an alias) and no string is
+given we will also strip off any leading 'if', 'while', 'elseif',
+'return', 'case', 'unless', or 'until' in the string.
 
 #{NAME} 1+2  # 3
 #{NAME} @v
 #{NAME}      # Run current source-code line
-#{NAME}?     # but strips off leading 'if', 'while', 'elsif' or 'until'
+#{NAME}?     # but strips off leading 'if', 'while', ..
              # from command 
 
-See also 'set autoeval'
+See also 'set autoeval'. The command helps one predict future execution.
+See 'set buffer trace' for showing what may have already been run.
       HELP
 
   ALIASES       = %w(eval? ev? ev)
@@ -40,9 +41,20 @@ See also 'set autoeval'
   def run(args)
     if args.size == 1
       text  = @proc.current_source_text
-      text.gsub!(/^\s*(?:if|elsif|until|while)\s*/,'') if 
-        '?' == args[0][-1..-1] 
-      msg "eval: #{text}"
+      if  '?' == args[0][-1..-1] 
+        if text =~ /^\s*(?:if|elsif|unless)\s+/
+          text.gsub!(/^\s*(?:if|elsif|unless)\s+/,'') 
+          text.gsub!(/\s+then\s*$/, '')
+        elsif text =~ /^\s*(?:until|while)\s+/
+          text.gsub!(/^\s*(?:until|while)\s+/,'') 
+          text.gsub!(/\s+do\s*$/, '')
+        elsif text =~ /^\s*return\s+/
+          text.gsub!(/^\s*return\s+/,'')
+        elsif text =~ /^\s*case\s+/
+          text.gsub!(/^\s*case\s*/,'')
+        end
+        msg "eval: #{text}"
+      end
     else
       text = @proc.cmd_argstr
     end

data/processor/command/exit.rb

@@ -46,8 +46,9 @@ See also "kill" and "set confirm".'
     end
     exitrc = (args.size > 1) ? exitrc = Integer(args[1]) rescue 0 : 0
 
-    # FIXME: funnel to sort of more general finalize routine
-    @proc.dbgr.intf[-1].close
+    # FIXME: Is this the best/most general way?
+    @proc.finalize
+    @proc.dbgr.intf[-1].finalize
 
     # No graceful way to stop threads...
     # A little harsh, but for now let's go with this.

data/processor/command/help/command.txt

@@ -0,0 +1,48 @@
+overall debugger command syntax
+
+Command tokenization syntax is very simple-minded. 
+
+If a line starts with #, the command is ignored. 
+If a line starts with !, the line is eval'd. 
+
+If the command you want eval'd uses the Ruby ! initially, add that
+after the first ! or start the line with a space.
+
+Commands are split at whereever ;; appears. This process disregards
+any quotes or other symbols that have meaning in Ruby. The strings
+after the leading command string are put back on a command queue. 
+
+Within a single command, tokens are then white-space split. Again,
+this process disregards quotes or symbols that have meaning in Ruby.
+Some commands like 'eval', 'macro', and 'break' have access to the
+untokenized string entered and make use of that rather than the
+tokenized list.
+
+The leading token is first looked up in the macro table. If it is in
+the table, the expansion is replaces the current command and possibly
+other commands pushed onto a command queue.  Next, the leading token is
+looked up in the debugger alias table and the name may be substituted
+there. Finally, the leading token is looked up in the debugger alias
+table. If a match is found, the command name and arguments are
+dispatched to the command object that process the command.
+
+If the command is not found and "auto eval" is set on, then the
+command is eval'd in the context that the program is currently stopped
+at. If "auto eval" is not set on, then we display an error message
+that the entered string is "undefined".
+
+If you want irb-like command-processing, it's possible to go into an
+irb shell with the "irb" command. It is also possible to arrange going
+into an irb shell every time you enter the debugger.
+
+Examples:
+
+# This line does nothing. It is a comment
+s    # by default, this is an alias for the "step" command
+!s   # shows the value of variable step. 
+!!s  # Evaluates !s (or "not s"). The first ! is indicates evaluate.
+info program;; list # Runs two commands "info program" and "list"
+pr  "hi ;;-)"  # Syntax error since ;; splits the line and " is not closed.
+!puts "hi ;;-)" # One way to do the above.
+
+See also "alias", "irb", "set auto eval", and "set auto irb".