Author: martin
Date: 2006-04-17 21:36:05 -0400 (Mon, 17 Apr 2006)
New Revision: 59564
Added:
trunk/debugger/backends/TargetMemoryAccess.cs
Removed:
trunk/debugger/interfaces/ITargetMemoryAccess.cs
Modified:
trunk/debugger/ChangeLog
trunk/debugger/arch/Architecture.cs
trunk/debugger/arch/Architecture_I386.cs
trunk/debugger/arch/Architecture_X86_64.cs
trunk/debugger/arch/Bfd.cs
trunk/debugger/arch/BfdDisassembler.cs
trunk/debugger/arch/CoreFile.cs
trunk/debugger/arch/DwarfFrameReader.cs
trunk/debugger/arch/DwarfReader.cs
trunk/debugger/backends/ILanguageBackend.cs
trunk/debugger/backends/Inferior.cs
trunk/debugger/backends/Process.cs
trunk/debugger/backends/TargetAccess.cs
trunk/debugger/backends/Thread.cs
trunk/debugger/classes/Method.cs
trunk/debugger/classes/Module.cs
trunk/debugger/classes/SourceLocation.cs
trunk/debugger/classes/StackFrame.cs
trunk/debugger/languages/mono/MonoLanguageBackend.cs
trunk/debugger/languages/mono/MonoSymbolFile.cs
Log:
2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
* interfaces/ITargetMemoryAccess.cs: Removed.
(ITargetMemoryAccess): Removed.
* backends/TargetMemoryAccess.cs: New file.
(TargetMemoryAccess): New public abstract class.
Modified: trunk/debugger/ChangeLog
===================================================================
--- trunk/debugger/ChangeLog 2006-04-18 01:27:44 UTC (rev 59563)
+++ trunk/debugger/ChangeLog 2006-04-18 01:36:05 UTC (rev 59564)
@@ -1,5 +1,13 @@
2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
+ * interfaces/ITargetMemoryAccess.cs: Removed.
+ (ITargetMemoryAccess): Removed.
+
+ * backends/TargetMemoryAccess.cs: New file.
+ (TargetMemoryAccess): New public abstract class.
+
+2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
+
* interfaces/ITargetMemoryAccess.cs
(ITargetInfo): Removed.
Modified: trunk/debugger/arch/Architecture.cs
===================================================================
--- trunk/debugger/arch/Architecture.cs 2006-04-18 01:27:44 UTC (rev 59563)
+++ trunk/debugger/arch/Architecture.cs 2006-04-18 01:36:05 UTC (rev 59564)
@@ -79,7 +79,7 @@
// Returns whether the instruction at target address @address
is a `ret'
// instruction.
// </summary>
- internal abstract bool IsRetInstruction (ITargetMemoryAccess
memory,
+ internal abstract bool IsRetInstruction (TargetMemoryAccess
memory,
TargetAddress address);
// <summary>
@@ -90,7 +90,7 @@
// instructions. This can be used to set a breakpoint
immediately after
// the function.
// </summary>
- internal abstract TargetAddress GetCallTarget
(ITargetMemoryAccess target,
+ internal abstract TargetAddress GetCallTarget
(TargetMemoryAccess target,
TargetAddress
address,
out int
insn_size);
@@ -102,7 +102,7 @@
// instructions. This can be used to set a breakpoint
immediately after
// the jump.
// </summary>
- internal abstract TargetAddress GetJumpTarget
(ITargetMemoryAccess target,
+ internal abstract TargetAddress GetJumpTarget
(TargetMemoryAccess target,
TargetAddress
address,
out int
insn_size);
@@ -111,7 +111,7 @@
// If it's a trampoline, return the address of the
corresponding method's
// code. For JIT trampolines, this should do a JIT
compilation of the method.
// </summary>
- internal abstract TargetAddress GetTrampoline
(ITargetMemoryAccess target,
+ internal abstract TargetAddress GetTrampoline
(TargetMemoryAccess target,
TargetAddress
address,
TargetAddress
generic_trampoline_address);
@@ -122,11 +122,11 @@
internal abstract Registers CopyRegisters (Registers regs);
internal abstract StackFrame UnwindStack (StackFrame last_frame,
- ITargetMemoryAccess
memory,
+ TargetMemoryAccess
memory,
byte[] code, int
offset);
internal abstract StackFrame TrySpecialUnwind (StackFrame
last_frame,
-
ITargetMemoryAccess memory);
+
TargetMemoryAccess memory);
internal abstract StackFrame CreateFrame (Thread thread,
Registers regs);
Modified: trunk/debugger/arch/Architecture_I386.cs
===================================================================
--- trunk/debugger/arch/Architecture_I386.cs 2006-04-18 01:27:44 UTC (rev
59563)
+++ trunk/debugger/arch/Architecture_I386.cs 2006-04-18 01:36:05 UTC (rev
59564)
@@ -35,13 +35,13 @@
: base (process, info)
{ }
- internal override bool IsRetInstruction (ITargetMemoryAccess
memory,
+ internal override bool IsRetInstruction (TargetMemoryAccess
memory,
TargetAddress address)
{
return memory.ReadByte (address) == 0xc3;
}
- internal override TargetAddress GetCallTarget
(ITargetMemoryAccess target,
+ internal override TargetAddress GetCallTarget
(TargetMemoryAccess target,
TargetAddress
address,
out int
insn_size)
{
@@ -136,7 +136,7 @@
return vtable_addr;
}
- internal override TargetAddress GetJumpTarget
(ITargetMemoryAccess target,
+ internal override TargetAddress GetJumpTarget
(TargetMemoryAccess target,
TargetAddress
address,
out int
insn_size)
{
@@ -161,7 +161,7 @@
return TargetAddress.Null;
}
- internal override TargetAddress GetTrampoline
(ITargetMemoryAccess target,
+ internal override TargetAddress GetTrampoline
(TargetMemoryAccess target,
TargetAddress
location,
TargetAddress
trampoline_address)
{
@@ -363,7 +363,7 @@
get { return 50; }
}
- StackFrame unwind_method (StackFrame frame, ITargetMemoryAccess
memory, byte[] code,
+ StackFrame unwind_method (StackFrame frame, TargetMemoryAccess
memory, byte[] code,
int pos, int offset)
{
Registers old_regs = frame.Registers;
@@ -428,7 +428,7 @@
return CreateFrame (frame.Thread, new_eip, new_esp,
new_ebp, regs);
}
- StackFrame read_prologue (StackFrame frame, ITargetMemoryAccess
memory,
+ StackFrame read_prologue (StackFrame frame, TargetMemoryAccess
memory,
byte[] code, int offset)
{
int length = code.Length;
@@ -509,7 +509,7 @@
return regs;
}
- StackFrame try_pthread_cond_timedwait (StackFrame frame,
ITargetMemoryAccess memory)
+ StackFrame try_pthread_cond_timedwait (StackFrame frame,
TargetMemoryAccess memory)
{
Symbol name = frame.Name;
@@ -567,7 +567,7 @@
return CreateFrame (frame.Thread, eip, esp, ebp, regs);
}
- StackFrame try_syscall_trampoline (StackFrame frame,
ITargetMemoryAccess memory)
+ StackFrame try_syscall_trampoline (StackFrame frame,
TargetMemoryAccess memory)
{
/*
* This is a hack for system call trampolines on
NPTL-enabled glibc's.
@@ -590,7 +590,7 @@
return CreateFrame (frame.Thread, new_eip, new_esp,
new_ebp, regs);
}
- StackFrame do_hacks (StackFrame frame, ITargetMemoryAccess
memory)
+ StackFrame do_hacks (StackFrame frame, TargetMemoryAccess
memory)
{
StackFrame new_frame;
try {
@@ -612,7 +612,7 @@
return null;
}
- internal override StackFrame UnwindStack (StackFrame frame,
ITargetMemoryAccess memory,
+ internal override StackFrame UnwindStack (StackFrame frame,
TargetMemoryAccess memory,
byte[] code, int
offset)
{
if ((code != null) && (code.Length > 3))
@@ -643,7 +643,7 @@
}
internal override StackFrame TrySpecialUnwind (StackFrame
last_frame,
-
ITargetMemoryAccess memory)
+
TargetMemoryAccess memory)
{
return null;
}
Modified: trunk/debugger/arch/Architecture_X86_64.cs
===================================================================
--- trunk/debugger/arch/Architecture_X86_64.cs 2006-04-18 01:27:44 UTC (rev
59563)
+++ trunk/debugger/arch/Architecture_X86_64.cs 2006-04-18 01:36:05 UTC (rev
59564)
@@ -46,13 +46,13 @@
: base (process, info)
{ }
- internal override bool IsRetInstruction (ITargetMemoryAccess
memory,
+ internal override bool IsRetInstruction (TargetMemoryAccess
memory,
TargetAddress address)
{
return memory.ReadByte (address) == 0xc3;
}
- internal override TargetAddress GetCallTarget
(ITargetMemoryAccess target,
+ internal override TargetAddress GetCallTarget
(TargetMemoryAccess target,
TargetAddress
address,
out int
insn_size)
{
@@ -178,7 +178,7 @@
return vtable_addr;
}
- internal override TargetAddress GetJumpTarget
(ITargetMemoryAccess target,
+ internal override TargetAddress GetJumpTarget
(TargetMemoryAccess target,
TargetAddress
address,
out int
insn_size)
{
@@ -204,7 +204,7 @@
return TargetAddress.Null;
}
- internal override TargetAddress GetTrampoline
(ITargetMemoryAccess target,
+ internal override TargetAddress GetTrampoline
(TargetMemoryAccess target,
TargetAddress
location,
TargetAddress
trampoline_address)
{
@@ -463,7 +463,7 @@
return regs;
}
- StackFrame unwind_method (StackFrame frame, ITargetMemoryAccess
memory, byte[] code,
+ StackFrame unwind_method (StackFrame frame, TargetMemoryAccess
memory, byte[] code,
int pos, int offset)
{
Registers old_regs = frame.Registers;
@@ -570,7 +570,7 @@
return CreateFrame (frame.Thread, new_rip, new_rsp,
new_rbp, regs);
}
- StackFrame read_prologue (StackFrame frame, ITargetMemoryAccess
memory,
+ StackFrame read_prologue (StackFrame frame, TargetMemoryAccess
memory,
byte[] code, int offset)
{
int length = code.Length;
@@ -644,7 +644,7 @@
return unwind_method (frame, memory, code, pos, offset);
}
- internal override StackFrame UnwindStack (StackFrame frame,
ITargetMemoryAccess memory,
+ internal override StackFrame UnwindStack (StackFrame frame,
TargetMemoryAccess memory,
byte[] code, int
offset)
{
if ((code != null) && (code.Length > 4))
@@ -670,7 +670,7 @@
return CreateFrame (frame.Thread, new_rip, new_rsp,
new_rbp, regs);
}
- StackFrame try_unwind_sigreturn (StackFrame frame,
ITargetMemoryAccess memory)
+ StackFrame try_unwind_sigreturn (StackFrame frame,
TargetMemoryAccess memory)
{
byte[] data = memory.ReadMemory (frame.TargetAddress,
9).Contents;
@@ -725,7 +725,7 @@
}
internal override StackFrame TrySpecialUnwind (StackFrame frame,
-
ITargetMemoryAccess memory)
+
TargetMemoryAccess memory)
{
StackFrame new_frame = try_unwind_sigreturn (frame,
memory);
if (new_frame != null)
Modified: trunk/debugger/arch/Bfd.cs
===================================================================
--- trunk/debugger/arch/Bfd.cs 2006-04-18 01:27:44 UTC (rev 59563)
+++ trunk/debugger/arch/Bfd.cs 2006-04-18 01:36:05 UTC (rev 59564)
@@ -325,7 +325,7 @@
return false;
}
- bool read_dynamic_info (Inferior inferior, ITargetMemoryAccess
target)
+ bool read_dynamic_info (Inferior inferior, TargetMemoryAccess
target)
{
if (initialized)
return has_shlib_info;
@@ -380,7 +380,7 @@
return true;
}
- public void UpdateSharedLibraryInfo (Inferior inferior,
ITargetMemoryAccess target)
+ public void UpdateSharedLibraryInfo (Inferior inferior,
TargetMemoryAccess target)
{
// This fails if it's a statically linked executable.
try {
@@ -394,7 +394,7 @@
do_update_shlib_info (inferior, target);
}
- void do_update_shlib_info (Inferior inferior,
ITargetMemoryAccess target)
+ void do_update_shlib_info (Inferior inferior,
TargetMemoryAccess target)
{
bool first = true;
TargetAddress map = first_link_map;
@@ -672,7 +672,7 @@
}
}
- internal BfdDisassembler GetDisassembler (ITargetMemoryAccess
memory)
+ internal BfdDisassembler GetDisassembler (TargetMemoryAccess
memory)
{
IntPtr dis = disassembler (bfd);
@@ -946,14 +946,14 @@
}
}
- TargetAddress ILanguageBackend.GetTrampolineAddress
(ITargetMemoryAccess memory,
+ TargetAddress ILanguageBackend.GetTrampolineAddress
(TargetMemoryAccess memory,
TargetAddress address,
out bool
is_start)
{
return GetTrampoline (memory, address, out is_start);
}
- SourceMethod ILanguageBackend.GetTrampoline
(ITargetMemoryAccess memory,
+ SourceMethod ILanguageBackend.GetTrampoline (TargetMemoryAccess
memory,
TargetAddress
address)
{
return null;
@@ -963,7 +963,7 @@
TargetAddress data, long
arg)
{ }
- public TargetAddress GetTrampoline (ITargetMemoryAccess memory,
+ public TargetAddress GetTrampoline (TargetMemoryAccess memory,
TargetAddress address, out
bool is_start)
{
if (!has_got || (address < plt_start) || (address >
plt_end)) {
@@ -989,7 +989,7 @@
return memory.ReadAddress (got_start + 2 *
info.TargetAddressSize);
}
- internal override StackFrame UnwindStack (StackFrame frame,
ITargetMemoryAccess memory)
+ internal override StackFrame UnwindStack (StackFrame frame,
TargetMemoryAccess memory)
{
if ((frame.TargetAddress < StartAddress) ||
(frame.TargetAddress > EndAddress))
return null;
Modified: trunk/debugger/arch/BfdDisassembler.cs
===================================================================
--- trunk/debugger/arch/BfdDisassembler.cs 2006-04-18 01:27:44 UTC (rev
59563)
+++ trunk/debugger/arch/BfdDisassembler.cs 2006-04-18 01:36:05 UTC (rev
59564)
@@ -14,7 +14,7 @@
IntPtr dis;
IntPtr info;
- ITargetMemoryAccess memory;
+ TargetMemoryAccess memory;
SymbolTableManager symtab_manager;
[DllImport("monodebuggerserver")]
@@ -31,7 +31,7 @@
PrintAddressHandler print_handler;
internal BfdDisassembler (SymbolTableManager symtab_manager,
- ITargetMemoryAccess memory, IntPtr
dis, IntPtr info)
+ TargetMemoryAccess memory, IntPtr
dis, IntPtr info)
{
this.dis = dis;
this.info = info;
Modified: trunk/debugger/arch/CoreFile.cs
===================================================================
--- trunk/debugger/arch/CoreFile.cs 2006-04-18 01:27:44 UTC (rev 59563)
+++ trunk/debugger/arch/CoreFile.cs 2006-04-18 01:36:05 UTC (rev 59564)
@@ -241,7 +241,7 @@
}
//
- // ITargetMemoryAccess
+ // TargetMemoryAccess
//
public override int TargetIntegerSize {
Modified: trunk/debugger/arch/DwarfFrameReader.cs
===================================================================
--- trunk/debugger/arch/DwarfFrameReader.cs 2006-04-18 01:27:44 UTC (rev
59563)
+++ trunk/debugger/arch/DwarfFrameReader.cs 2006-04-18 01:36:05 UTC (rev
59564)
@@ -32,7 +32,7 @@
return cie_list;
}
- public StackFrame UnwindStack (StackFrame frame,
ITargetMemoryAccess target,
+ public StackFrame UnwindStack (StackFrame frame,
TargetMemoryAccess target,
Architecture arch)
{
if (frame.TargetAddress.IsNull)
@@ -292,7 +292,7 @@
return value;
}
- void GetValue (ITargetMemoryAccess target, Registers
regs,
+ void GetValue (TargetMemoryAccess target, Registers
regs,
TargetAddress cfa, int reg, Column
column)
{
switch (column.State) {
@@ -320,7 +320,7 @@
}
}
- void SetRegisters (Registers regs, ITargetMemoryAccess
target,
+ void SetRegisters (Registers regs, TargetMemoryAccess
target,
Architecture arch, Column[] columns)
{
long cfa_addr = GetRegisterValue (regs, 1,
columns [0]);
@@ -332,7 +332,7 @@
}
}
- public StackFrame Unwind (StackFrame frame,
ITargetMemoryAccess target,
+ public StackFrame Unwind (StackFrame frame,
TargetMemoryAccess target,
Architecture arch)
{
Registers old_regs = frame.Registers;
Modified: trunk/debugger/arch/DwarfReader.cs
===================================================================
--- trunk/debugger/arch/DwarfReader.cs 2006-04-18 01:27:44 UTC (rev 59563)
+++ trunk/debugger/arch/DwarfReader.cs 2006-04-18 01:36:05 UTC (rev 59564)
@@ -2513,7 +2513,7 @@
return true;
}
- internal override SourceMethod GetTrampoline
(ITargetMemoryAccess memory, TargetAddress address)
+ internal override SourceMethod GetTrampoline
(TargetMemoryAccess memory, TargetAddress address)
{
return ((ILanguageBackend)
subprog.dwarf.bfd).GetTrampoline (memory, address);
}
Modified: trunk/debugger/backends/ILanguageBackend.cs
===================================================================
--- trunk/debugger/backends/ILanguageBackend.cs 2006-04-18 01:27:44 UTC (rev
59563)
+++ trunk/debugger/backends/ILanguageBackend.cs 2006-04-18 01:36:05 UTC (rev
59564)
@@ -49,11 +49,11 @@
get;
}
- TargetAddress GetTrampolineAddress (ITargetMemoryAccess memory,
+ TargetAddress GetTrampolineAddress (TargetMemoryAccess memory,
TargetAddress address,
out bool is_start);
- SourceMethod GetTrampoline (ITargetMemoryAccess memory,
+ SourceMethod GetTrampoline (TargetMemoryAccess memory,
TargetAddress address);
void Notification (Inferior inferior, NotificationType type,
Modified: trunk/debugger/backends/Inferior.cs
===================================================================
--- trunk/debugger/backends/Inferior.cs 2006-04-18 01:27:44 UTC (rev 59563)
+++ trunk/debugger/backends/Inferior.cs 2006-04-18 01:36:05 UTC (rev 59564)
@@ -16,7 +16,7 @@
{
internal delegate void ChildOutputHandler (string output);
- internal class Inferior : ITargetMemoryAccess, ITargetNotification,
IDisposable
+ internal class Inferior : TargetMemoryAccess, ITargetNotification,
IDisposable
{
protected IntPtr server_handle;
protected Bfd bfd;
@@ -688,7 +688,7 @@
}
//
- // ITargetMemoryAccess
+ // TargetMemoryAccess
//
public AddressDomain AddressDomain {
@@ -697,7 +697,7 @@
}
}
- public TargetInfo TargetInfo {
+ public override TargetInfo TargetInfo {
get {
return target_info;
}
@@ -718,7 +718,7 @@
return data;
}
- public byte[] ReadBuffer (TargetAddress address, int size)
+ public override byte[] ReadBuffer (TargetAddress address, int
size)
{
check_disposed ();
if (size == 0)
@@ -734,7 +734,7 @@
}
}
- public byte ReadByte (TargetAddress address)
+ public override byte ReadByte (TargetAddress address)
{
check_disposed ();
IntPtr data = IntPtr.Zero;
@@ -746,7 +746,7 @@
}
}
- public int ReadInteger (TargetAddress address)
+ public override int ReadInteger (TargetAddress address)
{
check_disposed ();
IntPtr data = IntPtr.Zero;
@@ -758,7 +758,7 @@
}
}
- public long ReadLongInteger (TargetAddress address)
+ public override long ReadLongInteger (TargetAddress address)
{
check_disposed ();
IntPtr data = IntPtr.Zero;
@@ -770,7 +770,7 @@
}
}
- public TargetAddress ReadAddress (TargetAddress address)
+ public override TargetAddress ReadAddress (TargetAddress
address)
{
check_disposed ();
TargetAddress res;
@@ -794,7 +794,7 @@
return res;
}
- public string ReadString (TargetAddress address)
+ public override string ReadString (TargetAddress address)
{
check_disposed ();
StringBuilder sb = new StringBuilder ();
@@ -810,7 +810,7 @@
}
}
- public TargetBlob ReadMemory (TargetAddress address, int size)
+ public override TargetBlob ReadMemory (TargetAddress address,
int size)
{
check_disposed ();
byte [] retval = ReadBuffer (address, size);
@@ -906,7 +906,7 @@
}
}
- public int InsertBreakpoint (Breakpoint bpt, TargetAddress
address)
+ public override int InsertBreakpoint (Breakpoint bpt,
TargetAddress address)
{
return breakpoint_manager.InsertBreakpoint (this, bpt,
address);
}
@@ -1060,7 +1060,7 @@
}
}
- public Architecture Architecture {
+ public override Architecture Architecture {
get {
check_disposed ();
return arch;
@@ -1073,7 +1073,7 @@
}
}
- public Registers GetRegisters ()
+ public override Registers GetRegisters ()
{
IntPtr buffer = IntPtr.Zero;
try {
Modified: trunk/debugger/backends/Process.cs
===================================================================
--- trunk/debugger/backends/Process.cs 2006-04-18 01:27:44 UTC (rev 59563)
+++ trunk/debugger/backends/Process.cs 2006-04-18 01:36:05 UTC (rev 59564)
@@ -419,7 +419,7 @@
return mono_language;
}
- internal void UpdateSymbolTable (ITargetMemoryAccess target)
+ internal void UpdateSymbolTable (TargetMemoryAccess target)
{
if (mono_language != null)
mono_language.Update (target);
Modified: trunk/debugger/backends/TargetAccess.cs
===================================================================
--- trunk/debugger/backends/TargetAccess.cs 2006-04-18 01:27:44 UTC (rev
59563)
+++ trunk/debugger/backends/TargetAccess.cs 2006-04-18 01:36:05 UTC (rev
59564)
@@ -2,7 +2,7 @@
namespace Mono.Debugger.Backends
{
- public abstract class TargetAccess : MarshalByRefObject,
ITargetMemoryAccess
+ public abstract class TargetAccess : TargetMemoryAccess
{
internal abstract ThreadManager ThreadManager {
get;
@@ -12,10 +12,6 @@
get;
}
- public abstract TargetInfo TargetInfo {
- get;
- }
-
public abstract TargetState State {
get;
}
@@ -65,34 +61,14 @@
// ITargetMemoryInfo
//
- public abstract Architecture Architecture {
- get;
- }
-
public abstract AddressDomain AddressDomain {
get;
}
//
- // ITargetMemoryAccess
+ // TargetMemoryAccess
//
- public abstract byte ReadByte (TargetAddress address);
-
- public abstract int ReadInteger (TargetAddress address);
-
- public abstract long ReadLongInteger (TargetAddress address);
-
- public abstract TargetAddress ReadAddress (TargetAddress
address);
-
- public abstract string ReadString (TargetAddress address);
-
- public abstract TargetBlob ReadMemory (TargetAddress address,
int size);
-
- public abstract byte[] ReadBuffer (TargetAddress address, int
size);
-
- public abstract Registers GetRegisters ();
-
public abstract bool CanWrite {
get;
}
@@ -108,7 +84,5 @@
public abstract void WriteAddress (TargetAddress address,
TargetAddress value);
public abstract void SetRegisters (Registers registers);
-
- public abstract int InsertBreakpoint (Breakpoint breakpoint,
TargetAddress address);
}
}
Added: trunk/debugger/backends/TargetMemoryAccess.cs
===================================================================
--- trunk/debugger/backends/TargetMemoryAccess.cs 2006-04-18 01:27:44 UTC
(rev 59563)
+++ trunk/debugger/backends/TargetMemoryAccess.cs 2006-04-18 01:36:05 UTC
(rev 59564)
@@ -0,0 +1,33 @@
+using System;
+
+namespace Mono.Debugger.Backends
+{
+ public abstract class TargetMemoryAccess : MarshalByRefObject
+ {
+ public abstract TargetInfo TargetInfo {
+ get;
+ }
+
+ public abstract Architecture Architecture {
+ get;
+ }
+
+ public abstract byte ReadByte (TargetAddress address);
+
+ public abstract int ReadInteger (TargetAddress address);
+
+ public abstract long ReadLongInteger (TargetAddress address);
+
+ public abstract TargetAddress ReadAddress (TargetAddress
address);
+
+ public abstract string ReadString (TargetAddress address);
+
+ public abstract TargetBlob ReadMemory (TargetAddress address,
int size);
+
+ public abstract byte[] ReadBuffer (TargetAddress address, int
size);
+
+ public abstract Registers GetRegisters ();
+
+ public abstract int InsertBreakpoint (Breakpoint breakpoint,
TargetAddress address);
+ }
+}
Modified: trunk/debugger/backends/Thread.cs
===================================================================
--- trunk/debugger/backends/Thread.cs 2006-04-18 01:27:44 UTC (rev 59563)
+++ trunk/debugger/backends/Thread.cs 2006-04-18 01:36:05 UTC (rev 59564)
@@ -674,7 +674,7 @@
}
#endregion
-#region ITargetMemoryAccess implementation
+#region TargetMemoryAccess implementation
void write_memory (TargetAddress address, byte[] buffer)
{
check_target ();
Modified: trunk/debugger/classes/Method.cs
===================================================================
--- trunk/debugger/classes/Method.cs 2006-04-18 01:27:44 UTC (rev 59563)
+++ trunk/debugger/classes/Method.cs 2006-04-18 01:36:05 UTC (rev 59564)
@@ -3,6 +3,7 @@
using System.Collections;
using Mono.Debugger.Languages;
+using Mono.Debugger.Backends;
namespace Mono.Debugger
{
@@ -120,7 +121,7 @@
this.wrapper_type = wrapper_type;
}
- internal StackFrame UnwindStack (StackFrame frame,
ITargetMemoryAccess memory,
+ internal StackFrame UnwindStack (StackFrame frame,
TargetMemoryAccess memory,
Architecture arch)
{
if (!IsLoaded)
@@ -270,7 +271,7 @@
get;
}
- internal abstract SourceMethod GetTrampoline
(ITargetMemoryAccess memory,
+ internal abstract SourceMethod GetTrampoline
(TargetMemoryAccess memory,
TargetAddress
address);
public TargetVariable GetVariableByName (string name)
Modified: trunk/debugger/classes/Module.cs
===================================================================
--- trunk/debugger/classes/Module.cs 2006-04-18 01:27:44 UTC (rev 59563)
+++ trunk/debugger/classes/Module.cs 2006-04-18 01:36:05 UTC (rev 59564)
@@ -12,7 +12,7 @@
{
public delegate void ModuleEventHandler (Module module);
- internal delegate void MethodLoadedHandler (ITargetMemoryAccess target,
SourceMethod method,
+ internal delegate void MethodLoadedHandler (TargetMemoryAccess target,
SourceMethod method,
object user_data);
internal interface ILoadHandler
@@ -68,7 +68,7 @@
object
user_data);
internal abstract StackFrame UnwindStack (StackFrame last_frame,
- ITargetMemoryAccess
memory);
+ TargetMemoryAccess
memory);
internal abstract void OnModuleChanged ();
}
@@ -345,7 +345,7 @@
}
internal StackFrame UnwindStack (StackFrame last_frame,
- ITargetMemoryAccess memory)
+ TargetMemoryAccess memory)
{
return SymbolFile.UnwindStack (last_frame, memory);
}
Modified: trunk/debugger/classes/SourceLocation.cs
===================================================================
--- trunk/debugger/classes/SourceLocation.cs 2006-04-18 01:27:44 UTC (rev
59563)
+++ trunk/debugger/classes/SourceLocation.cs 2006-04-18 01:36:05 UTC (rev
59564)
@@ -2,6 +2,7 @@
using System.Runtime.Serialization;
using Mono.Debugger.Languages;
+using Mono.Debugger.Backends;
namespace Mono.Debugger
{
@@ -233,7 +234,7 @@
// The method has just been loaded, lookup the
breakpoint
// address and actually insert it.
// </summary>
- void method_loaded (ITargetMemoryAccess target,
SourceMethod source,
+ void method_loaded (TargetMemoryAccess target,
SourceMethod source,
object data)
{
load_handler = null;
Modified: trunk/debugger/classes/StackFrame.cs
===================================================================
--- trunk/debugger/classes/StackFrame.cs 2006-04-18 01:27:44 UTC (rev
59563)
+++ trunk/debugger/classes/StackFrame.cs 2006-04-18 01:36:05 UTC (rev
59564)
@@ -320,7 +320,7 @@
}
}
- internal StackFrame UnwindStack (ITargetMemoryAccess memory,
Architecture arch)
+ internal StackFrame UnwindStack (TargetMemoryAccess memory,
Architecture arch)
{
if (parent_frame != null)
return parent_frame;
Deleted: trunk/debugger/interfaces/ITargetMemoryAccess.cs
===================================================================
--- trunk/debugger/interfaces/ITargetMemoryAccess.cs 2006-04-18 01:27:44 UTC
(rev 59563)
+++ trunk/debugger/interfaces/ITargetMemoryAccess.cs 2006-04-18 01:36:05 UTC
(rev 59564)
@@ -1,34 +0,0 @@
-using System;
-using System.IO;
-
-namespace Mono.Debugger
-{
- internal interface ITargetMemoryAccess
- {
- TargetInfo TargetInfo {
- get;
- }
-
- Architecture Architecture {
- get;
- }
-
- byte ReadByte (TargetAddress address);
-
- int ReadInteger (TargetAddress address);
-
- long ReadLongInteger (TargetAddress address);
-
- TargetAddress ReadAddress (TargetAddress address);
-
- string ReadString (TargetAddress address);
-
- TargetBlob ReadMemory (TargetAddress address, int size);
-
- byte[] ReadBuffer (TargetAddress address, int size);
-
- Registers GetRegisters ();
-
- int InsertBreakpoint (Breakpoint breakpoint, TargetAddress
address);
- }
-}
Modified: trunk/debugger/languages/mono/MonoLanguageBackend.cs
===================================================================
--- trunk/debugger/languages/mono/MonoLanguageBackend.cs 2006-04-18
01:27:44 UTC (rev 59563)
+++ trunk/debugger/languages/mono/MonoLanguageBackend.cs 2006-04-18
01:36:05 UTC (rev 59564)
@@ -80,7 +80,7 @@
public readonly int MonoDefaultsDelegateOffset;
public readonly int MonoDefaultsExceptionOffset;
- public MonoBuiltinTypeInfo (MonoSymbolFile corlib,
ITargetMemoryAccess memory,
+ public MonoBuiltinTypeInfo (MonoSymbolFile corlib,
TargetMemoryAccess memory,
TargetAddress address)
{
this.Corlib = corlib;
@@ -411,7 +411,7 @@
return (MonoSymbolFile) image_hash [address];
}
- void read_mono_debugger_info (ITargetMemoryAccess memory)
+ void read_mono_debugger_info (TargetMemoryAccess memory)
{
trampolines = new TargetAddress [4];
TargetAddress address = info.MonoTrampolineCode;
@@ -432,12 +432,12 @@
}
#region symbol table management
- internal void Update (ITargetMemoryAccess target)
+ internal void Update (TargetMemoryAccess target)
{
do_update_symbol_table (target);
}
- void do_update_symbol_table (ITargetMemoryAccess memory)
+ void do_update_symbol_table (TargetMemoryAccess memory)
{
if (!initialized)
return;
@@ -459,7 +459,7 @@
// This method reads the MonoDebuggerSymbolTable structure
// (struct definition is in mono-debug-debugger.h)
- void do_update (ITargetMemoryAccess memory)
+ void do_update (TargetMemoryAccess memory)
{
TargetAddress symtab_address = memory.ReadAddress
(info.SymbolTable);
TargetReader header = new TargetReader (
@@ -525,7 +525,7 @@
}
// This method reads a portion of the data table (defn in
mono-debug.h)
- void read_data_table (ITargetMemoryAccess memory, TargetReader
header)
+ void read_data_table (TargetMemoryAccess memory, TargetReader
header)
{
int num_data_tables = header.ReadInteger ();
TargetAddress data_tables = header.ReadAddress ();
@@ -575,7 +575,7 @@
Wrapper
}
- void read_data_items (ITargetMemoryAccess memory, TargetAddress
address, int start, int end)
+ void read_data_items (TargetMemoryAccess memory, TargetAddress
address, int start, int end)
{
TargetReader reader = new TargetReader (
memory.ReadMemory (address + start, end -
start), memory.TargetInfo);
@@ -639,7 +639,7 @@
file.AddClassEntry (reader, contents);
}
- void read_wrapper_entry (ITargetMemoryAccess memory,
TargetReader reader)
+ void read_wrapper_entry (TargetMemoryAccess memory,
TargetReader reader)
{
int size = reader.BinaryReader.PeekInt32 ();
byte[] contents = reader.BinaryReader.PeekBuffer (size);
@@ -853,7 +853,7 @@
get { return info.RuntimeInvoke; }
}
- public TargetAddress GetTrampolineAddress (ITargetMemoryAccess
memory,
+ public TargetAddress GetTrampolineAddress (TargetMemoryAccess
memory,
TargetAddress
address,
out bool is_start)
{
@@ -892,7 +892,7 @@
get { return info.RunFinally; }
}
- public SourceMethod GetTrampoline (ITargetMemoryAccess memory,
+ public SourceMethod GetTrampoline (TargetMemoryAccess memory,
TargetAddress address)
{
bool is_start;
Modified: trunk/debugger/languages/mono/MonoSymbolFile.cs
===================================================================
--- trunk/debugger/languages/mono/MonoSymbolFile.cs 2006-04-18 01:27:44 UTC
(rev 59563)
+++ trunk/debugger/languages/mono/MonoSymbolFile.cs 2006-04-18 01:36:05 UTC
(rev 59564)
@@ -226,7 +226,7 @@
Hashtable method_index_hash;
internal MonoSymbolFile (MonoLanguageBackend language, Process
process,
- ITargetMemoryAccess memory,
TargetAddress address)
+ TargetMemoryAccess memory,
TargetAddress address)
{
this.MonoLanguage = language;
this.TargetInfo = memory.TargetInfo;
@@ -332,7 +332,7 @@
}
}
- internal void AddWrapperEntry (ITargetMemoryAccess memory,
TargetReader reader,
+ internal void AddWrapperEntry (TargetMemoryAccess memory,
TargetReader reader,
byte[] contents)
{
WrapperEntry wrapper = WrapperEntry.Create (this,
memory, reader, contents);
@@ -622,7 +622,7 @@
}
internal override StackFrame UnwindStack (StackFrame last_frame,
- ITargetMemoryAccess
memory)
+ TargetMemoryAccess
memory)
{
return null;
}
@@ -807,7 +807,7 @@
}
}
- internal override SourceMethod GetTrampoline
(ITargetMemoryAccess memory,
+ internal override SourceMethod GetTrampoline
(TargetMemoryAccess memory,
TargetAddress address)
{
return file.LanguageBackend.GetTrampoline
(memory, address);
@@ -1112,7 +1112,7 @@
this.LineNumbers = line_numbers;
}
- public static WrapperEntry Create (MonoSymbolFile file,
ITargetMemoryAccess memory,
+ public static WrapperEntry Create (MonoSymbolFile file,
TargetMemoryAccess memory,
TargetReader reader,
byte[] contents)
{
int size = reader.BinaryReader.ReadInt32 ();
@@ -1200,7 +1200,7 @@
get { return null; }
}
- internal override SourceMethod GetTrampoline
(ITargetMemoryAccess memory,
+ internal override SourceMethod GetTrampoline
(TargetMemoryAccess memory,
TargetAddress address)
{
return Entry.File.LanguageBackend.GetTrampoline
(memory, address);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
