trepanning 1.93.35 → 2.15.33

data/test/data/debug.cmd

@@ -0,0 +1,8 @@
+# ***************************************************
+# Test debug command. To be used with gcd.rb
+# ***************************************************
+next
+debug gcd(2,2)
+info locals
+quit!
+quit!

data/test/data/debug.right

@@ -0,0 +1,13 @@
+line (gcd.rb:4 @2)
+def gcd(a, b)
+line (gcd.rb:18 @15)
+a, b = ARGV[0..1].map {|arg| arg.to_i}
+ENTERING NESTED DEBUGGER
+------------------------
+call (gcd.rb:6 @2)
+if a > b
+Local variables for METHOD Object#gcd(a, b):
+--------------------------------------------
+2: b = 2 (Fixnum)
+3: a = 2 (Fixnum)
+trepan: That's all, folks...

data/test/data/debugger-stop.right

@@ -1,6 +1,8 @@
--- debugger-stop.rb:14 @1955)
+line debugger-stop.rb:14 @1955)
+require_relative '../../lib/trepanning'
+line debugger-stop.rb:10 @1954
 Foo::five
 (trepan): Program stop event: line; PC offset 100 <top debugger-stop.rb>
--- debugger-stop.rb:10 @1954)
-5
-trepan: That's all, folks...
+Program terminated, type q to quit
+post-mortem
+(trepan:pm): trepan: That's all, folks...

data/test/data/fname-with-blank.cmd

@@ -3,4 +3,4 @@
 # *******************************************************************
 set basename off
 continue
-
+quit!

data/test/data/fname-with-blank.right

@@ -1 +1,6 @@
 -> (fname with blank.rb:1 @0)
+puts "Ha!"
+basename is off.
+Ha!
+Program terminated, type q to quit
+trepan: That's all, folks...

data/test/data/pc.cmd

@@ -0,0 +1,8 @@
+# ********************************************************
+# This tests the set register pc command.
+# ********************************************************
+info reg pc
+set register pc 13
+step
+info reg pc
+quit!

data/test/data/pc.right

@@ -0,0 +1,10 @@
+-> (null.rb:1 @0)
+va = 1
+VM pc = 2
+Old value was: 2
+New value is: 13
+line (assign.rb:5 @19)
+vd = 4
+VM pc = 19
+D=> 3
+trepan: That's all, folks...

data/test/data/quit.right

@@ -1 +1,3 @@
--> (null.rb:1 @0)
+line (null.rb:2 @2)
+x = 1
+trepan: That's all, folks...

data/test/data/trace.cmd

@@ -1,6 +1,6 @@
 # ***************************************************
-# This file is not used, but is here to make it 
+# This file is not used, but is here to make it
 # easy for the helper function.
 # ***************************************************
 continue
-
+quit!

data/test/data/trace.right

@@ -1,37 +1,58 @@
--- (gcd.rb:4 @2)
+line (gcd.rb:4 @2)
 def gcd(a, b)
--- (gcd.rb:18 @2)
+c_return (address 0xdeadbeef via gcd.rb:4)
+R=> nil
+def gcd(a, b)
+c_call (address 0xdeadbeef via gcd.rb:18)
+a, b = ARGV[0..1].map {|arg| arg.to_i}
+c_call (address 0xdeadbeef via gcd.rb:18)
+a, b = ARGV[0..1].map {|arg| arg.to_i}
+line (gcd.rb:18 @4)
 a, b = ARGV[0..1].map {|arg| arg.to_i}
--- (gcd.rb:18 @2)
+c_return (address 0xdeadbeef via gcd.rb:18)
+R=> 3
 a, b = ARGV[0..1].map {|arg| arg.to_i}
-<= (gcd.rb:18 @11)
+b_call (gcd.rb:18 @2)
 a, b = ARGV[0..1].map {|arg| arg.to_i}
--- (gcd.rb:19 @45)
+c_call (address 0xdeadbeef via gcd.rb:18)
+a, b = ARGV[0..1].map {|arg| arg.to_i}
+b_return (gcd.rb:18 @10)
+R=> 5
+a, b = ARGV[0..1].map {|arg| arg.to_i}
+line (gcd.rb:19 @37)
 puts "The GCD of %d and %d is %d" % [a, b, gcd(a, b)]
--- (gcd.rb:6 @4)
+line (gcd.rb:6 @4)
 if a > b
--- (gcd.rb:12 @40)
+line (gcd.rb:12 @39)
 if a == 1 or b-a == 0
-METHOD Object#gcd(a, b)
--> (gcd.rb:4 @2)
-def gcd(a, b)
--- (gcd.rb:10 @24)
+call (gcd.rb:6 @2)
+if a > b
+line (gcd.rb:10 @24)
 return nil if a <= 0
--- (gcd.rb:15 @71)
+line (gcd.rb:15 @68)
 return gcd(b-a, a)
--- (gcd.rb:6 @4)
+line (gcd.rb:6 @4)
 if a > b
--- (gcd.rb:12 @40)
+line (gcd.rb:12 @39)
 if a == 1 or b-a == 0
-<- (gcd.rb:13 @68)
+return (gcd.rb:13 @65)
 R=> 1
 return a
-<- (gcd.rb:16 @88)
+return (gcd.rb:16 @81)
 R=> 1
 end
-<- (gcd.rb:16 @88)
+c_return (address 0xdeadbeef via gcd.rb:19)
+R=> "The GCD of 3 and 5 is 1"
+puts "The GCD of %d and %d is %d" % [a, b, gcd(a, b)]
+c_call (address 0xdeadbeef via gcd.rb:19)
+puts "The GCD of %d and %d is %d" % [a, b, gcd(a, b)]
+The GCD of 3 and 5 is 1c_return (address 0xdeadbeef via gcd.rb:19)
+R=> 23
+puts "The GCD of %d and %d is %d" % [a, b, gcd(a, b)]
+
+c_return (address 0xdeadbeef via gcd.rb:19)
 R=> 1
-end
-The GCD of 3 and 5 is 1
-<= (gcd.rb:19 @73)
+puts "The GCD of %d and %d is %d" % [a, b, gcd(a, b)]
+c_return (address 0xdeadbeef via gcd.rb:19)
+R=> nil
 puts "The GCD of %d and %d is %d" % [a, b, gcd(a, b)]

data/test/example/assign.rb

@@ -0,0 +1,6 @@
+# Some simple assignment statements.
+va = 1
+vb = 2
+va = 3
+vd = 4
+ve = 5

data/test/functional/fn_helper.rb

@@ -1,14 +1,8 @@
-require 'thread_frame'
-require 'trace'
+require 'rubyvm-frame'
 require_relative '../../lib/trepanning'
 require_relative '../../io/string_array'
 
 module FnTestHelper
-  include Trace
-
-  # Synchronous events without C frames or instructions
-  TEST_STEP_EVENT_MASK = LINE_EVENT_MASK | CLASS_EVENT_MASK | CALL_EVENT_MASK |
-    RETURN_EVENT_MASK  
 
   # Common setup to create a debugger with String Array I/O attached
   def strarray_setup(debugger_cmds, insn_stepping=false)
@@ -16,8 +10,8 @@ module FnTestHelper
     stringout              = Trepan::StringArrayOutput.open
     d_opts                 = {:input  => stringin, :output => stringout,
                               :nx     => true}
-    d_opts[:core_opts]     = {:step_events => TEST_STEP_EVENT_MASK}
-    d_opts[:core_opts][:step_events] ||= INSN_EVENT_MASK if insn_stepping
+    d_opts[:core_opts]     = {}
+    # d_opts[:core_opts][:step_events] ||= INSN_EVENT_MASK if insn_stepping
     d                      = Trepan.new(d_opts)
 
     # Remove vm and switch from unmaskable events to increase predictability
@@ -37,7 +31,7 @@ module FnTestHelper
 
   # Return the caller's line number
   def get_lineno
-    RubyVM::Frame.current.prev.source_location[0]
+    RubyVM::Frame.get(1).source_location[0]
   end
 
   def compare_output(right, d, debugger_cmds)
@@ -73,27 +67,27 @@ module FnTestHelper
      s =~ TREPAN_PROMPT ? nil : s
     end.compact unless show_prompt
 
-    # Remove debugger location lines. 
-    # For example: 
+    # Remove debugger location lines.
+    # For example:
     #   -- (/src/external-vcs/trepan/tmp/gcd.rb:4)
     # becomes:
-    #   -- 
+    #   --
     a2 = a.map do |s|
       s =~ TREPAN_LOC ? s.gsub(/\(.+:\d+( @\d+)?\)\n/, '').chomp : s.chomp
     end
 
-    # Canonicalize breakpoint messages. 
-    # For example: 
+    # Canonicalize breakpoint messages.
+    # For example:
     #   Breakpoint 1 set at VM offset 10
     # becomes :
     #  Breakpoint 1 set at VM offset 55
     a3 = a2.map do |s|
-      s.gsub(/^Breakpoint (\d+) set at VM offset (\d+)/, 
+      s.gsub(/^Breakpoint (\d+) set at VM offset (\d+)/,
              'Breakpoint \1 set at VM offset 55')
     end
 
     #	line 14 in file test/functional/test-break.rb.
-    # becomes 
+    # becomes
     #   line 55 of file foo.rb
     a4 = a3.map do |s|
       s.gsub(/line (\d+) in file .+/, 'line 55 in file foo.rb')

data/test/functional/test-break-long.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-require 'trace'
+require_relative '../../app/core'
 require_relative 'fn_helper'
 require_relative '../../app/breakpoint'
 
@@ -16,40 +16,40 @@ class TestBreakLong < Test::Unit::TestCase
 
     # See that we can stop at a breakpoint
     cmds = ['set basename on',
-            'break ' + (__LINE__ + 7).to_s, 
+            'break ' + (__LINE__ + 7).to_s,
             'continue']
     d = strarray_setup(cmds)
-    d.start
+    d.start(true)
     ########### b1 ###############
     x = 5
     y = 6
     z = 7
     ##############################
     d.stop
-    out = ['-- ',
+    out = ['line ',
            'x = 5',
            'basename is on.',
  "Breakpoint 1 set at VM offset 55 of instruction sequence \"test_break_same_level\",
 \tline 55 in file foo.rb",
-           'xx ',
+           'brkpt ',
            'z = 7']
     compare_output(out, d, cmds)
 
     # Try a disabling the breakpoint
     cmds = ['set basename on',
-            'break ' + (__LINE__ + 8).to_s, 
-            'break ' + (__LINE__ + 8).to_s, 
+            'break ' + (__LINE__ + 8).to_s,
+            'break ' + (__LINE__ + 8).to_s,
             'disable 1',
             'continue']
     d = strarray_setup(cmds)
-    d.start
+    d.start(true)
     ########### b2 ###############
     x = 7
     y = 8
     z = 8+1
     ##############################
     d.stop
-    out = ['-- ',
+    out = ['line ',
            'x = 7',
            "basename is on.",
            "Breakpoint 1 set at VM offset 55 of instruction sequence \"test_break_same_level\",
@@ -57,16 +57,16 @@ class TestBreakLong < Test::Unit::TestCase
            "Breakpoint 2 set at VM offset 55 of instruction sequence \"test_break_same_level\",
 \tline 55 in file foo.rb",
            "Breakpoint 1 disabled.",
-           'xx ',
+           'brkpt ',
            'z = 8+1']
     compare_output(out, d, cmds)
 
     # Stepping after a breakpoint should not stay at same location.
     cmds = ['set basename on',
-            'continue ' + (__LINE__ + 8).to_s, 
+            'continue ' + (__LINE__ + 8).to_s,
             'continue']
     dbg = strarray_setup(cmds)
-    dbg.start
+    dbg.start(true)
     ########### b3 ###############
     a = 1
     b = 2
@@ -75,13 +75,12 @@ class TestBreakLong < Test::Unit::TestCase
     e = 5
     ##############################
     dbg.stop
-    out = ['-- ',
+    out = ['line ',
            'a = 1',
            'basename is on.',
-           'xx ',
+           'brkpt ',
            'd = 4' ]
     compare_output(out, dbg, cmds)
   end
-    
-end
 
+end

data/test/functional/test-break.rb

@@ -15,12 +15,12 @@ class TestBreak < Test::Unit::TestCase
     cmds = (cmds_pat % [line, line+11, line+14]).split(/\n/)
     d = strarray_setup(cmds)
     ##############################
-    def foo      # line +  4  
+    def foo      # line +  4
       a = 5      # line +  5
       b = 6      # line +  6
     end          # line +  7
-    1.times do   # line +  8 
-      d.start    # line +  9
+    1.times do   # line +  8
+      d.start(true)# line +  9
       1.times do # line + 10
         x = 11   # line + 11
         foo      # line + 12
@@ -29,7 +29,7 @@ class TestBreak < Test::Unit::TestCase
     end
     ##############################
     d.stop # ({:remove => true})
-    out = ["-- ",
+    out = ["line ",
            "1.times do # line + 10",
            "Breakpoint 1 set at VM offset 55 of instruction sequence \"test_line_only_break\",
 \tline 55 in file foo.rb",
@@ -37,13 +37,11 @@ class TestBreak < Test::Unit::TestCase
 \tline 55 in file foo.rb",
            "Breakpoint 3 set at VM offset 55 of instruction sequence \"block in test_line_only_break\",
 \tline 55 in file foo.rb",
-           "xx ",
+           "brkpt ",
            "x = 11   # line + 11",
-           "xx ",
+           "brkpt ",
            "c = 14     # line + 14"]
     compare_output(out, d, cmds)
   end
 
 end
-
-

data/test/functional/test-condition.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-require 'trace'
 require_relative 'fn_helper'
 require_relative '../../app/breakpoint'
 
@@ -13,18 +12,18 @@ class TestBreak < Test::Unit::TestCase
 
     # See that we can next with parameter which is the same as 'next 1'
     cmds = ['set basename on',
-            'break ' + (__LINE__ + 7).to_s, 
+            'break ' + (__LINE__ + 7).to_s,
             'condition 1 x < 5',
             'continue']
     d = strarray_setup(cmds)
-    d.start
+    d.start(true)
     ########### b1 ###############
     x = 6
     y = 7
     z = 8
     ##############################
     d.stop
-    out = ['-- ',
+    out = ['line ',
            'x = 6',
            'basename is on.',
            "Breakpoint 1 set at VM offset 55 of instruction sequence \"test_condition\",
@@ -33,26 +32,25 @@ class TestBreak < Test::Unit::TestCase
 
     # Try a condition that fails
     cmds = ['set basename on',
-            'break ' + (__LINE__ + 7).to_s, 
+            'break ' + (__LINE__ + 7).to_s,
             'condition 1 x > 5',
             'continue']
     d = strarray_setup(cmds)
-    d.start
+    d.start(true)
     ########### b2 ###############
     x = 6
     y = 7
     z = 8
     ##############################
     d.stop
-    out = ["-- ",
+    out = ["line ",
            "x = 6",
            "basename is on.",
            "Breakpoint 1 set at VM offset 55 of instruction sequence \"test_condition\",
 \tline 55 in file foo.rb",
-           "xx ",
+           "brkpt ",
            "y = 7"]
     compare_output(out, d, cmds)
   end
-    
-end
 
+end

data/test/functional/test-debugger-call-bug.rb

@@ -4,28 +4,27 @@ require_relative '../../lib/trepanning'
 
 class TestTrepanCallBug < Test::Unit::TestCase
 
-  def test_debugger_call_bug
-    $calls = []
-    mydbgr = nil
-    2.times do
-      x = 1
-      mydbgr = Trepan.new()
-      mydbgr.core.processor.define_singleton_method(:process_commands) do
-        |frame|
-        # p [frame.source_container, frame.source_location, @core.event].flatten
-        $calls << [frame.source_container, frame.source_location].flatten
-      end
-      mydbgr.debugger
-      y = 2
+    def define_singleton_method_by_proc(obj, name, block)
+        metaclass = class << obj; self; end
+        metaclass.send(:define_method, name, block)
     end
-    mydbgr.stop  
-    assert_equal true, $calls.size > 0, $calls
-  end
-  
-end
-
-
-
-
 
+    def test_debugger_call_bug
+        $calls = []
+        mydbgr = nil
+        2.times do
+            x = 1
+            mydbgr = Trepan.new
+            core = mydbgr.core
+            def core.event_processor_tp(tp)
+                frame = tp.frame
+                $calls << [frame.source_container, frame.source_location].flatten
+            end
+            mydbgr.debugger
+            y = 2
+        end
+        mydbgr.stop
+        assert_equal true, $calls.size > 0, $calls
+    end
 
+end