Author: martin
Date: 2006-04-17 21:50:04 -0400 (Mon, 17 Apr 2006)
New Revision: 59567
Modified:
trunk/debugger/ChangeLog
trunk/debugger/arch/Architecture.cs
trunk/debugger/arch/CoreFile.cs
trunk/debugger/backends/SingleSteppingEngine.cs
trunk/debugger/backends/TargetMemoryAccess.cs
trunk/debugger/classes/Backtrace.cs
trunk/debugger/classes/Method.cs
trunk/debugger/classes/StackFrame.cs
Log:
2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
* arch/Architecture.cs (Architecture): Make this internal.
Modified: trunk/debugger/ChangeLog
===================================================================
--- trunk/debugger/ChangeLog 2006-04-18 01:44:01 UTC (rev 59566)
+++ trunk/debugger/ChangeLog 2006-04-18 01:50:04 UTC (rev 59567)
@@ -1,5 +1,9 @@
2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
+ * arch/Architecture.cs (Architecture): Make this internal.
+
+2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
+
* backends/TargetMemoryAccess.cs
(TargetMemoryAccess.Architecture): Make this internal.
Modified: trunk/debugger/arch/Architecture.cs
===================================================================
--- trunk/debugger/arch/Architecture.cs 2006-04-18 01:44:01 UTC (rev 59566)
+++ trunk/debugger/arch/Architecture.cs 2006-04-18 01:50:04 UTC (rev 59567)
@@ -6,7 +6,7 @@
// <summary>
// Architecture-dependent interface.
// </summary>
- public abstract class Architecture : MarshalByRefObject
+ internal abstract class Architecture : MarshalByRefObject
{
protected readonly Process process;
protected readonly TargetInfo TargetInfo;
Modified: trunk/debugger/arch/CoreFile.cs
===================================================================
--- trunk/debugger/arch/CoreFile.cs 2006-04-18 01:44:01 UTC (rev 59566)
+++ trunk/debugger/arch/CoreFile.cs 2006-04-18 01:50:04 UTC (rev 59567)
@@ -192,7 +192,7 @@
current_backtrace = new Backtrace
(CurrentFrame);
current_backtrace.GetBacktrace (
- Thread, Architecture,
TargetAddress.Null, max_frames);
+ this, TargetAddress.Null, max_frames);
return current_backtrace;
}
Modified: trunk/debugger/backends/SingleSteppingEngine.cs
===================================================================
--- trunk/debugger/backends/SingleSteppingEngine.cs 2006-04-18 01:44:01 UTC
(rev 59566)
+++ trunk/debugger/backends/SingleSteppingEngine.cs 2006-04-18 01:50:04 UTC
(rev 59567)
@@ -1501,12 +1501,12 @@
foreach (StackFrame rti_frame in
callback_stack) {
current_backtrace.GetBacktrace (
- thread, arch,
rti_frame.StackPointer, max_frames);
+ this, rti_frame.StackPointer,
max_frames);
current_backtrace.AddFrame (rti_frame);
}
- current_backtrace.GetBacktrace (thread, arch,
until, max_frames);
+ current_backtrace.GetBacktrace (this, until,
max_frames);
return current_backtrace;
});
Modified: trunk/debugger/backends/TargetMemoryAccess.cs
===================================================================
--- trunk/debugger/backends/TargetMemoryAccess.cs 2006-04-18 01:44:01 UTC
(rev 59566)
+++ trunk/debugger/backends/TargetMemoryAccess.cs 2006-04-18 01:50:04 UTC
(rev 59567)
@@ -1,6 +1,6 @@
using System;
-namespace Mono.Debugger.Backends
+namespace Mono.Debugger
{
public abstract class TargetMemoryAccess : MarshalByRefObject
{
Modified: trunk/debugger/classes/Backtrace.cs
===================================================================
--- trunk/debugger/classes/Backtrace.cs 2006-04-18 01:44:01 UTC (rev 59566)
+++ trunk/debugger/classes/Backtrace.cs 2006-04-18 01:50:04 UTC (rev 59567)
@@ -51,21 +51,20 @@
}
}
- public void GetBacktrace (Thread target, Architecture arch,
- TargetAddress until, int max_frames)
+ public void GetBacktrace (TargetMemoryAccess target,
TargetAddress until,
+ int max_frames)
{
- while (TryUnwind (target, arch, until)) {
+ while (TryUnwind (target, until)) {
if ((max_frames != -1) && (frames.Count >
max_frames))
break;
}
}
- public bool TryUnwind (Thread target, Architecture arch,
- TargetAddress until)
+ public bool TryUnwind (TargetMemoryAccess target, TargetAddress
until)
{
StackFrame new_frame = null;
try {
- new_frame = last_frame.UnwindStack (target,
arch);
+ new_frame = last_frame.UnwindStack (target);
} catch (TargetException) {
}
Modified: trunk/debugger/classes/Method.cs
===================================================================
--- trunk/debugger/classes/Method.cs 2006-04-18 01:44:01 UTC (rev 59566)
+++ trunk/debugger/classes/Method.cs 2006-04-18 01:50:04 UTC (rev 59567)
@@ -121,8 +121,7 @@
this.wrapper_type = wrapper_type;
}
- internal StackFrame UnwindStack (StackFrame frame,
TargetMemoryAccess memory,
- Architecture arch)
+ internal StackFrame UnwindStack (StackFrame frame,
TargetMemoryAccess memory)
{
if (!IsLoaded)
return null;
@@ -142,7 +141,7 @@
int offset = (int) (frame.TargetAddress - StartAddress);
byte[] prologue = memory.ReadBuffer (StartAddress,
prologue_size);
- return arch.UnwindStack (frame, memory, prologue,
offset);
+ return memory.Architecture.UnwindStack (frame, memory,
prologue, offset);
}
//
Modified: trunk/debugger/classes/StackFrame.cs
===================================================================
--- trunk/debugger/classes/StackFrame.cs 2006-04-18 01:44:01 UTC (rev
59566)
+++ trunk/debugger/classes/StackFrame.cs 2006-04-18 01:50:04 UTC (rev
59567)
@@ -114,7 +114,7 @@
Register[] regs;
bool from_current_frame;
- public Registers (Architecture arch)
+ internal Registers (Architecture arch)
{
regs = new Register [arch.CountRegisters];
for (int i = 0; i < regs.Length; i++)
@@ -123,7 +123,7 @@
arch.RegisterSizes [i], false, 0);
}
- public Registers (Architecture arch, long[] values)
+ internal Registers (Architecture arch, long[] values)
{
regs = new Register [arch.CountRegisters];
if (regs.Length != values.Length)
@@ -135,7 +135,7 @@
from_current_frame = true;
}
- public Registers (Registers old_regs)
+ internal Registers (Registers old_regs)
{
regs = new Register [old_regs.regs.Length];
for (int i = 0; i < regs.Length; i++)
@@ -320,7 +320,7 @@
}
}
- internal StackFrame UnwindStack (TargetMemoryAccess memory,
Architecture arch)
+ internal StackFrame UnwindStack (TargetMemoryAccess memory)
{
if (parent_frame != null)
return parent_frame;
@@ -328,7 +328,7 @@
StackFrame new_frame = null;
if (method != null) {
try {
- new_frame = method.UnwindStack (this,
memory, arch);
+ new_frame = method.UnwindStack (this,
memory);
} catch (TargetException) {
}
@@ -346,7 +346,7 @@
return new_frame;
}
- return arch.UnwindStack (this, memory, null, 0);
+ return memory.Architecture.UnwindStack (this, memory,
null, 0);
}
public override string ToString ()
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
