diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj
index d66c67b242..974165e7dc 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj
@@ -69,7 +69,7 @@
-
+
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs
index 5a9035d2b8..efdbfb9520 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs
@@ -106,10 +106,10 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
void CallStackListItemActivate(object sender, EventArgs e)
{
if (debuggedProcess.IsPaused) {
- Function f = (Function)(callStackList.SelectedItems[0].Tag);
+ StackFrame f = (StackFrame)(callStackList.SelectedItems[0].Tag);
if (f.HasSymbols) {
if (debuggedProcess.SelectedThread != null) {
- debuggedProcess.SelectedThread.SelectedFunction = f;
+ debuggedProcess.SelectedThread.SelectedStackFrame = f;
debuggedProcess.OnDebuggeeStateChanged(); // Force refresh of pads
}
} else {
@@ -131,7 +131,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
callStackList.BeginUpdate();
callStackList.Items.Clear();
if (debuggedProcess != null && debuggedProcess.SelectedThread != null && debuggedProcess.IsPaused) {
- foreach (Function f in debuggedProcess.SelectedThread.Callstack) {
+ foreach (StackFrame f in debuggedProcess.SelectedThread.Callstack) {
ListViewItem item;
if (f.HasSymbols || showExternalMethods) {
// Show the method in the list
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs
index 04f962cc44..78c0f23bf3 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs
@@ -176,8 +176,8 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
public override void RefreshPad()
{
DateTime start = Debugger.Util.HighPrecisionTimer.Now;
- if (debuggedProcess != null && debuggedProcess.SelectedFunction != null) {
- TreeViewNode.UpdateNodes(localVarList, localVarList.Root.Children, new FunctionItem(debuggedProcess.SelectedFunction).SubItems);
+ if (debuggedProcess != null && debuggedProcess.SelectedStackFrame != null) {
+ TreeViewNode.UpdateNodes(localVarList, localVarList.Root.Children, new StackFrameItem(debuggedProcess.SelectedStackFrame).SubItems);
} else {
TreeViewNode.UpdateNodes(localVarList, localVarList.Root.Children, new ListItem[0]);
}
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs
index 005b048a9f..6115857119 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs
@@ -159,11 +159,11 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
item.Text = thread.ID.ToString();
item.Tag = thread;
item.SubItems.Add(thread.Name);
- Function location = null;
+ StackFrame location = null;
if (thread.Process.IsPaused) {
- location = thread.LastFunctionWithLoadedSymbols;
+ location = thread.LastStackFrameWithLoadedSymbols;
if (location == null) {
- location = thread.LastFunction;
+ location = thread.LastStackFrame;
}
}
if (location != null) {
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
index 77c438b9f2..61b0a8d409 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
@@ -198,7 +198,7 @@ namespace ICSharpCode.SharpDevelop.Services
MessageService.ShowMessage(errorNotDebugging, "${res:XML.MainMenu.DebugMenu.StepInto}");
return;
}
- if (debuggedProcess.SelectedFunction == null || debuggedProcess.IsRunning) {
+ if (debuggedProcess.SelectedStackFrame == null || debuggedProcess.IsRunning) {
MessageService.ShowMessage(errorCannotStepNoActiveFunction, "${res:XML.MainMenu.DebugMenu.StepInto}");
} else {
debuggedProcess.StepInto();
@@ -211,7 +211,7 @@ namespace ICSharpCode.SharpDevelop.Services
MessageService.ShowMessage(errorNotDebugging, "${res:XML.MainMenu.DebugMenu.StepOver}");
return;
}
- if (debuggedProcess.SelectedFunction == null || debuggedProcess.IsRunning) {
+ if (debuggedProcess.SelectedStackFrame == null || debuggedProcess.IsRunning) {
MessageService.ShowMessage(errorCannotStepNoActiveFunction, "${res:XML.MainMenu.DebugMenu.StepOver}");
} else {
debuggedProcess.StepOver();
@@ -224,7 +224,7 @@ namespace ICSharpCode.SharpDevelop.Services
MessageService.ShowMessage(errorNotDebugging, "${res:XML.MainMenu.DebugMenu.StepOut}");
return;
}
- if (debuggedProcess.SelectedFunction == null || debuggedProcess.IsRunning) {
+ if (debuggedProcess.SelectedStackFrame == null || debuggedProcess.IsRunning) {
MessageService.ShowMessage(errorCannotStepNoActiveFunction, "${res:XML.MainMenu.DebugMenu.StepOut}");
} else {
debuggedProcess.StepOut();
@@ -289,8 +289,8 @@ namespace ICSharpCode.SharpDevelop.Services
public bool CanSetInstructionPointer(string filename, int line, int column)
{
- if (debuggedProcess != null && debuggedProcess.IsPaused && debuggedProcess.SelectedFunction != null) {
- SourcecodeSegment seg = debuggedProcess.SelectedFunction.CanSetIP(filename, line, column);
+ if (debuggedProcess != null && debuggedProcess.IsPaused && debuggedProcess.SelectedStackFrame != null) {
+ SourcecodeSegment seg = debuggedProcess.SelectedStackFrame.CanSetIP(filename, line, column);
return seg != null;
} else {
return false;
@@ -300,7 +300,7 @@ namespace ICSharpCode.SharpDevelop.Services
public bool SetInstructionPointer(string filename, int line, int column)
{
if (CanSetInstructionPointer(filename, line, column)) {
- SourcecodeSegment seg = debuggedProcess.SelectedFunction.SetIP(filename, line, column);
+ SourcecodeSegment seg = debuggedProcess.SelectedStackFrame.SetIP(filename, line, column);
return seg != null;
} else {
return false;
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Variables/FunctionItem.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Variables/StackFrameItem.cs
similarity index 88%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Variables/FunctionItem.cs
rename to src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Variables/StackFrameItem.cs
index 1b8c517afb..9951377113 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Variables/FunctionItem.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Variables/StackFrameItem.cs
@@ -42,13 +42,13 @@ using System.Collections.Generic;
namespace Debugger
{
- public class FunctionItem: ListItem
+ public class StackFrameItem: ListItem
{
- Function function;
+ StackFrame stackFrame;
- public Function Function {
+ public StackFrame StackFrame {
get {
- return function;
+ return stackFrame;
}
}
@@ -60,7 +60,7 @@ namespace Debugger
public override string Name {
get {
- return function.MethodInfo.Name;
+ return stackFrame.MethodInfo.Name;
}
}
@@ -91,17 +91,17 @@ namespace Debugger
public override IList SubItems {
get {
List ret = new List();
- foreach(Value val in function.LocalVariables) {
+ foreach(Value val in stackFrame.LocalVariables) {
ret.Add(new ValueItem(val));
}
return ret.AsReadOnly();
}
}
- public FunctionItem(Function function)
+ public StackFrameItem(StackFrame stackFrame)
{
- this.function = function;
- this.function.Process.DebuggeeStateChanged += delegate {
+ this.stackFrame = stackFrame;
+ this.stackFrame.Process.DebuggeeStateChanged += delegate {
this.OnChanged(new ListItemEventArgs(this));
};
}
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj
index f715b76f20..f935299bec 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj
@@ -203,7 +203,7 @@
-
+
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/ManagedCallback.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/ManagedCallback.cs
index 65f18be043..9e9a322baf 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/ManagedCallback.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/ManagedCallback.cs
@@ -115,14 +115,14 @@ namespace Debugger
stepper.OnStepComplete();
if (stepper.PauseWhenComplete) {
- if (process.SelectedThread.LastFunction.HasSymbols) {
+ if (process.SelectedThread.LastStackFrame.HasSymbols) {
ExitCallback_Paused();
} else {
// This can only happen when JMC is disabled (ie NET1.1 or StepOut)
if (stepper.Operation == Stepper.StepperOperation.StepOut) {
// Create new stepper and keep going
- process.TraceMessage(" - stepping out of code without symbols at " + process.SelectedThread.LastFunction.ToString());
- new Stepper(process.SelectedThread.LastFunction, "Stepper out of code without symbols").StepOut();
+ process.TraceMessage(" - stepping out of code without symbols at " + process.SelectedThread.LastStackFrame.ToString());
+ new Stepper(process.SelectedThread.LastStackFrame, "Stepper out of code without symbols").StepOut();
ExitCallback_Continue();
} else {
// NET1.1: There is extra step over stepper, just keep going
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Process-StateControl.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Process-StateControl.cs
index e09dcd56cf..b008bb1742 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Process-StateControl.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Process-StateControl.cs
@@ -62,12 +62,12 @@ namespace Debugger
}
}
- public Function SelectedFunction {
+ public StackFrame SelectedStackFrame {
get {
if (SelectedThread == null) {
return null;
} else {
- return SelectedThread.SelectedFunction;
+ return SelectedThread.SelectedStackFrame;
}
}
}
@@ -99,12 +99,12 @@ namespace Debugger
}
if (this.SelectedThread != null) {
- // Disable all steppers - do not Deactivate since function tracking still needs them
+ // Disable all steppers - do not Deactivate since stack frame tracking still needs them
foreach(Stepper s in this.SelectedThread.Steppers) {
s.PauseWhenComplete = false;
}
- this.SelectedThread.SelectedFunction = this.SelectedThread.LastFunctionWithLoadedSymbols;
+ this.SelectedThread.SelectedStackFrame = this.SelectedThread.LastStackFrameWithLoadedSymbols;
}
if (debuggeeStateChanged) {
@@ -151,17 +151,17 @@ namespace Debugger
public void StepInto()
{
- SelectedFunction.StepInto();
+ SelectedStackFrame.StepInto();
}
public void StepOver()
{
- SelectedFunction.StepOver();
+ SelectedStackFrame.StepOver();
}
public void StepOut()
{
- SelectedFunction.StepOut();
+ SelectedStackFrame.StepOut();
}
}
}
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Exception.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Exception.cs
index 2cd0ec31ef..f8eed2b5d6 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Exception.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Exception.cs
@@ -39,20 +39,20 @@ namespace Debugger
Value runtimeValue = new Value(process, corValue);
message = runtimeValue.GetMember("_message").AsString;
- if (thread.LastFunctionWithLoadedSymbols != null) {
- location = thread.LastFunctionWithLoadedSymbols.NextStatement;
+ if (thread.LastStackFrameWithLoadedSymbols != null) {
+ location = thread.LastStackFrameWithLoadedSymbols.NextStatement;
}
callstack = "";
int callstackItems = 0;
- foreach(Function function in thread.Callstack) {
+ foreach(StackFrame stackFrame in thread.Callstack) {
if (callstackItems >= 100) {
callstack += "...\n";
break;
}
- SourcecodeSegment loc = function.NextStatement;
- callstack += function.MethodInfo.Name + "()";
+ SourcecodeSegment loc = stackFrame.NextStatement;
+ callstack += stackFrame.MethodInfo.Name + "()";
if (loc != null) {
callstack += " - " + loc.SourceFullFilename + ":" + loc.StartLine + "," + loc.StartColumn;
}
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Process.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Process.cs
index 013802ce79..26330814c1 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Process.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Process.cs
@@ -232,32 +232,32 @@ namespace Debugger
public SourcecodeSegment NextStatement {
get {
- if (SelectedFunction == null || IsRunning) {
+ if (SelectedStackFrame == null || IsRunning) {
return null;
} else {
- return SelectedFunction.NextStatement;
+ return SelectedStackFrame.NextStatement;
}
}
}
public ValueCollection LocalVariables {
get {
- if (SelectedFunction == null || IsRunning) {
+ if (SelectedStackFrame == null || IsRunning) {
return ValueCollection.Empty;
} else {
- return SelectedFunction.Variables;
+ return SelectedStackFrame.Variables;
}
}
}
- /// Gets value of given name which is accessible from selected function
+ /// Gets value of given name which is accessible from selected stack frame
/// Null if not found
public Value GetValue(string name)
{
- if (SelectedFunction == null || IsRunning) {
+ if (SelectedStackFrame == null || IsRunning) {
return null;
} else {
- return SelectedFunction.GetValue(name);
+ return SelectedStackFrame.GetValue(name);
}
}
}
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Function.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/StackFrame.cs
similarity index 87%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Function.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/StackFrame.cs
index def26ab394..c7ba439ff2 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Function.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/StackFrame.cs
@@ -16,10 +16,10 @@ using Debugger.Wrappers.MetaData;
namespace Debugger
{
///
- /// A function (or also a method or frame) which is being executed on
- /// some thread. Use to obtain arguments or local variables.
+ /// A stack frame which is being executed on some thread.
+ /// Use to obtain arguments or local variables.
///
- public class Function: DebuggerObject, IExpirable
+ public class StackFrame: DebuggerObject, IExpirable
{
Process process;
@@ -35,7 +35,7 @@ namespace Debugger
Thread thread;
FrameID frameID;
- /// The process in which this function is executed
+ /// The process in which this stack frame is executed
[Debugger.Tests.Ignore]
public Process Process {
get {
@@ -48,7 +48,7 @@ namespace Debugger
get { return methodInfo; }
}
- /// A thread in which the function is executed
+ /// A thread in which the stack frame is executed
[Debugger.Tests.Ignore]
public Thread Thread {
get {
@@ -56,7 +56,7 @@ namespace Debugger
}
}
- /// True if the function has symbols defined.
+ /// True if the stack frame has symbols defined.
/// (That is has accesss to the .pdb file)
public bool HasSymbols {
get {
@@ -64,29 +64,29 @@ namespace Debugger
}
}
- /// True if function stepped out and is not longer valid.
+ /// True if stack frame stepped out and is not longer valid.
public bool HasExpired {
get {
return steppedOut || this.MethodInfo.Module.Unloaded;
}
}
- /// Occurs when function expires and is no longer usable
+ /// Occurs when stack frame expires and is no longer usable
public event EventHandler Expired;
- /// Is called when function expires and is no longer usable
+ /// Is called when stack frame expires and is no longer usable
internal protected virtual void OnExpired(EventArgs e)
{
if (!steppedOut) {
steppedOut = true;
- process.TraceMessage("Function " + this.ToString() + " expired");
+ process.TraceMessage("StackFrame " + this.ToString() + " expired");
if (Expired != null) {
Expired(this, e);
}
}
}
- internal Function(Thread thread, FrameID frameID, ICorDebugILFrame corILFrame)
+ internal StackFrame(Thread thread, FrameID frameID, ICorDebugILFrame corILFrame)
{
this.process = thread.Process;
this.thread = thread;
@@ -102,12 +102,12 @@ namespace Debugger
MethodProps methodProps = process.GetModule(corFunction.Module).MetaData.GetMethodProps(corFunction.Token);
this.methodInfo = new MethodInfo(debugType, methodProps);
- // Force some callback when function steps out so that we can expire it
- stepOutStepper = new Stepper(this, "Function Tracker");
+ // Force some callback when stack frame steps out so that we can expire it
+ stepOutStepper = new Stepper(this, "StackFrame Tracker");
stepOutStepper.StepOut();
stepOutStepper.PauseWhenComplete = false;
- process.TraceMessage("Function " + this.ToString() + " created");
+ process.TraceMessage("StackFrame " + this.ToString() + " created");
}
/// Returns diagnostic description of the frame
@@ -118,7 +118,7 @@ namespace Debugger
internal ICorDebugILFrame CorILFrame {
get {
- if (HasExpired) throw new DebuggerException("Function has expired");
+ if (HasExpired) throw new DebuggerException("StackFrame has expired");
if (corILFramePauseSession != process.PauseSession) {
CorILFrame = thread.GetFrameAt(frameID).As();
}
@@ -151,10 +151,10 @@ namespace Debugger
Step(false);
}
- /// Step out of the function
+ /// Step out of the stack frame
public void StepOut()
{
- new Stepper(this, "Function step out").StepOut();
+ new Stepper(this, "StackFrame step out").StepOut();
process.Continue();
}
@@ -172,12 +172,12 @@ namespace Debugger
}
if (stepIn) {
- new Stepper(this, "Function step in").StepIn(nextSt.StepRanges);
+ new Stepper(this, "StackFrame step in").StepIn(nextSt.StepRanges);
// Without JMC step in which ends in code without symblols is cotinued.
// The next step over ensures that we at least do step over.
new Stepper(this, "Safety step over").StepOver(nextSt.StepRanges);
} else {
- new Stepper(this, "Function step over").StepOver(nextSt.StepRanges);
+ new Stepper(this, "StackFrame step over").StepOver(nextSt.StepRanges);
}
process.Continue();
@@ -328,7 +328,7 @@ namespace Debugger
}
}
- /// Gets value of given name which is accessible from this function
+ /// Gets value of given name which is accessible from this stack frame
/// Null if not found
public Value GetValue(string name)
{
@@ -348,7 +348,7 @@ namespace Debugger
}
///
- /// Gets all variables in the lexical scope of the function.
+ /// Gets all variables in the lexical scope of the stack frame.
/// That is, arguments, local variables and varables of the containing class.
///
[Debugger.Tests.Ignore] // Accessible though others
@@ -392,7 +392,7 @@ namespace Debugger
ICorDebugValue ThisCorValue {
get {
- if (this.HasExpired) throw new CannotGetValueException("Function has expired");
+ if (this.HasExpired) throw new CannotGetValueException("StackFrame has expired");
try {
return CorILFrame.GetArgument(0);
} catch (COMException e) {
@@ -404,7 +404,7 @@ namespace Debugger
}
///
- /// Gets all accessible members of the class that defines this function.
+ /// Gets all accessible members of the class that defines this stack frame.
///
public ValueCollection ContaingClassVariables {
get {
@@ -438,10 +438,10 @@ namespace Debugger
ICorDebugValue GetArgumentCorValue(int index)
{
- if (this.HasExpired) throw new CannotGetValueException("Function has expired");
+ if (this.HasExpired) throw new CannotGetValueException("StackFrame has expired");
try {
- // Non-static functions include 'this' as first argument
+ // Non-static methods include 'this' as first argument
return CorILFrame.GetArgument((uint)(this.MethodInfo.IsStatic? index : (index + 1)));
} catch (COMException e) {
if ((uint)e.ErrorCode == 0x80131304) throw new CannotGetValueException("Unavailable in optimized code");
@@ -451,7 +451,7 @@ namespace Debugger
ValueCollection argumentsCache;
- /// Gets all arguments of the function.
+ /// Gets all arguments of the stack frame.
public ValueCollection Arguments {
get {
if (argumentsCache == null) {
@@ -476,7 +476,7 @@ namespace Debugger
ValueCollection localVariablesCache;
- /// Gets all local variables of the function.
+ /// Gets all local variables of the stack frame.
public ValueCollection LocalVariables {
get {
if (localVariablesCache == null) {
@@ -501,7 +501,7 @@ namespace Debugger
ICorDebugValue GetCorValueOfLocalVariable(ISymUnmanagedVariable symVar)
{
- if (this.HasExpired) throw new CannotGetValueException("Function has expired");
+ if (this.HasExpired) throw new CannotGetValueException("StackFrame has expired");
try {
return CorILFrame.GetLocalVariable((uint)symVar.AddressField1);
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Stepper.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Stepper.cs
index 53453b961f..0e86ccf0f4 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Stepper.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Stepper.cs
@@ -15,7 +15,7 @@ namespace Debugger
{
public enum StepperOperation {Idle, StepIn, StepOver, StepOut};
- Function function;
+ StackFrame stackFrame;
string name;
ICorDebugStepper corStepper;
StepperOperation operation = StepperOperation.Idle;
@@ -26,13 +26,13 @@ namespace Debugger
[Debugger.Tests.Ignore]
public Process Process {
get {
- return function.Process;
+ return stackFrame.Process;
}
}
- public Function Function {
+ public StackFrame StackFrame {
get {
- return function;
+ return stackFrame;
}
}
@@ -66,20 +66,20 @@ namespace Debugger
}
}
- public Stepper(Function function, string name): this(function)
+ public Stepper(StackFrame stackFrame, string name): this(stackFrame)
{
this.name = name;
}
- public Stepper(Function function)
+ public Stepper(StackFrame stackFrame)
{
- this.function = function;
+ this.stackFrame = stackFrame;
- corStepper = function.CorILFrame.CreateStepper();
+ corStepper = stackFrame.CorILFrame.CreateStepper();
JustMyCode = true;
- function.Thread.Steppers.Add(this);
+ stackFrame.Thread.Steppers.Add(this);
}
protected internal virtual void OnStepComplete() {
@@ -114,7 +114,7 @@ namespace Debugger
public override string ToString()
{
- return string.Format("{0} in {1} pause={2} \"{3}\"", Operation, Function.ToString(), PauseWhenComplete, name);
+ return string.Format("{0} in {1} pause={2} \"{3}\"", Operation, StackFrame.ToString(), PauseWhenComplete, name);
}
}
}
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Thread.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Thread.cs
index a7f3d7c567..6234e3b4b2 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Thread.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Thread.cs
@@ -7,7 +7,6 @@
using System;
using System.Collections.Generic;
-using System.Diagnostics;
using System.Runtime.InteropServices;
using System.Threading;
@@ -34,7 +33,7 @@ namespace Debugger
bool hasExpired = false;
bool nativeThreadExited = false;
- Function selectedFunction;
+ StackFrame selectedFunction;
public event EventHandler Expired;
public event EventHandler NativeThreadExited;
@@ -103,7 +102,7 @@ namespace Debugger
void Expire()
{
- Debug.Assert(!this.hasExpired);
+ System.Diagnostics.Debug.Assert(!this.hasExpired);
process.TraceMessage("Thread " + this.ID + " expired");
this.hasExpired = true;
@@ -184,10 +183,10 @@ namespace Debugger
public bool InterceptCurrentException()
{
if (!CorThread.Is()) return false; // Is the debuggee .NET 2.0?
- if (LastFunction == null) return false; // Is frame available? It is not at StackOverflow
+ if (LastStackFrame == null) return false; // Is frame available? It is not at StackOverflow
try {
- CorThread.CastTo().InterceptCurrentException(LastFunction.CorILFrame.CastTo());
+ CorThread.CastTo().InterceptCurrentException(LastStackFrame.CorILFrame.CastTo());
return true;
} catch (COMException e) {
// 0x80131C02: Cannot intercept this exception
@@ -236,13 +235,13 @@ namespace Debugger
}
}
- public IList Callstack {
+ public IList Callstack {
get {
- return new List(CallstackEnum).AsReadOnly();
+ return new List(CallstackEnum).AsReadOnly();
}
}
- IEnumerable CallstackEnum {
+ IEnumerable CallstackEnum {
get {
process.AssertPaused();
@@ -250,31 +249,31 @@ namespace Debugger
if (corChain.IsManaged == 0) continue; // Only managed ones
foreach(ICorDebugFrame corFrame in corChain.EnumerateFrames().Enumerator) {
if (corFrame.Is()) {
- Function function;
+ StackFrame stackFrame;
try {
- function = GetFunctionFromCache(new FrameID(corChain.Index, corFrame.Index), corFrame.As());
+ stackFrame = GetStackFrameFromCache(new FrameID(corChain.Index, corFrame.Index), corFrame.As());
} catch (COMException) { // TODO
continue;
};
- yield return function;
+ yield return stackFrame;
}
}
}
}
}
- Dictionary functionCache = new Dictionary();
+ Dictionary functionCache = new Dictionary();
- Function GetFunctionFromCache(FrameID frameID, ICorDebugILFrame corFrame)
+ StackFrame GetStackFrameFromCache(FrameID frameID, ICorDebugILFrame corFrame)
{
- Function function;
- if (functionCache.TryGetValue(frameID, out function) && !function.HasExpired) {
- function.CorILFrame = corFrame;
- return function;
+ StackFrame stackFrame;
+ if (functionCache.TryGetValue(frameID, out stackFrame) && !stackFrame.HasExpired) {
+ stackFrame.CorILFrame = corFrame;
+ return stackFrame;
} else {
- function = new Function(this, frameID, corFrame);
- functionCache[frameID] = function;
- return function;
+ stackFrame = new StackFrame(this, frameID, corFrame);
+ functionCache[frameID] = stackFrame;
+ return stackFrame;
}
}
@@ -326,34 +325,34 @@ namespace Debugger
ICorDebugFrame lastFrame = corFrameEnum.Next();
- // Check the token of the current function - function can change if there are multiple handlers for an event
- Function function;
+ // Check the token of the current stack frame - stack frame can change if there are multiple handlers for an event
+ StackFrame stackFrame;
if (lastFrame != null &&
- functionCache.TryGetValue(new FrameID((uint)maxChainIndex, (uint)maxFrameIndex), out function) &&
- function.MethodInfo.MetadataToken != lastFrame.FunctionToken) {
+ functionCache.TryGetValue(new FrameID((uint)maxChainIndex, (uint)maxFrameIndex), out stackFrame) &&
+ stackFrame.MethodInfo.MetadataToken != lastFrame.FunctionToken) {
functionCache.Remove(new FrameID((uint)maxChainIndex, (uint)maxFrameIndex));
- function.OnExpired(EventArgs.Empty);
+ stackFrame.OnExpired(EventArgs.Empty);
}
// Expire all functions behind the current maximum
// Multiple functions can expire at once (test case: Step out of Button1Click in simple winforms application)
- List> toBeRemoved = new List>();
- foreach(KeyValuePair kvp in functionCache) {
+ List> toBeRemoved = new List>();
+ foreach(KeyValuePair kvp in functionCache) {
if ((kvp.Key.ChainIndex > maxChainIndex) ||
(kvp.Key.ChainIndex == maxChainIndex && kvp.Key.FrameIndex > maxFrameIndex)) {
toBeRemoved.Add(kvp);
}
}
- foreach(KeyValuePair kvp in toBeRemoved){
+ foreach(KeyValuePair kvp in toBeRemoved){
functionCache.Remove(kvp.Key);
kvp.Value.OnExpired(EventArgs.Empty);
}
}
[Debugger.Tests.ToStringOnly]
- public Function SelectedFunction {
+ public StackFrame SelectedStackFrame {
get {
return selectedFunction;
}
@@ -367,11 +366,11 @@ namespace Debugger
}
[Debugger.Tests.ToStringOnly]
- public Function LastFunctionWithLoadedSymbols {
+ public StackFrame LastStackFrameWithLoadedSymbols {
get {
- foreach (Function function in CallstackEnum) {
- if (function.HasSymbols) {
- return function;
+ foreach (StackFrame stackFrame in CallstackEnum) {
+ if (stackFrame.HasSymbols) {
+ return stackFrame;
}
}
return null;
@@ -379,34 +378,34 @@ namespace Debugger
}
///
- /// Returns the most recent function on callstack.
+ /// Returns the most recent stack frame on callstack.
/// Returns null if callstack is empty.
///
[Debugger.Tests.ToStringOnly]
- public Function LastFunction {
+ public StackFrame LastStackFrame {
get {
- foreach(Function function in CallstackEnum) {
- return function;
+ foreach(StackFrame stackFrame in CallstackEnum) {
+ return stackFrame;
}
return null;
}
}
///
- /// Returns the first function that was called on thread
+ /// Returns the first stack frame that was called on thread
///
[Debugger.Tests.ToStringOnly]
- public Function FirstFunction {
+ public StackFrame FirstStackFrame {
get {
- Function first = null;
- foreach(Function function in Callstack) {
- first = function;
+ StackFrame first = null;
+ foreach(StackFrame stackFrame in Callstack) {
+ first = stackFrame;
}
return first;
}
}
- public bool IsLastFunctionNative {
+ public bool IsLastStackFrameNative {
get {
process.AssertPaused();
return corThread.ActiveChain.IsManaged == 0;
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Evals/Eval.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Evals/Eval.cs
index 90af4baae2..67e70f8f04 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Evals/Eval.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Evals/Eval.cs
@@ -175,7 +175,7 @@ namespace Debugger
process.AssertPaused();
try {
- if (targetThread.IsLastFunctionNative) {
+ if (targetThread.IsLastStackFrameNative) {
throw new EvalSetupException("Can not evaluate because native frame is on top of stack");
}
if (!targetThread.IsAtSafePoint) {
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Expressions/EvaluateAstVisitor.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Expressions/EvaluateAstVisitor.cs
index 2297a42a99..3fb14fa285 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Expressions/EvaluateAstVisitor.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Expressions/EvaluateAstVisitor.cs
@@ -17,13 +17,13 @@ namespace Debugger
{
class EvaluateAstVisitor: NotImplementedAstVisitor
{
- Function stackFrame;
+ StackFrame stackFrame;
- public Function StackFrame {
+ public StackFrame StackFrame {
get { return stackFrame; }
}
- public EvaluateAstVisitor(Function stackFrame)
+ public EvaluateAstVisitor(StackFrame stackFrame)
{
this.stackFrame = stackFrame;
}
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Expressions/Expression.Create.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Expressions/Expression.Create.cs
index 5ffb23bf77..68699fa838 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Expressions/Expression.Create.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Expressions/Expression.Create.cs
@@ -45,22 +45,22 @@ namespace Debugger
);
}
- public static ExpressionCollection StackFrameVariables(Function stackFrame)
+ public static ExpressionCollection StackFrameVariables(StackFrame stackFrame)
{
throw new NotImplementedException();
}
- public static Expression StackFrameThis(Function stackFrame)
+ public static Expression StackFrameThis(StackFrame stackFrame)
{
throw new NotImplementedException();
}
- public static ExpressionCollection StackFrameParameters(Function stackFrame)
+ public static ExpressionCollection StackFrameParameters(StackFrame stackFrame)
{
throw new NotImplementedException();
}
- public static ExpressionCollection StackFrameLocalVariables(Function stackFrame)
+ public static ExpressionCollection StackFrameLocalVariables(StackFrame stackFrame)
{
throw new NotImplementedException();
}
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Expressions/Expression.Evaluate.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Expressions/Expression.Evaluate.cs
index bbd30eaecd..c9bc01ed7c 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Expressions/Expression.Evaluate.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Expressions/Expression.Evaluate.cs
@@ -22,7 +22,7 @@ namespace Debugger
return Evaluate(null);
}
- Value Evaluate(Function stackFrame)
+ Value Evaluate(StackFrame stackFrame)
{
EvaluateAstVisitor astVisitor = new EvaluateAstVisitor(stackFrame);
return (Value)this.AbstractSynatxTree.AcceptVisitor(astVisitor, null);
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value.Object.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value.Object.cs
index 18d197c9fc..f25949fade 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value.Object.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value.Object.cs
@@ -64,10 +64,10 @@ namespace Debugger
ICorDebugFrame curFrame = null;
if (objectInstance.Process.IsPaused &&
objectInstance.Process.SelectedThread != null &&
- objectInstance.Process.SelectedThread.LastFunction != null &&
- objectInstance.Process.SelectedThread.LastFunction.CorILFrame != null) {
+ objectInstance.Process.SelectedThread.LastStackFrame != null &&
+ objectInstance.Process.SelectedThread.LastStackFrame.CorILFrame != null) {
- curFrame = objectInstance.Process.SelectedThread.LastFunction.CorILFrame.CastTo();
+ curFrame = objectInstance.Process.SelectedThread.LastStackFrame.CorILFrame.CastTo();
}
try {
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTests.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTests.cs
index c6fe9036c3..576228770c 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTests.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTests.cs
@@ -96,39 +96,39 @@ namespace Debugger.Tests
{
StartTest("Stepping");
WaitForPause();
- ObjectDump("SelectedFunction", process.SelectedFunction);
+ ObjectDump("SelectedStackFrame", process.SelectedStackFrame);
process.StepOver(); // Debugger.Break
WaitForPause();
- ObjectDump("SelectedFunction", process.SelectedFunction);
+ ObjectDump("SelectedStackFrame", process.SelectedStackFrame);
process.StepOver(); // Debug.WriteLine 1
WaitForPause();
- ObjectDump("SelectedFunction", process.SelectedFunction);
+ ObjectDump("SelectedStackFrame", process.SelectedStackFrame);
process.StepInto(); // Method Sub
WaitForPause();
- ObjectDump("SelectedFunction", process.SelectedFunction);
+ ObjectDump("SelectedStackFrame", process.SelectedStackFrame);
process.StepInto(); // '{'
WaitForPause();
- ObjectDump("SelectedFunction", process.SelectedFunction);
+ ObjectDump("SelectedStackFrame", process.SelectedStackFrame);
process.StepInto(); // Debug.WriteLine 2
WaitForPause();
- ObjectDump("SelectedFunction", process.SelectedFunction);
+ ObjectDump("SelectedStackFrame", process.SelectedStackFrame);
process.StepOut(); // Method Sub
WaitForPause();
- ObjectDump("SelectedFunction", process.SelectedFunction);
+ ObjectDump("SelectedStackFrame", process.SelectedStackFrame);
process.StepOver(); // Method Sub
WaitForPause();
- ObjectDump("SelectedFunction", process.SelectedFunction);
+ ObjectDump("SelectedStackFrame", process.SelectedStackFrame);
process.StepOver(); // Method Sub2
WaitForPause();
- ObjectDump("SelectedFunction", process.SelectedFunction);
+ ObjectDump("SelectedStackFrame", process.SelectedStackFrame);
process.Continue();
process.WaitForExit();
@@ -164,7 +164,7 @@ namespace Debugger.Tests
for(int i = 0; i < 6; i++) {
process.Continue();
WaitForPause();
- ObjectDump("SelectedFunction", process.SelectedFunction);
+ ObjectDump("SelectedStackFrame", process.SelectedStackFrame);
}
process.Continue();
@@ -177,7 +177,7 @@ namespace Debugger.Tests
{
StartTest("FunctionLocalVariables");
WaitForPause();
- ObjectDump("SelectedFunction", process.SelectedFunction);
+ ObjectDump("SelectedStackFrame", process.SelectedStackFrame);
process.Continue();
process.WaitForExit();
@@ -187,27 +187,27 @@ namespace Debugger.Tests
[Test]
public void FunctionLifetime()
{
- Function function;
+ StackFrame stackFrame;
StartTest("FunctionLifetime");
WaitForPause();
- function = process.SelectedFunction;
- ObjectDump("Function", function);
+ stackFrame = process.SelectedStackFrame;
+ ObjectDump("StackFrame", stackFrame);
process.Continue(); // Go to the SubFunction
WaitForPause();
- ObjectDump("Function", function);
- ObjectDump("SubFunction", process.SelectedFunction);
+ ObjectDump("StackFrame", stackFrame);
+ ObjectDump("SubStackFrame", process.SelectedStackFrame);
process.Continue(); // Go back to Function
WaitForPause();
- Assert.AreEqual(function, process.SelectedFunction);
- ObjectDump("Function", function);
+ Assert.AreEqual(stackFrame, process.SelectedStackFrame);
+ ObjectDump("StackFrame", stackFrame);
process.Continue(); // Setp out of function
WaitForPause();
- ObjectDump("Main", process.SelectedFunction);
- ObjectDump("Function", function);
+ ObjectDump("Main", process.SelectedStackFrame);
+ ObjectDump("StackFrame", stackFrame);
process.Continue();
process.WaitForExit();
@@ -224,16 +224,16 @@ namespace Debugger.Tests
StartTest("FunctionVariablesLifetime"); // 1 - Enter program
WaitForPause();
- argument = process.SelectedFunction.GetArgument(0);
- local = process.SelectedFunction.LocalVariables["local"];
- @class = process.SelectedFunction.ContaingClassVariables["class"];
+ argument = process.SelectedStackFrame.GetArgument(0);
+ local = process.SelectedStackFrame.LocalVariables["local"];
+ @class = process.SelectedStackFrame.ContaingClassVariables["class"];
ObjectDump("argument", argument);
ObjectDump("local", local);
ObjectDump("@class", @class);
process.Continue(); // 2 - Go to the SubFunction
WaitForPause();
- localInSubFunction = process.SelectedFunction.LocalVariables["localInSubFunction"];
+ localInSubFunction = process.SelectedStackFrame.LocalVariables["localInSubFunction"];
ObjectDump("argument", argument);
ObjectDump("local", local);
ObjectDump("@class", @class);
@@ -252,7 +252,7 @@ namespace Debugger.Tests
ObjectDump("local", local);
ObjectDump("@class", @class);
ObjectDump("localInSubFunction", @localInSubFunction);
- localInSubFunction = process.SelectedFunction.LocalVariables["localInSubFunction"];
+ localInSubFunction = process.SelectedStackFrame.LocalVariables["localInSubFunction"];
ObjectDump("localInSubFunction(new)", @localInSubFunction);
process.Continue(); // 5 - Setp out of both functions
@@ -272,7 +272,7 @@ namespace Debugger.Tests
{
StartTest("ArrayValue");
WaitForPause();
- Value array = process.SelectedFunction.LocalVariables["array"];
+ Value array = process.SelectedStackFrame.LocalVariables["array"];
ObjectDump("array", array);
ObjectDump("array elements", array.GetArrayElements());
@@ -288,7 +288,7 @@ namespace Debugger.Tests
StartTest("ObjectValue");
WaitForPause();
- val = process.SelectedFunction.LocalVariables["val"];
+ val = process.SelectedStackFrame.LocalVariables["val"];
ObjectDump("val", val);
ObjectDump("val members", val.GetMembers(null, Debugger.BindingFlags.All));
//ObjectDump("typeof(val)", val.Type);
@@ -382,9 +382,9 @@ namespace Debugger.Tests
StartTest("SetIP");
WaitForPause();
- Assert.IsNotNull(process.SelectedFunction.CanSetIP("SetIP.cs", 16, 0));
- Assert.IsNull(process.SelectedFunction.CanSetIP("SetIP.cs", 100, 0));
- process.SelectedFunction.SetIP("SetIP.cs", 16, 0);
+ Assert.IsNotNull(process.SelectedStackFrame.CanSetIP("SetIP.cs", 16, 0));
+ Assert.IsNull(process.SelectedStackFrame.CanSetIP("SetIP.cs", 100, 0));
+ process.SelectedStackFrame.SetIP("SetIP.cs", 16, 0);
process.Continue();
WaitForPause();
Assert.AreEqual("1\r\n1\r\n", log);
@@ -399,8 +399,8 @@ namespace Debugger.Tests
{
StartTest("GenericDictionary");
WaitForPause();
- ObjectDump("dict", process.SelectedFunction.LocalVariables["dict"]);
- ObjectDump("dict members", process.SelectedFunction.LocalVariables["dict"].GetMembers(null, BindingFlags.All));
+ ObjectDump("dict", process.SelectedStackFrame.LocalVariables["dict"]);
+ ObjectDump("dict members", process.SelectedStackFrame.LocalVariables["dict"].GetMembers(null, BindingFlags.All));
process.Continue();
process.WaitForExit();
@@ -433,10 +433,10 @@ namespace Debugger.Tests
StartTest("Expressions");
WaitForPause();
- ObjectDump("Variables", process.SelectedFunction.Variables);
- ObjectDump("array", process.SelectedFunction.Variables["array"].GetArrayElements());
- ObjectDump("array2", process.SelectedFunction.Variables["array2"].GetArrayElements());
- ObjectDump("this", process.SelectedFunction.ThisValue.GetMembers());
+ ObjectDump("Variables", process.SelectedStackFrame.Variables);
+ ObjectDump("array", process.SelectedStackFrame.Variables["array"].GetArrayElements());
+ ObjectDump("array2", process.SelectedStackFrame.Variables["array2"].GetArrayElements());
+ ObjectDump("this", process.SelectedStackFrame.ThisValue.GetMembers());
process.Continue();
process.WaitForExit();
@@ -450,7 +450,7 @@ namespace Debugger.Tests
for(int i = 0; i < 8; i++) {
WaitForPause();
- ObjectDump("SelectedFunction", process.SelectedFunction);
+ ObjectDump("SelectedStackFrame", process.SelectedStackFrame);
process.Continue();
}
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Callstack.xml b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Callstack.xml
index 52fffd5acb..7ad3f432b7 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Callstack.xml
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Callstack.xml
@@ -9,7 +9,7 @@
3
-
+
True
@@ -44,8 +44,8 @@
-
-
+
+
True
@@ -80,8 +80,8 @@
-
-
+
+
False
@@ -116,7 +116,7 @@
-
+
@@ -125,7 +125,7 @@
2
-
+
True
@@ -160,8 +160,8 @@
-
-
+
+
False
@@ -196,7 +196,7 @@
-
+
@@ -205,7 +205,7 @@
1
-
+
False
@@ -240,7 +240,7 @@
-
+
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionArgumentVariables.xml b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionArgumentVariables.xml
index 7dab911521..7776f8586b 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionArgumentVariables.xml
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionArgumentVariables.xml
@@ -6,8 +6,8 @@
FunctionArgumentVariables.exe
Break
Break
-
-
+
+
True
@@ -88,11 +88,11 @@
-
+
Break
-
-
+
+
True
@@ -173,11 +173,11 @@
-
+
Break
-
-
+
+
True
@@ -258,11 +258,11 @@
-
+
Break
-
-
+
+
True
@@ -359,11 +359,11 @@
-
+
Break
-
-
+
+
True
@@ -460,11 +460,11 @@
-
+
Break
-
-
+
+
True
@@ -561,7 +561,7 @@
-
+
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLifetime.xml b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLifetime.xml
index fa13dac52e..24df51a97f 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLifetime.xml
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLifetime.xml
@@ -5,8 +5,8 @@
mscorlib.dll
FunctionLifetime.exe
Break
-
-
+
+
True
@@ -57,11 +57,11 @@
-
+
Break
-
-
+
+
True
@@ -112,10 +112,10 @@
-
+
-
-
+
+
True
@@ -150,11 +150,11 @@
-
+
Break
-
-
+
+
True
@@ -205,11 +205,11 @@
-
+
Break
-
+
False
@@ -244,10 +244,10 @@
-
+
-
-
+
+
True
@@ -261,7 +261,7 @@
True
True
-
+
@@ -269,7 +269,7 @@
-
+
1
@@ -298,7 +298,7 @@
-
+
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLocalVariables.xml b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLocalVariables.xml
index 2c80d1aa9a..9e865f5b2b 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLocalVariables.xml
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLocalVariables.xml
@@ -5,8 +5,8 @@
mscorlib.dll
FunctionLocalVariables.exe
Break
-
-
+
+
False
@@ -117,7 +117,7 @@
-
+
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Generics.xml b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Generics.xml
index a0ca9d99f7..f504b9c258 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Generics.xml
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Generics.xml
@@ -5,8 +5,8 @@
mscorlib.dll
Generics.exe
Break
-
-
+
+
False
@@ -88,11 +88,11 @@
-
+
Break
-
-
+
+
False
@@ -174,11 +174,11 @@
-
+
Break
-
-
+
+
False
@@ -244,11 +244,11 @@
-
+
Break
-
-
+
+
False
@@ -314,11 +314,11 @@
-
+
Break
-
-
+
+
False
@@ -379,11 +379,11 @@
-
+
Break
-
-
+
+
False
@@ -444,11 +444,11 @@
-
+
Break
-
-
+
+
False
@@ -514,11 +514,11 @@
-
+
Break
-
-
+
+
False
@@ -584,7 +584,7 @@
-
+
Break
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Stepping.xml b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Stepping.xml
index 2cd0c91ae0..55eb4c4023 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Stepping.xml
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Stepping.xml
@@ -6,8 +6,8 @@
Stepping.exe
System.dll
Break
-
-
+
+
False
@@ -42,11 +42,11 @@
-
+
StepComplete
-
-
+
+
False
@@ -81,14 +81,14 @@
-
+
System.Configuration.dll
System.Xml.dll
1\r\n
StepComplete
-
-
+
+
False
@@ -123,11 +123,11 @@
-
+
StepComplete
-
-
+
+
False
@@ -162,11 +162,11 @@
-
+
StepComplete
-
-
+
+
False
@@ -201,12 +201,12 @@
-
+
2\r\n
StepComplete
-
-
+
+
False
@@ -241,13 +241,13 @@
-
+
3\r\n
4\r\n
StepComplete
-
-
+
+
False
@@ -282,11 +282,11 @@
-
+
StepComplete
-
-
+
+
False
@@ -321,12 +321,12 @@
-
+
5\r\n
StepComplete
-
-
+
+
False
@@ -361,7 +361,7 @@
-
+