Browse Source

Renamed LastStackFrame to MostRecentStackFrame

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2881 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
David Srbecký 18 years ago
parent
commit
bc962c71d7
  1. 4
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs
  2. 6
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/ManagedCallback.cs
  3. 2
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Process-StateControl.cs
  4. 2
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Evals/Eval.cs
  5. 4
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Exception.cs
  6. 3
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/StackFrame.cs
  7. 14
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Thread.cs
  8. 6
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/Value.Object.cs
  9. 2
      src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/StackOverflow.cs

4
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs

@ -161,9 +161,9 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -161,9 +161,9 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
item.SubItems.Add(thread.Name);
StackFrame location = null;
if (thread.Process.IsPaused) {
location = thread.LastStackFrameWithLoadedSymbols;
location = thread.MostRecentStackFrameWithLoadedSymbols;
if (location == null) {
location = thread.LastStackFrame;
location = thread.MostRecentStackFrame;
}
}
if (location != null) {

6
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/ManagedCallback.cs

@ -110,14 +110,14 @@ namespace Debugger @@ -110,14 +110,14 @@ namespace Debugger
stepper.OnStepComplete();
if (stepper.PauseWhenComplete) {
if (process.SelectedThread.LastStackFrame.HasSymbols) {
if (process.SelectedThread.MostRecentStackFrame.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.LastStackFrame.ToString());
new Stepper(process.SelectedThread.LastStackFrame, "Stepper out of code without symbols").StepOut();
process.TraceMessage(" - stepping out of code without symbols at " + process.SelectedThread.MostRecentStackFrame.ToString());
new Stepper(process.SelectedThread.MostRecentStackFrame, "Stepper out of code without symbols").StepOut();
ExitCallback_Continue();
} else {
// NET1.1: There is extra step over stepper, just keep going

2
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Process-StateControl.cs

@ -104,7 +104,7 @@ namespace Debugger @@ -104,7 +104,7 @@ namespace Debugger
s.PauseWhenComplete = false;
}
this.SelectedThread.SelectedStackFrame = this.SelectedThread.LastStackFrameWithLoadedSymbols;
this.SelectedThread.SelectedStackFrame = this.SelectedThread.MostRecentStackFrameWithLoadedSymbols;
}
if (debuggeeStateChanged) {

2
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Evals/Eval.cs

@ -195,7 +195,7 @@ namespace Debugger @@ -195,7 +195,7 @@ namespace Debugger
process.AssertPaused();
try {
if (targetThread.IsLastStackFrameNative) {
if (targetThread.IsMostRecentStackFrameNative) {
throw new EvalSetupException("Can not evaluate because native frame is on top of stack");
}
if (!targetThread.IsAtSafePoint) {

4
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Exception.cs

@ -39,8 +39,8 @@ namespace Debugger @@ -39,8 +39,8 @@ namespace Debugger
Value runtimeValue = new Value(process, corValue);
message = runtimeValue.GetMemberValue("_message").AsString;
if (thread.LastStackFrameWithLoadedSymbols != null) {
location = thread.LastStackFrameWithLoadedSymbols.NextStatement;
if (thread.MostRecentStackFrameWithLoadedSymbols != null) {
location = thread.MostRecentStackFrameWithLoadedSymbols.NextStatement;
}
callstack = "";

3
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/StackFrame.cs

@ -54,7 +54,8 @@ namespace Debugger @@ -54,7 +54,8 @@ namespace Debugger
}
/// <summary>
/// The depth of this frame. First frame has depth of 0.
/// The depth of this frame. Most recent stack frame has depth 0.
/// The frame that called it has depth 1 and so on.
/// </summary>
public int Depth {
get { return depth; }

14
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Thread.cs

@ -183,10 +183,10 @@ namespace Debugger @@ -183,10 +183,10 @@ namespace Debugger
public bool InterceptCurrentException()
{
if (!CorThread.Is<ICorDebugThread2>()) return false; // Is the debuggee .NET 2.0?
if (LastStackFrame == null) return false; // Is frame available? It is not at StackOverflow
if (MostRecentStackFrame == null) return false; // Is frame available? It is not at StackOverflow
try {
CorThread.CastTo<ICorDebugThread2>().InterceptCurrentException(LastStackFrame.CorILFrame.CastTo<ICorDebugFrame>());
CorThread.CastTo<ICorDebugThread2>().InterceptCurrentException(MostRecentStackFrame.CorILFrame.CastTo<ICorDebugFrame>());
return true;
} catch (COMException e) {
// 0x80131C02: Cannot intercept this exception
@ -279,7 +279,7 @@ namespace Debugger @@ -279,7 +279,7 @@ namespace Debugger
}
}
public StackFrame LastStackFrameWithLoadedSymbols {
public StackFrame MostRecentStackFrameWithLoadedSymbols {
get {
foreach (StackFrame stackFrame in CallstackEnum) {
if (stackFrame.HasSymbols) {
@ -291,10 +291,10 @@ namespace Debugger @@ -291,10 +291,10 @@ namespace Debugger
}
/// <summary>
/// Returns the most recent stack frame on callstack.
/// Returns the most recent stack frame (the one that is currently executing).
/// Returns null if callstack is empty.
/// </summary>
public StackFrame LastStackFrame {
public StackFrame MostRecentStackFrame {
get {
foreach(StackFrame stackFrame in CallstackEnum) {
return stackFrame;
@ -306,7 +306,7 @@ namespace Debugger @@ -306,7 +306,7 @@ namespace Debugger
/// <summary>
/// Returns the first stack frame that was called on thread
/// </summary>
public StackFrame FirstStackFrame {
public StackFrame OldestStackFrame {
get {
StackFrame first = null;
foreach(StackFrame stackFrame in Callstack) {
@ -316,7 +316,7 @@ namespace Debugger @@ -316,7 +316,7 @@ namespace Debugger
}
}
public bool IsLastStackFrameNative {
public bool IsMostRecentStackFrameNative {
get {
process.AssertPaused();
return corThread.ActiveChain.IsManaged == 0;

6
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/Value.Object.cs

@ -113,10 +113,10 @@ namespace Debugger @@ -113,10 +113,10 @@ namespace Debugger
ICorDebugFrame curFrame = null;
if (fieldInfo.Process.IsPaused &&
fieldInfo.Process.SelectedThread != null &&
fieldInfo.Process.SelectedThread.LastStackFrame != null &&
fieldInfo.Process.SelectedThread.LastStackFrame.CorILFrame != null) {
fieldInfo.Process.SelectedThread.MostRecentStackFrame != null &&
fieldInfo.Process.SelectedThread.MostRecentStackFrame.CorILFrame != null) {
curFrame = fieldInfo.Process.SelectedThread.LastStackFrame.CorILFrame.CastTo<ICorDebugFrame>();
curFrame = fieldInfo.Process.SelectedThread.MostRecentStackFrame.CorILFrame.CastTo<ICorDebugFrame>();
}
try {

2
src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/StackOverflow.cs

@ -36,7 +36,7 @@ namespace Debugger.Tests { @@ -36,7 +36,7 @@ namespace Debugger.Tests {
process.Continue();
WaitForPause();
ObjectDump("LastStackFrame", process.SelectedThread.LastStackFrame);
ObjectDump("LastStackFrame", process.SelectedThread.MostRecentStackFrame);
CheckXmlOutput();
}

Loading…
Cancel
Save