Author: martin
Date: 2007-10-15 18:52:08 -0400 (Mon, 15 Oct 2007)
New Revision: 87546
Removed:
trunk/debugger/backend/ILanguageBackend.cs
Modified:
trunk/debugger/ChangeLog
trunk/debugger/backend/ProcessServant.cs
trunk/debugger/backend/SingleSteppingEngine.cs
trunk/debugger/backend/StepFrame.cs
trunk/debugger/backend/arch/Bfd.cs
trunk/debugger/backend/arch/BfdContainer.cs
trunk/debugger/classes/Module.cs
trunk/debugger/languages/mono/MonoLanguageBackend.cs
trunk/debugger/languages/mono/MonoSymbolFile.cs
Log:
2007-10-16 Martin Baulig <[EMAIL PROTECTED]>
* backend/ILanguageBackend.cs: Removed.
(ILanguageBackend): Removed.
Modified: trunk/debugger/ChangeLog
===================================================================
--- trunk/debugger/ChangeLog 2007-10-15 22:42:02 UTC (rev 87545)
+++ trunk/debugger/ChangeLog 2007-10-15 22:52:08 UTC (rev 87546)
@@ -1,5 +1,10 @@
2007-10-16 Martin Baulig <[EMAIL PROTECTED]>
+ * backend/ILanguageBackend.cs: Removed.
+ (ILanguageBackend): Removed.
+
+2007-10-16 Martin Baulig <[EMAIL PROTECTED]>
+
* backend/ILanguageBackend.cs
(NotificationType): Moved into MonoThreadManager.cs.
Deleted: trunk/debugger/backend/ILanguageBackend.cs
===================================================================
--- trunk/debugger/backend/ILanguageBackend.cs 2007-10-15 22:42:02 UTC (rev
87545)
+++ trunk/debugger/backend/ILanguageBackend.cs 2007-10-15 22:52:08 UTC (rev
87546)
@@ -1,16 +0,0 @@
-using System;
-using Mono.Debugger.Languages;
-
-namespace Mono.Debugger.Backends
-{
- internal interface ILanguageBackend : IDisposable
- {
- string Name {
- get;
- }
-
- Language Language {
- get;
- }
- }
-}
Modified: trunk/debugger/backend/ProcessServant.cs
===================================================================
--- trunk/debugger/backend/ProcessServant.cs 2007-10-15 22:42:02 UTC (rev
87545)
+++ trunk/debugger/backend/ProcessServant.cs 2007-10-15 22:52:08 UTC (rev
87546)
@@ -23,7 +23,6 @@
DebuggerSession session;
protected MonoLanguageBackend mono_language;
protected ThreadServant main_thread;
- ArrayList languages;
Hashtable thread_hash;
ThreadDB thread_db;
@@ -61,7 +60,6 @@
symtab_manager = new SymbolTableManager (session);
- languages = new ArrayList ();
bfd_container = new BfdContainer (this);
session.OnProcessCreated (client);
@@ -79,7 +77,6 @@
symtab_manager = parent.symtab_manager;
- languages = parent.languages;
bfd_container = parent.bfd_container;
}
@@ -137,15 +134,6 @@
get { return start; }
}
- internal void AddLanguage (ILanguageBackend language)
- {
- languages.Add (language);
- }
-
- internal ArrayList Languages {
- get { return languages; }
- }
-
internal MonoThreadManager MonoManager {
get { return mono_manager; }
}
@@ -215,9 +203,8 @@
if (bfd_container != null)
bfd_container.Dispose ();
- if (languages != null)
- foreach (ILanguageBackend lang in
languages)
- lang.Dispose();
+ if (mono_language != null)
+ mono_language.Dispose();
if (symtab_manager != null)
symtab_manager.Dispose ();
@@ -233,7 +220,6 @@
symtab_manager = new SymbolTableManager (session);
- languages = new ArrayList ();
bfd_container = new BfdContainer (this);
Inferior new_inferior = Inferior.CreateInferior
(manager, this, start);
@@ -456,8 +442,6 @@
internal MonoLanguageBackend CreateMonoLanguage
(MonoDebuggerInfo info)
{
mono_language = new MonoLanguageBackend (this, info);
- languages.Add (mono_language);
-
return mono_language;
}
@@ -618,10 +602,9 @@
bfd_container = null;
}
- if (languages != null) {
- foreach (ILanguageBackend lang in
languages)
- lang.Dispose();
- languages = null;
+ if (mono_language != null) {
+ mono_language.Dispose();
+ mono_language = null;
}
if (symtab_manager != null) {
Modified: trunk/debugger/backend/SingleSteppingEngine.cs
===================================================================
--- trunk/debugger/backend/SingleSteppingEngine.cs 2007-10-15 22:42:02 UTC
(rev 87545)
+++ trunk/debugger/backend/SingleSteppingEngine.cs 2007-10-15 22:52:08 UTC
(rev 87546)
@@ -1071,7 +1071,7 @@
if (method.WrapperType != WrapperType.None)
return new OperationWrapper (this, method,
operation.Result);
- ILanguageBackend language =
method.Module.LanguageBackend;
+ Language language = method.Module.Language;
if (source == null)
return null;
@@ -1270,7 +1270,7 @@
{
check_inferior ();
StackFrame frame = current_frame;
- ILanguageBackend language = (frame.Method != null) ?
frame.Method.Module.LanguageBackend : null;
+ Language language = (frame.Method != null) ?
frame.Method.Module.Language : null;
if (frame.SourceAddress == null)
return new StepFrame (language,
StepMode.SingleInstruction);
@@ -1294,7 +1294,8 @@
StepFrame CreateStepFrame (StepMode mode)
{
check_inferior ();
- ILanguageBackend language = (current_method != null) ?
current_method.Module.LanguageBackend : null;
+ Language language = (current_method != null) ?
+ current_method.Module.Language : null;
return new StepFrame (language, mode);
}
Modified: trunk/debugger/backend/StepFrame.cs
===================================================================
--- trunk/debugger/backend/StepFrame.cs 2007-10-15 22:42:02 UTC (rev 87545)
+++ trunk/debugger/backend/StepFrame.cs 2007-10-15 22:52:08 UTC (rev 87546)
@@ -2,6 +2,9 @@
using System.IO;
using System.Text;
+using Mono.Debugger;
+using Mono.Debugger.Languages;
+
namespace Mono.Debugger.Backends
{
internal enum StepMode
@@ -46,16 +49,16 @@
internal sealed class StepFrame
{
TargetAddress start, end;
- ILanguageBackend language;
+ Language language;
StackFrame stack;
StepMode mode;
- internal StepFrame (ILanguageBackend language, StepMode mode)
+ internal StepFrame (Language language, StepMode mode)
: this (TargetAddress.Null, TargetAddress.Null, null,
language, mode)
{ }
internal StepFrame (TargetAddress start, TargetAddress end,
StackFrame stack,
- ILanguageBackend language, StepMode mode)
+ Language language, StepMode mode)
{
this.start = start;
this.end = end;
@@ -88,7 +91,7 @@
}
}
- internal ILanguageBackend Language {
+ public Language Language {
get {
return language;
}
Modified: trunk/debugger/backend/arch/Bfd.cs
===================================================================
--- trunk/debugger/backend/arch/Bfd.cs 2007-10-15 22:42:02 UTC (rev 87545)
+++ trunk/debugger/backend/arch/Bfd.cs 2007-10-15 22:52:08 UTC (rev 87546)
@@ -11,7 +11,7 @@
{
internal delegate void BfdDisposedHandler (Bfd bfd);
- internal class Bfd : SymbolFile, ISymbolContainer, ILanguageBackend
+ internal class Bfd : SymbolFile, ISymbolContainer
{
IntPtr bfd;
protected Module module;
@@ -536,12 +536,6 @@
}
}
- internal override ILanguageBackend LanguageBackend {
- get {
- return this;
- }
- }
-
internal DwarfReader DwarfReader {
get { return dwarf; }
}
@@ -940,16 +934,6 @@
}
}
- //
- // ILanguageBackend
- //
-
- string ILanguageBackend.Name {
- get {
- return "Native";
- }
- }
-
internal bool GetTrampoline (TargetMemoryAccess memory,
TargetAddress call_site,
TargetAddress call_target,
Modified: trunk/debugger/backend/arch/BfdContainer.cs
===================================================================
--- trunk/debugger/backend/arch/BfdContainer.cs 2007-10-15 22:42:02 UTC (rev
87545)
+++ trunk/debugger/backend/arch/BfdContainer.cs 2007-10-15 22:52:08 UTC (rev
87546)
@@ -67,11 +67,7 @@
return bfd;
bfd = new Bfd (this, memory, filename, main_bfd,
base_address, is_loaded);
-
bfd_hash.Add (filename, bfd);
-
- process.AddLanguage (bfd);
-
return bfd;
}
Modified: trunk/debugger/classes/Module.cs
===================================================================
--- trunk/debugger/classes/Module.cs 2007-10-15 22:42:02 UTC (rev 87545)
+++ trunk/debugger/classes/Module.cs 2007-10-15 22:52:08 UTC (rev 87546)
@@ -41,10 +41,6 @@
get;
}
- internal abstract ILanguageBackend LanguageBackend {
- get;
- }
-
public abstract bool SymbolsLoaded {
get;
}
@@ -283,10 +279,6 @@
get { return SymbolFile.Language; }
}
- internal ILanguageBackend LanguageBackend {
- get { return SymbolFile.LanguageBackend; }
- }
-
internal SymbolFile SymbolFile {
get {
if (symfile != null)
Modified: trunk/debugger/languages/mono/MonoLanguageBackend.cs
===================================================================
--- trunk/debugger/languages/mono/MonoLanguageBackend.cs 2007-10-15
22:42:02 UTC (rev 87545)
+++ trunk/debugger/languages/mono/MonoLanguageBackend.cs 2007-10-15
22:52:08 UTC (rev 87546)
@@ -192,7 +192,7 @@
}
}
- internal class MonoLanguageBackend : Language, ILanguageBackend
+ internal class MonoLanguageBackend : Language
{
Hashtable symfile_by_index;
int last_num_symbol_files;
@@ -239,10 +239,6 @@
get { return info.MonoMetadataInfo; }
}
- Language ILanguageBackend.Language {
- get { return this; }
- }
-
internal MonoBuiltinTypeInfo BuiltinTypes {
get { return builtin_types; }
}
@@ -914,7 +910,6 @@
}
#endregion
-#region ILanguageBackend implementation
public TargetAddress RuntimeInvokeFunc {
get { return info.RuntimeInvoke; }
}
@@ -1038,7 +1033,6 @@
return true;
}
-#endregion
private bool disposed = false;
Modified: trunk/debugger/languages/mono/MonoSymbolFile.cs
===================================================================
--- trunk/debugger/languages/mono/MonoSymbolFile.cs 2007-10-15 22:42:02 UTC
(rev 87545)
+++ trunk/debugger/languages/mono/MonoSymbolFile.cs 2007-10-15 22:52:08 UTC
(rev 87546)
@@ -335,10 +335,6 @@
get { return MonoLanguage; }
}
- internal override ILanguageBackend LanguageBackend {
- get { return MonoLanguage; }
- }
-
public override bool SymbolsLoaded {
get { return true; }
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
