Author: martin
Date: 2005-10-11 09:35:09 -0400 (Tue, 11 Oct 2005)
New Revision: 51569

Added:
   trunk/debugger/arch/Architecture.cs
Removed:
   trunk/debugger/interfaces/IArchitecture.cs
Modified:
   trunk/debugger/ChangeLog
   trunk/debugger/arch/Architecture_I386.cs
   trunk/debugger/arch/Architecture_X86_64.cs
   trunk/debugger/arch/Bfd.cs
   trunk/debugger/arch/DwarfFrameReader.cs
   trunk/debugger/backends/Inferior.cs
   trunk/debugger/backends/Process.cs
   trunk/debugger/backends/SingleSteppingEngine.cs
   trunk/debugger/backends/classes/TargetReader.cs
   trunk/debugger/classes/Backtrace.cs
   trunk/debugger/classes/MethodBase.cs
   trunk/debugger/classes/StackFrame.cs
   trunk/debugger/frontend/Command.cs
   trunk/debugger/frontend/ScriptingContext.cs
   trunk/debugger/interfaces/IMethod.cs
   trunk/debugger/interfaces/ITargetMemoryAccess.cs
   trunk/debugger/languages/mono/MonoSymbolFile.cs
Log:
2005-10-11  Martin Baulig  <[EMAIL PROTECTED]>

        * interfaces/IArchitecture.cs (IArchitecture): Replaced this
        interfaces with the abstract class `Architecture'.

        * arch/Architecture.cs (Architecture): New public abstract class;
        replaces the `IArchitecture' interface.  Make a few API entry
        points `internal' instead of `public'.



Modified: trunk/debugger/ChangeLog
===================================================================
--- trunk/debugger/ChangeLog    2005-10-11 13:33:39 UTC (rev 51568)
+++ trunk/debugger/ChangeLog    2005-10-11 13:35:09 UTC (rev 51569)
@@ -1,5 +1,14 @@
 2005-10-11  Martin Baulig  <[EMAIL PROTECTED]>
 
+       * interfaces/IArchitecture.cs (IArchitecture): Replaced this
+       interfaces with the abstract class `Architecture'.
+
+       * arch/Architecture.cs (Architecture): New public abstract class;
+       replaces the `IArchitecture' interface.  Make a few API entry
+       points `internal' instead of `public'.
+
+2005-10-11  Martin Baulig  <[EMAIL PROTECTED]>
+
        * arch/Architecture_PowerPC.cs: Removed.
 
 2005-10-11  Martin Baulig  <[EMAIL PROTECTED]>

Added: trunk/debugger/arch/Architecture.cs
===================================================================
--- trunk/debugger/arch/Architecture.cs 2005-10-11 13:33:39 UTC (rev 51568)
+++ trunk/debugger/arch/Architecture.cs 2005-10-11 13:35:09 UTC (rev 51569)
@@ -0,0 +1,115 @@
+using System;
+
+namespace Mono.Debugger
+{
+       // <summary>
+       //   Architecture-dependent interface.
+       // </summary>
+       public abstract class Architecture : MarshalByRefObject
+       {
+               // <summary>
+               //   The names of all registers.
+               // </summary>
+               public abstract string[] RegisterNames {
+                       get;
+               }
+
+               // <summary>
+               //   Indices of the "important" registers, sorted in a way 
that's suitable
+               //   to display them to the user.
+               // </summary>
+               public abstract int[] RegisterIndices {
+                       get;
+               }
+
+               // <summary>
+               //   Indices of all registers.
+               // </summary>
+               public abstract int[] AllRegisterIndices {
+                       get;
+               }
+
+               // <summary>
+               // Size (in bytes) of each register.
+               // </summary>
+               public abstract int[] RegisterSizes {
+                       get;
+               }
+
+               // <summary>
+               // A map between the register the register numbers in
+               // the jit code generator and the register indices
+               // used in the above arrays.
+               // </summary>
+               internal abstract int[] RegisterMap {
+                       get;
+               }
+
+               internal abstract int[] DwarfFrameRegisterMap {
+                       get;
+               }
+
+               internal abstract int CountRegisters {
+                       get;
+               }
+
+               public abstract string PrintRegister (Register register);
+
+               public abstract string PrintRegisters (StackFrame frame);
+
+               // <summary>
+               //   Returns whether the instruction at target address @address 
is a `ret'
+               //   instruction.
+               // </summary>
+               internal abstract bool IsRetInstruction (ITargetMemoryAccess 
memory,
+                                                        TargetAddress address);
+
+               // <summary>
+               //   Check whether the instruction at target address @address 
is a `call'
+               //   instruction and returns the destination of the call or 
TargetAddress.Null.
+               //
+               //   The out parameter @insn_size is set to the size on bytes 
of the call
+               //   instructions.  This can be used to set a breakpoint 
immediately after
+               //   the function.
+               // </summary>
+               internal abstract TargetAddress GetCallTarget 
(ITargetMemoryAccess target,
+                                                              TargetAddress 
address,
+                                                              out int 
insn_size);
+
+               // <summary>
+               //   Check whether the instruction at target address @address 
is a `jump'
+               //   instruction and returns the destination of the call or 
TargetAddress.Null.
+               //
+               //   The out parameter @insn_size is set to the size on bytes 
of the jump
+               //   instructions.  This can be used to set a breakpoint 
immediately after
+               //   the jump.
+               // </summary>
+               internal abstract TargetAddress GetJumpTarget 
(ITargetMemoryAccess target,
+                                                              TargetAddress 
address,
+                                                              out int 
insn_size);
+
+               // <summary>
+               //   Check whether the instruction at target address @address 
is a trampoline method.
+               //   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,
+                                                              TargetAddress 
address,
+                                                              TargetAddress 
generic_trampoline_address);
+
+               internal abstract int MaxPrologueSize {
+                       get;
+               }
+
+               internal abstract SimpleStackFrame UnwindStack 
(ITargetMemoryAccess memory,
+                                                               
SimpleStackFrame frame, Symbol name,
+                                                               byte[] code);
+
+               internal abstract SimpleStackFrame UnwindStack 
(ITargetMemoryAccess memory,
+                                                               TargetAddress 
stack,
+                                                               TargetAddress 
frame_address);
+
+               internal abstract SimpleStackFrame TrySpecialUnwind 
(ITargetMemoryAccess memory,
+                                                                    
SimpleStackFrame frame);
+       }
+}

Modified: trunk/debugger/arch/Architecture_I386.cs
===================================================================
--- trunk/debugger/arch/Architecture_I386.cs    2005-10-11 13:33:39 UTC (rev 
51568)
+++ trunk/debugger/arch/Architecture_I386.cs    2005-10-11 13:35:09 UTC (rev 
51569)
@@ -2,7 +2,7 @@
 using System.Collections;
 using Mono.Debugger.Backends;
 
-namespace Mono.Debugger
+namespace Mono.Debugger.Backends
 {
        // Keep in sync with DebuggerI386Registers in 
backends/server/i386-arch.h.
        internal enum I386Register
@@ -29,14 +29,17 @@
        // <summary>
        //   Architecture-dependent stuff for the i386.
        // </summary>
-       internal class Architecture_I386 : MarshalByRefObject, IArchitecture
+       internal class Architecture_I386 : Architecture
        {
-               public bool IsRetInstruction (ITargetMemoryAccess memory, 
TargetAddress address)
+               internal override bool IsRetInstruction (ITargetMemoryAccess 
memory,
+                                                        TargetAddress address)
                {
                        return memory.ReadByte (address) == 0xc3;
                }
 
-               public TargetAddress GetCallTarget (ITargetMemoryAccess target, 
TargetAddress address, out int insn_size)
+               internal override TargetAddress GetCallTarget 
(ITargetMemoryAccess target,
+                                                              TargetAddress 
address,
+                                                              out int 
insn_size)
                {
                        if (address.Address == 0xffffe002) {
                                insn_size = 0;
@@ -129,8 +132,9 @@
                                return vtable_addr;
                }
 
-               public TargetAddress GetJumpTarget (ITargetMemoryAccess target, 
TargetAddress address,
-                                                   out int insn_size)
+               internal override TargetAddress GetJumpTarget 
(ITargetMemoryAccess target,
+                                                              TargetAddress 
address,
+                                                              out int 
insn_size)
                {
                        TargetBinaryReader reader = target.ReadMemory (address, 
10).GetReader ();
 
@@ -153,9 +157,9 @@
                        return TargetAddress.Null;
                }
 
-               public TargetAddress GetTrampoline (ITargetMemoryAccess target,
-                                                   TargetAddress location,
-                                                   TargetAddress 
trampoline_address)
+               internal override TargetAddress GetTrampoline 
(ITargetMemoryAccess target,
+                                                              TargetAddress 
location,
+                                                              TargetAddress 
trampoline_address)
                {
                        if (trampoline_address.IsNull)
                                return TargetAddress.Null;
@@ -180,43 +184,43 @@
                        return new TargetAddress (target.GlobalAddressDomain, 
method_info);
                }
 
-               public string[] RegisterNames {
+               public override string[] RegisterNames {
                        get {
                                return registers;
                        }
                }
 
-               public int[] RegisterIndices {
+               public override int[] RegisterIndices {
                        get {
                                return important_regs;
                        }
                }
 
-               public int[] AllRegisterIndices {
+               public override int[] AllRegisterIndices {
                        get {
                                return all_regs;
                        }
                }
 
-               public int[] RegisterSizes {
+               public override int[] RegisterSizes {
                        get {
                                return reg_sizes;
                        }
                }
 
-               public int[] RegisterMap {
+               internal override int[] RegisterMap {
                        get {
                                return register_map;
                        }
                }
 
-               public int[] DwarfFrameRegisterMap {
+               internal override int[] DwarfFrameRegisterMap {
                        get {
                                return dwarf_frame_register_map;
                        }
                }
 
-               public int CountRegisters {
+               internal override int CountRegisters {
                        get {
                                return (int) I386Register.COUNT;
                        }
@@ -270,7 +274,7 @@
 
                int[] reg_sizes = { 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
4, 4 };
 
-               public string PrintRegister (Register register)
+               public override string PrintRegister (Register register)
                {
                        if (!register.Valid)
                                return "XXXXXXXX";
@@ -333,7 +337,7 @@
                        return saddr;
                }
 
-               public string PrintRegisters (StackFrame frame)
+               public override string PrintRegisters (StackFrame frame)
                {
                        Registers registers = frame.Registers;
                        return String.Format (
@@ -351,7 +355,7 @@
                                PrintRegister (registers [(int) 
I386Register.EFLAGS]));
                }
 
-               public int MaxPrologueSize {
+               internal override int MaxPrologueSize {
                        get { return 50; }
                }
 
@@ -569,9 +573,9 @@
                        return null;
                }
 
-               public SimpleStackFrame UnwindStack (ITargetMemoryAccess memory,
-                                                    SimpleStackFrame frame, 
Symbol name,
-                                                    byte[] code)
+               internal override SimpleStackFrame UnwindStack 
(ITargetMemoryAccess memory,
+                                                               
SimpleStackFrame frame, Symbol name,
+                                                               byte[] code)
                {
                        if ((code != null) && (code.Length > 3))
                                return read_prologue (frame, memory, code);
@@ -601,8 +605,9 @@
                                new_eip, new_esp, new_ebp, regs, frame.Level + 
1);
                }
 
-               public SimpleStackFrame UnwindStack (ITargetMemoryAccess memory,
-                                                    TargetAddress stack, 
TargetAddress frame)
+               internal override SimpleStackFrame UnwindStack 
(ITargetMemoryAccess memory,
+                                                               TargetAddress 
stack,
+                                                               TargetAddress 
frame)
                {
                        TargetAddress eip = memory.ReadGlobalAddress (stack);
                        TargetAddress esp = stack;
@@ -616,8 +621,8 @@
                        return new SimpleStackFrame (eip, esp, ebp, regs, 0);
                }
 
-               public SimpleStackFrame TrySpecialUnwind (ITargetMemoryAccess 
memory,
-                                                         SimpleStackFrame 
frame)
+               internal override SimpleStackFrame TrySpecialUnwind 
(ITargetMemoryAccess memory,
+                                                                    
SimpleStackFrame frame)
                {
                        return null;
                }

Modified: trunk/debugger/arch/Architecture_X86_64.cs
===================================================================
--- trunk/debugger/arch/Architecture_X86_64.cs  2005-10-11 13:33:39 UTC (rev 
51568)
+++ trunk/debugger/arch/Architecture_X86_64.cs  2005-10-11 13:35:09 UTC (rev 
51569)
@@ -2,7 +2,7 @@
 using System.Collections;
 using Mono.Debugger.Backends;
 
-namespace Mono.Debugger
+namespace Mono.Debugger.Backends
 {
        // Keep in sync with DebuggerRegisters in backends/server/x86-arch.h.
        internal enum X86_64_Register
@@ -40,15 +40,17 @@
        // <summary>
        //   Architecture-dependent stuff for the x86_64.
        // </summary>
-       internal class Architecture_X86_64 : MarshalByRefObject, IArchitecture
+       internal class Architecture_X86_64 : Architecture
        {
-               public bool IsRetInstruction (ITargetMemoryAccess memory, 
TargetAddress address)
+               internal override bool IsRetInstruction (ITargetMemoryAccess 
memory,
+                                                        TargetAddress address)
                {
                        return memory.ReadByte (address) == 0xc3;
                }
 
-               public TargetAddress GetCallTarget (ITargetMemoryAccess target, 
TargetAddress address,
-                                                   out int insn_size)
+               internal override TargetAddress GetCallTarget 
(ITargetMemoryAccess target,
+                                                              TargetAddress 
address,
+                                                              out int 
insn_size)
                {
                        if (address.Address == 0xffffe002) {
                                insn_size = 0;
@@ -172,8 +174,9 @@
                                return vtable_addr;
                }
 
-               public TargetAddress GetJumpTarget (ITargetMemoryAccess target, 
TargetAddress address,
-                                                   out int insn_size)
+               internal override TargetAddress GetJumpTarget 
(ITargetMemoryAccess target,
+                                                              TargetAddress 
address,
+                                                              out int 
insn_size)
                {
                        TargetBinaryReader reader = target.ReadMemory (address, 
10).GetReader ();
 
@@ -197,9 +200,9 @@
                        return TargetAddress.Null;
                }
 
-               public TargetAddress GetTrampoline (ITargetMemoryAccess target,
-                                                   TargetAddress location,
-                                                   TargetAddress 
trampoline_address)
+               internal override TargetAddress GetTrampoline 
(ITargetMemoryAccess target,
+                                                              TargetAddress 
location,
+                                                              TargetAddress 
trampoline_address)
                {
                        if (trampoline_address.IsNull)
                                return TargetAddress.Null;
@@ -226,43 +229,43 @@
                        return new TargetAddress (target.GlobalAddressDomain, 
method_info);
                }
 
-               public string[] RegisterNames {
+               public override string[] RegisterNames {
                        get {
                                return registers;
                        }
                }
 
-               public int[] RegisterIndices {
+               public override int[] RegisterIndices {
                        get {
                                return important_regs;
                        }
                }
 
-               public int[] AllRegisterIndices {
+               public override int[] AllRegisterIndices {
                        get {
                                return all_regs;
                        }
                }
 
-               public int[] RegisterSizes {
+               public override int[] RegisterSizes {
                        get {
                                return reg_sizes;
                        }
                }
 
-               public int[] RegisterMap {
+               internal override int[] RegisterMap {
                        get {
                                return register_map;
                        }
                }
 
-               public int[] DwarfFrameRegisterMap {
+               internal override int[] DwarfFrameRegisterMap {
                        get {
                                return dwarf_frame_register_map;
                        }
                }
 
-               public int CountRegisters {
+               internal override int CountRegisters {
                        get {
                                return (int) X86_64_Register.COUNT;
                        }
@@ -340,7 +343,7 @@
                int[] reg_sizes = { 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
                                    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8 };
 
-               public string PrintRegister (Register register)
+               public override string PrintRegister (Register register)
                {
                        if (!register.Valid)
                                return "XXXXXXXX";
@@ -360,7 +363,7 @@
                        return saddr;
                }
 
-               public string PrintRegisters (StackFrame frame)
+               public override string PrintRegisters (StackFrame frame)
                {
                        Registers registers = frame.Registers;
                        return String.Format (
@@ -379,7 +382,7 @@
                                PrintRegister (registers [(int) 
X86_64_Register.EFLAGS]));
                }
 
-               public int MaxPrologueSize {
+               internal override int MaxPrologueSize {
                        get { return 50; }
                }
 
@@ -527,9 +530,9 @@
                        return null;
                }
 
-               public SimpleStackFrame UnwindStack (ITargetMemoryAccess memory,
-                                                    SimpleStackFrame frame, 
Symbol name,
-                                                    byte[] code)
+               internal override SimpleStackFrame UnwindStack 
(ITargetMemoryAccess memory,
+                                                               
SimpleStackFrame frame, Symbol name,
+                                                               byte[] code)
                {
                        if ((code != null) && (code.Length > 4))
                                return read_prologue (frame, memory, code);
@@ -555,8 +558,8 @@
                                new_rip, new_rsp, new_rbp, regs, frame.Level + 
1);
                }
 
-               public SimpleStackFrame UnwindStack (ITargetMemoryAccess memory,
-                                                    TargetAddress stack, 
TargetAddress frame)
+               internal override SimpleStackFrame UnwindStack 
(ITargetMemoryAccess memory,
+                                                               TargetAddress 
stack, TargetAddress frame)
                {
                        TargetAddress rip = memory.ReadGlobalAddress (stack);
                        TargetAddress rsp = stack;
@@ -626,8 +629,8 @@
                        return new SimpleStackFrame (rip, rsp, rbp, regs, 
frame.Level + 1);
                }
 
-               public SimpleStackFrame TrySpecialUnwind (ITargetMemoryAccess 
memory,
-                                                         SimpleStackFrame 
frame)
+               internal override SimpleStackFrame TrySpecialUnwind 
(ITargetMemoryAccess memory,
+                                                                    
SimpleStackFrame frame)
                {
                        SimpleStackFrame new_frame;
                        new_frame = try_unwind_sigreturn (memory, frame);

Modified: trunk/debugger/arch/Bfd.cs
===================================================================
--- trunk/debugger/arch/Bfd.cs  2005-10-11 13:33:39 UTC (rev 51568)
+++ trunk/debugger/arch/Bfd.cs  2005-10-11 13:35:09 UTC (rev 51569)
@@ -20,7 +20,7 @@
                protected ITargetMemoryInfo info;
                protected Bfd core_file_bfd;
                protected Bfd main_bfd;
-               protected IArchitecture arch;
+               protected Architecture arch;
                TargetAddress first_link_map = TargetAddress.Null;
                TargetAddress dynlink_breakpoint = TargetAddress.Null;
                TargetAddress rdebug_state_addr = TargetAddress.Null;
@@ -470,7 +470,7 @@
                        }
                }
 
-               public IArchitecture Architecture {
+               public Architecture Architecture {
                        get {
                                return arch;
                        }

Modified: trunk/debugger/arch/DwarfFrameReader.cs
===================================================================
--- trunk/debugger/arch/DwarfFrameReader.cs     2005-10-11 13:33:39 UTC (rev 
51568)
+++ trunk/debugger/arch/DwarfFrameReader.cs     2005-10-11 13:35:09 UTC (rev 
51569)
@@ -34,7 +34,7 @@
 
                public SimpleStackFrame UnwindStack (SimpleStackFrame frame,
                                                     ITargetMemoryAccess target,
-                                                    IArchitecture arch)
+                                                    Architecture arch)
                {
                        if (frame.Address.IsNull)
                                return null;
@@ -322,7 +322,7 @@
                        }
 
                        void SetRegisters (Registers regs, ITargetMemoryAccess 
target,
-                                          IArchitecture arch, Column[] columns)
+                                          Architecture arch, Column[] columns)
                        {
                                long cfa_addr = GetRegisterValue (regs, 1, 
columns [0]);
                                TargetAddress cfa = new TargetAddress (
@@ -335,7 +335,7 @@
 
                        public SimpleStackFrame Unwind (SimpleStackFrame frame,
                                                        ITargetMemoryAccess 
target,
-                                                       IArchitecture arch)
+                                                       Architecture arch)
                        {
                                Registers old_regs = frame.Registers;
 
@@ -393,7 +393,7 @@
                                get { return next; }
                        }
 
-                       public IArchitecture Architecture {
+                       public Architecture Architecture {
                                get { return frame.bfd.Architecture; }
                        }
 

Modified: trunk/debugger/backends/Inferior.cs
===================================================================
--- trunk/debugger/backends/Inferior.cs 2005-10-11 13:33:39 UTC (rev 51568)
+++ trunk/debugger/backends/Inferior.cs 2005-10-11 13:35:09 UTC (rev 51569)
@@ -42,7 +42,7 @@
 
                TargetInfo target_info;
                TargetMemoryInfo target_memory_info;
-               IArchitecture arch;
+               Architecture arch;
 
                bool has_signals;
                SignalInfo signal_info;
@@ -1021,7 +1021,7 @@
                        }
                }
 
-               public IArchitecture Architecture {
+               public Architecture Architecture {
                        get {
                                check_disposed ();
                                return arch;

Modified: trunk/debugger/backends/Process.cs
===================================================================
--- trunk/debugger/backends/Process.cs  2005-10-11 13:33:39 UTC (rev 51568)
+++ trunk/debugger/backends/Process.cs  2005-10-11 13:35:09 UTC (rev 51569)
@@ -126,7 +126,7 @@
                        }
                }
 
-               public IArchitecture Architecture {
+               public Architecture Architecture {
                        get {
                                check_engine ();
                                return target_memory_info.Architecture;

Modified: trunk/debugger/backends/SingleSteppingEngine.cs
===================================================================
--- trunk/debugger/backends/SingleSteppingEngine.cs     2005-10-11 13:33:39 UTC 
(rev 51568)
+++ trunk/debugger/backends/SingleSteppingEngine.cs     2005-10-11 13:35:09 UTC 
(rev 51569)
@@ -609,7 +609,7 @@
                        get { return inferior; }
                }
 
-               public IArchitecture Architecture {
+               public Architecture Architecture {
                        get { return arch; }
                }
 
@@ -1604,7 +1604,7 @@
                Process process;
                Inferior inferior;
                TargetAccess target_access;
-               IArchitecture arch;
+               Architecture arch;
                IDisassembler disassembler;
                ProcessStart start;
                ISymbolTable current_symtab;

Modified: trunk/debugger/backends/classes/TargetReader.cs
===================================================================
--- trunk/debugger/backends/classes/TargetReader.cs     2005-10-11 13:33:39 UTC 
(rev 51568)
+++ trunk/debugger/backends/classes/TargetReader.cs     2005-10-11 13:35:09 UTC 
(rev 51569)
@@ -55,7 +55,7 @@
        [Serializable]
        internal class TargetMemoryInfo : TargetInfo, ITargetMemoryInfo
        {
-               IArchitecture arch;
+               Architecture arch;
                AddressDomain address_domain;
                AddressDomain global_address_domain;
 
@@ -69,7 +69,7 @@
                        this.address_domain = domain;
                }
 
-               internal void Initialize (IArchitecture arch)
+               internal void Initialize (Architecture arch)
                {
                        this.arch = arch;
                }
@@ -86,7 +86,7 @@
                        }
                }
 
-               public IArchitecture Architecture {
+               public Architecture Architecture {
                        get {
                                return arch;
                        }
@@ -163,7 +163,7 @@
                        }
                }
 
-               public IArchitecture Architecture {
+               public Architecture Architecture {
                        get {
                                return info.Architecture;
                        }

Modified: trunk/debugger/classes/Backtrace.cs
===================================================================
--- trunk/debugger/classes/Backtrace.cs 2005-10-11 13:33:39 UTC (rev 51568)
+++ trunk/debugger/classes/Backtrace.cs 2005-10-11 13:35:09 UTC (rev 51569)
@@ -10,19 +10,19 @@
        {
                protected StackFrame last_frame;
                protected ITargetMemoryAccess target;
-               protected IArchitecture arch;
+               protected Architecture arch;
                protected TargetAddress until;
                protected int max_frames;
                protected bool finished;
 
                ArrayList frames;
 
-               public Backtrace (ITargetMemoryAccess target, IArchitecture 
arch,
+               public Backtrace (ITargetMemoryAccess target, Architecture arch,
                                  StackFrame first_frame)
                        : this (target, arch, first_frame, TargetAddress.Null, 
-1)
                { }
 
-               public Backtrace (ITargetMemoryAccess target, IArchitecture 
arch,
+               public Backtrace (ITargetMemoryAccess target, Architecture arch,
                                  StackFrame first_frame, TargetAddress until,
                                  int max_frames)
                {
@@ -46,7 +46,7 @@
 
                public event ObjectInvalidHandler BacktraceInvalidEvent;
 
-               public void GetBacktrace (TargetAccess target, IArchitecture 
arch,
+               public void GetBacktrace (TargetAccess target, Architecture 
arch,
                                          ISymbolTable symtab, 
ISimpleSymbolTable simple)
                {
                        while (TryUnwind (target, arch, symtab, simple)) {
@@ -55,7 +55,7 @@
                        }
                }
 
-               public void GetBacktrace (TargetAccess target, IArchitecture 
arch,
+               public void GetBacktrace (TargetAccess target, Architecture 
arch,
                                          ISymbolTable symtab, 
ISimpleSymbolTable simple,
                                          TargetAddress stack)
                {
@@ -73,7 +73,7 @@
                        GetBacktrace (target, arch, symtab, simple);
                }
 
-               public bool TryUnwind (TargetAccess target, IArchitecture arch,
+               public bool TryUnwind (TargetAccess target, Architecture arch,
                                       ISymbolTable symtab, ISimpleSymbolTable 
simple_symtab)
                {
                        if (finished)
@@ -102,7 +102,7 @@
                }
 
                protected SimpleStackFrame UnwindStack (ITargetMemoryAccess 
memory,
-                                                       IArchitecture arch)
+                                                       Architecture arch)
                {
                        IMethod method = last_frame.Method;
                        SimpleStackFrame new_frame = null;

Modified: trunk/debugger/classes/MethodBase.cs
===================================================================
--- trunk/debugger/classes/MethodBase.cs        2005-10-11 13:33:39 UTC (rev 
51568)
+++ trunk/debugger/classes/MethodBase.cs        2005-10-11 13:35:09 UTC (rev 
51569)
@@ -95,7 +95,7 @@
 
                public virtual SimpleStackFrame UnwindStack (SimpleStackFrame 
frame,
                                                             
ITargetMemoryAccess memory,
-                                                            IArchitecture arch)
+                                                            Architecture arch)
                {
                        if (!IsLoaded)
                                return null;

Modified: trunk/debugger/classes/StackFrame.cs
===================================================================
--- trunk/debugger/classes/StackFrame.cs        2005-10-11 13:33:39 UTC (rev 
51568)
+++ trunk/debugger/classes/StackFrame.cs        2005-10-11 13:35:09 UTC (rev 
51569)
@@ -108,7 +108,7 @@
                Register[] regs;
                bool from_current_frame;
 
-               public Registers (IArchitecture arch)
+               public Registers (Architecture arch)
                {
                        regs = new Register [arch.CountRegisters];
                        for (int i = 0; i < regs.Length; i++)
@@ -116,7 +116,7 @@
                                        this, i, arch.RegisterSizes [i], false, 
0);
                }
 
-               public Registers (IArchitecture arch, long[] values)
+               public Registers (Architecture arch, long[] values)
                {
                        regs = new Register [arch.CountRegisters];
                        if (regs.Length != values.Length)

Modified: trunk/debugger/frontend/Command.cs
===================================================================
--- trunk/debugger/frontend/Command.cs  2005-10-11 13:33:39 UTC (rev 51568)
+++ trunk/debugger/frontend/Command.cs  2005-10-11 13:35:09 UTC (rev 51569)
@@ -1247,7 +1247,7 @@
                        {
                                FrameHandle frame = ResolveFrame (context);
 
-                               IArchitecture arch = ResolveProcess 
(context).Process.Architecture;
+                               Architecture arch = ResolveProcess 
(context).Process.Architecture;
                                context.Print (arch.PrintRegisters 
(frame.Frame));
                        }
                }

Modified: trunk/debugger/frontend/ScriptingContext.cs
===================================================================
--- trunk/debugger/frontend/ScriptingContext.cs 2005-10-11 13:33:39 UTC (rev 
51568)
+++ trunk/debugger/frontend/ScriptingContext.cs 2005-10-11 13:35:09 UTC (rev 
51569)
@@ -391,7 +391,7 @@
                void initialize ()
                {
                        registers = new Hashtable ();
-                       IArchitecture arch = process.Architecture;
+                       Architecture arch = process.Architecture;
 
                        string[] reg_names = arch.RegisterNames;
                        int[] reg_indices = arch.AllRegisterIndices;
@@ -545,7 +545,7 @@
                        process.Continue (true);
                }
 
-               public IArchitecture Architecture {
+               public Architecture Architecture {
                        get {
                                if (process.Architecture == null)
                                        throw new ScriptingException ("Unknown 
architecture");

Deleted: trunk/debugger/interfaces/IArchitecture.cs
===================================================================
--- trunk/debugger/interfaces/IArchitecture.cs  2005-10-11 13:33:39 UTC (rev 
51568)
+++ trunk/debugger/interfaces/IArchitecture.cs  2005-10-11 13:35:09 UTC (rev 
51569)
@@ -1,116 +0,0 @@
-using System;
-
-namespace Mono.Debugger
-{
-       // <summary>
-       //   Architecture-dependent interface.
-       // </summary>
-       public interface IArchitecture
-       {
-               // <summary>
-               //   The names of all registers.
-               // </summary>
-               string[] RegisterNames {
-                       get;
-               }
-
-               // <summary>
-               //   Indices of the "important" registers, sorted in a way 
that's suitable
-               //   to display them to the user.
-               // </summary>
-               int[] RegisterIndices {
-                       get;
-               }
-
-               // <summary>
-               //   Indices of all registers.
-               // </summary>
-               int[] AllRegisterIndices {
-                       get;
-               }
-
-               // <summary>
-               // Size (in bytes) of each register.
-               // </summary>
-               int[] RegisterSizes {
-                       get;
-               }
-
-               // <summary>
-               // A map between the register the register numbers in
-               // the jit code generator and the register indices
-               // used in the above arrays.
-               // </summary>
-               int[] RegisterMap {
-                       get;
-               }
-
-               int[] DwarfFrameRegisterMap {
-                       get;
-               }
-
-               // <summary>
-               // The length of the
-               // AllRegisterIndices/RegisterNames/RegisterSizes
-               // arrays.
-               // XXX why not just let people do
-               // "RegisterNames.Length"?
-               // </summary>
-               int CountRegisters {
-                       get;
-               }
-
-               string PrintRegister (Register register);
-
-               string PrintRegisters (StackFrame frame);
-
-               // <summary>
-               //   Returns whether the instruction at target address @address 
is a `ret'
-               //   instruction.
-               // </summary>
-               bool IsRetInstruction (ITargetMemoryAccess memory, 
TargetAddress address);
-
-               // <summary>
-               //   Check whether the instruction at target address @address 
is a `call'
-               //   instruction and returns the destination of the call or 
TargetAddress.Null.
-               //
-               //   The out parameter @insn_size is set to the size on bytes 
of the call
-               //   instructions.  This can be used to set a breakpoint 
immediately after
-               //   the function.
-               // </summary>
-               TargetAddress GetCallTarget (ITargetMemoryAccess target, 
TargetAddress address,
-                                            out int insn_size);
-
-               // <summary>
-               //   Check whether the instruction at target address @address 
is a `jump'
-               //   instruction and returns the destination of the call or 
TargetAddress.Null.
-               //
-               //   The out parameter @insn_size is set to the size on bytes 
of the jump
-               //   instructions.  This can be used to set a breakpoint 
immediately after
-               //   the jump.
-               // </summary>
-               TargetAddress GetJumpTarget (ITargetMemoryAccess target, 
TargetAddress address,
-                                            out int insn_size);
-
-               // <summary>
-               //   Check whether the instruction at target address @address 
is a trampoline method.
-               //   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>
-               TargetAddress GetTrampoline (ITargetMemoryAccess target, 
TargetAddress address,
-                                            TargetAddress 
generic_trampoline_address);
-
-               int MaxPrologueSize {
-                       get;
-               }
-
-               SimpleStackFrame UnwindStack (ITargetMemoryAccess memory,
-                                             SimpleStackFrame frame, Symbol 
name,
-                                             byte[] code);
-
-               SimpleStackFrame UnwindStack (ITargetMemoryAccess memory, 
TargetAddress stack,
-                                             TargetAddress frame_address);
-
-               SimpleStackFrame TrySpecialUnwind (ITargetMemoryAccess memory, 
SimpleStackFrame frame);
-       }
-}

Modified: trunk/debugger/interfaces/IMethod.cs
===================================================================
--- trunk/debugger/interfaces/IMethod.cs        2005-10-11 13:33:39 UTC (rev 
51568)
+++ trunk/debugger/interfaces/IMethod.cs        2005-10-11 13:35:09 UTC (rev 
51569)
@@ -159,7 +159,7 @@
 
                SimpleStackFrame UnwindStack (SimpleStackFrame frame,
                                              ITargetMemoryAccess memory,
-                                             IArchitecture arch);
+                                             Architecture arch);
 
                TargetVariable GetVariableByName (string name);
        }

Modified: trunk/debugger/interfaces/ITargetMemoryAccess.cs
===================================================================
--- trunk/debugger/interfaces/ITargetMemoryAccess.cs    2005-10-11 13:33:39 UTC 
(rev 51568)
+++ trunk/debugger/interfaces/ITargetMemoryAccess.cs    2005-10-11 13:35:09 UTC 
(rev 51569)
@@ -36,7 +36,7 @@
 
        public interface ITargetMemoryInfo : ITargetInfo
        {
-               IArchitecture Architecture {
+               Architecture Architecture {
                        get;
                }
 

Modified: trunk/debugger/languages/mono/MonoSymbolFile.cs
===================================================================
--- trunk/debugger/languages/mono/MonoSymbolFile.cs     2005-10-11 13:33:39 UTC 
(rev 51568)
+++ trunk/debugger/languages/mono/MonoSymbolFile.cs     2005-10-11 13:35:09 UTC 
(rev 51569)
@@ -31,7 +31,7 @@
                        get { return 20; }
                }
 
-               public VariableInfo (IArchitecture arch, TargetBinaryReader 
reader)
+               public VariableInfo (Architecture arch, TargetBinaryReader 
reader)
                {
                        Index = reader.ReadLeb128 ();
                        Offset = reader.ReadSLeb128 ();
@@ -127,7 +127,7 @@
                }
 
                public MethodAddress (C.MethodEntry entry, TargetBinaryReader 
reader,
-                                     AddressDomain domain, IArchitecture arch)
+                                     AddressDomain domain, Architecture arch)
                {
                        // here we read the MonoDebugMethodAddress structure
                        // as written out in mono_debug_add_method.
@@ -314,7 +314,7 @@
                        get { return this; }
                }
 
-               internal IArchitecture Architecture {
+               internal Architecture Architecture {
                        get { return TargetInfo.Architecture; }
                }
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to