Author: martin
Date: 2006-01-19 13:29:12 -0500 (Thu, 19 Jan 2006)
New Revision: 55796
Modified:
trunk/debugger/backends/SingleSteppingEngine.cs
trunk/debugger/test/TestBreakpoint.cs
trunk/debugger/test/mono-debugger.tests/TestBreakpoint.exp
Log:
Some more 'finish' work.
Modified: trunk/debugger/backends/SingleSteppingEngine.cs
===================================================================
--- trunk/debugger/backends/SingleSteppingEngine.cs 2006-01-19 17:32:07 UTC
(rev 55795)
+++ trunk/debugger/backends/SingleSteppingEngine.cs 2006-01-19 18:29:12 UTC
(rev 55796)
@@ -2069,16 +2069,9 @@
{
Report.Debug (DebugFlags.SSE, "{0} resuming operation
{1}", sse, this);
- switch (StepMode) {
- case StepMode.NativeInstruction:
- case StepMode.NextInstruction:
- case StepMode.NextLine:
- if (sse.temp_breakpoint_id != 0) {
- sse.inferior.Continue ();
- return true;
- }
-
- break;
+ if (sse.temp_breakpoint_id != 0) {
+ sse.inferior.Continue ();
+ return true;
}
return !Step (sse, false);
@@ -2319,6 +2312,18 @@
sse.do_step_native ();
}
+ protected override bool ResumeOperation (SingleSteppingEngine
sse)
+ {
+ Report.Debug (DebugFlags.SSE, "{0} resuming operation
{1}", sse, this);
+
+ if (sse.temp_breakpoint_id != 0) {
+ sse.inferior.Continue ();
+ return true;
+ }
+
+ return !DoProcessEvent (sse, sse.inferior);
+ }
+
protected override bool DoProcessEvent (SingleSteppingEngine
sse,
Inferior inferior)
{
Modified: trunk/debugger/test/TestBreakpoint.cs
===================================================================
--- trunk/debugger/test/TestBreakpoint.cs 2006-01-19 17:32:07 UTC (rev
55795)
+++ trunk/debugger/test/TestBreakpoint.cs 2006-01-19 18:29:12 UTC (rev
55796)
@@ -98,6 +98,7 @@
hello.Test ();
Y.Hello ();
hello.Test ();
+ Y.Test (hello);
Console.WriteLine (hello);
}
}
@@ -108,4 +109,9 @@
{
Console.WriteLine ("Hello World");
}
+
+ public static void Test (Martin.Baulig.Hello hello)
+ {
+ hello.Test ();
+ }
}
Modified: trunk/debugger/test/mono-debugger.tests/TestBreakpoint.exp
===================================================================
--- trunk/debugger/test/mono-debugger.tests/TestBreakpoint.exp 2006-01-19
17:32:07 UTC (rev 55795)
+++ trunk/debugger/test/mono-debugger.tests/TestBreakpoint.exp 2006-01-19
18:29:12 UTC (rev 55796)
@@ -11,6 +11,7 @@
set line_roman_baths 86
set line_main 97
set line_main_2 99
+set line_y_test 115
set file $srcdir/TestBreakpoint.cs
set porta_nigra_url "http://de.wikipedia.org/wiki/Bild:Porta_Nigra_Trier.jpg"
@@ -98,6 +99,15 @@
mdb_expect_line $roman_baths_url
mdb_expect_stopped 0 "X.Main()" $file [expr $line_main_2 + 2]
+mdb_send "step"
+mdb_expect_stopped 0 "Y.Test(Martin.Baulig.Hello)" $file $line_y_test
+mdb_send "finish"
+mdb_expect_line $porta_nigra_url
+mdb_expect_line $city_center_url
+mdb_expect_line "Irish Pub"
+mdb_expect_line $roman_baths_url
+mdb_expect_stopped 0 "X.Main()" $file [expr $line_main_2 + 3]
+
mdb_send "continue"
mdb_expect_line "Martin.Baulig.Hello"
mdb_expect_line "Process @4 terminated normally."
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches