From db8f9c2d4c23a52060dcbe460df2811bf2a25d62 Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Wed, 13 Nov 2002 21:01:51 +0000 Subject: [PATCH] Fix for the stepping problem if the selected stack frame is not the topmost one. --- debug/org.eclipse.cdt.debug.core/ChangeLog | 4 ++++ .../eclipse/cdt/debug/internal/core/model/CStackFrame.java | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog index b01a4bc85be..42731052357 100644 --- a/debug/org.eclipse.cdt.debug.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.core/ChangeLog @@ -1,3 +1,7 @@ +2002-11-13 Mikhail Khodjaiants + Fix for the stepping problem if the selected stack frame is not the topmost one. + * CStackFrame.java: The 'stepToFrame' method is temporary replaced by corresponding step method. + 2002-11-13 * schema/CDebugger.exsd * src/org/eclipse/cdt/debug/core/ICDebugConfiguration.java diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java index 495e9028d36..7371a940b6f 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java @@ -331,7 +331,8 @@ public class CStackFrame extends CDebugElement } else { - ((CThread)getThread()).stepToFrame( this ); +// ((CThread)getThread()).stepToFrame( this ); + getThread().stepOver(); // for now } } @@ -350,6 +351,7 @@ public class CStackFrame extends CDebugElement } else { +/* List frames = ((CThread)getThread()).computeStackFrames(); int index = frames.indexOf( this ); if ( index >= 0 && index < frames.size() - 1 ) @@ -357,6 +359,8 @@ public class CStackFrame extends CDebugElement IStackFrame nextFrame = (IStackFrame)frames.get( index + 1 ); ((CThread)getThread()).stepToFrame( nextFrame ); } +*/ + getThread().stepReturn(); // for now } }