Author: martin
Date: 2007-09-27 05:06:50 -0400 (Thu, 27 Sep 2007)
New Revision: 86467
Added:
trunk/debugger/languages/mono/MonoVoidType.cs
Removed:
trunk/debugger/languages/mono/MonoOpaqueType.cs
Modified:
trunk/debugger/ChangeLog
trunk/debugger/languages/mono/MonoLanguageBackend.cs
trunk/debugger/languages/mono/MonoObjectType.cs
Log:
2007-09-27 Martin Baulig <[EMAIL PROTECTED]>
* languages/mono/MonoObjectType.cs
(MonoObjectType): Replace the public .ctor with a static
Create() method.
* languages/mono/MonoOpaqueType.cs: Renamed into MonoVoidType.cs
(MonoOpaqueType): Renamed into `MonoVoidType'.
Modified: trunk/debugger/ChangeLog
===================================================================
--- trunk/debugger/ChangeLog 2007-09-27 08:56:27 UTC (rev 86466)
+++ trunk/debugger/ChangeLog 2007-09-27 09:06:50 UTC (rev 86467)
@@ -1,5 +1,14 @@
2007-09-27 Martin Baulig <[EMAIL PROTECTED]>
+ * languages/mono/MonoObjectType.cs
+ (MonoObjectType): Replace the public .ctor with a static
+ Create() method.
+
+ * languages/mono/MonoOpaqueType.cs: Renamed into MonoVoidType.cs
+ (MonoOpaqueType): Renamed into `MonoVoidType'.
+
+2007-09-27 Martin Baulig <[EMAIL PROTECTED]>
+
* languages/mono/MonoType.cs
(MonoType.Read): Renamed into ReadType().
(MonoType.ReadMonoClass): New public static method.
Modified: trunk/debugger/languages/mono/MonoLanguageBackend.cs
===================================================================
--- trunk/debugger/languages/mono/MonoLanguageBackend.cs 2007-09-27
08:56:27 UTC (rev 86466)
+++ trunk/debugger/languages/mono/MonoLanguageBackend.cs 2007-09-27
09:06:50 UTC (rev 86467)
@@ -23,7 +23,7 @@
public readonly MonoSymbolFile Corlib;
public readonly MonoObjectType ObjectType;
public readonly MonoFundamentalType ByteType;
- public readonly MonoOpaqueType VoidType;
+ public readonly MonoVoidType VoidType;
public readonly MonoFundamentalType BooleanType;
public readonly MonoFundamentalType SByteType;
public readonly MonoFundamentalType Int16Type;
@@ -50,19 +50,10 @@
TargetReader mono_defaults = new TargetReader (
memory.ReadMemory (info.MonoDefaultsAddress,
info.MonoDefaultsSize));
- MonoLanguageBackend language = corlib.MonoLanguage;
- mono_defaults.Offset = info.MonoDefaultsObjectOffset;
- TargetAddress klass = mono_defaults.ReadAddress ();
- int object_size = 2 *
corlib.TargetInfo.TargetAddressSize;
- Cecil.TypeDefinition object_type =
corlib.ModuleDefinition.Types ["System.Object"];
- ObjectType = new MonoObjectType (corlib, object_type,
object_size);
- language.AddCoreType (object_type, ObjectType,
ObjectType.MonoClassType, klass);
+ MonoLanguageBackend mono = corlib.MonoLanguage;
- mono_defaults.Offset = info.MonoDefaultsVoidOffset;
- klass = mono_defaults.ReadAddress ();
- Cecil.TypeDefinition void_type =
corlib.ModuleDefinition.Types ["System.Void"];
- VoidType = new MonoOpaqueType (corlib, void_type);
- language.AddCoreType (void_type, VoidType,
VoidType.ClassType, klass);
+ ObjectType = MonoObjectType.Create (corlib, memory,
mono_defaults);
+ VoidType = MonoVoidType.Create (corlib, memory,
mono_defaults);
StringType = MonoStringType.Create (corlib, memory,
mono_defaults);
@@ -95,24 +86,24 @@
corlib, memory, mono_defaults,
FundamentalKind.UIntPtr);
mono_defaults.Offset = info.MonoDefaultsArrayOffset;
- klass = mono_defaults.ReadAddress ();
+ TargetAddress klass = mono_defaults.ReadAddress ();
Cecil.TypeDefinition array_type =
corlib.ModuleDefinition.Types ["System.Array"];
- MonoClassInfo array_info = language.CreateClassInfo
(corlib, array_type, memory, klass);
+ MonoClassInfo array_info = mono.CreateClassInfo
(corlib, array_type, memory, klass);
ArrayType = array_info.ClassType;
- language.AddCoreType (array_type, ArrayType, ArrayType,
klass);
+ mono.AddCoreType (array_type, ArrayType, ArrayType,
klass);
mono_defaults.Offset = info.MonoDefaultsDelegateOffset;
klass = mono_defaults.ReadAddress ();
Cecil.TypeDefinition delegate_type =
corlib.ModuleDefinition.Types ["System.Delegate"];
DelegateType = new MonoClassType (corlib,
delegate_type);
- language.AddCoreType (delegate_type, DelegateType,
DelegateType, klass);
+ mono.AddCoreType (delegate_type, DelegateType,
DelegateType, klass);
mono_defaults.Offset = info.MonoDefaultsExceptionOffset;
klass = mono_defaults.ReadAddress ();
Cecil.TypeDefinition exception_type =
corlib.ModuleDefinition.Types ["System.Exception"];
- MonoClassInfo exception_info = language.CreateClassInfo
(corlib, exception_type, memory, klass);
+ MonoClassInfo exception_info = mono.CreateClassInfo
(corlib, exception_type, memory, klass);
ExceptionType = exception_info.ClassType;
- language.AddCoreType (exception_type, ExceptionType,
ExceptionType, klass);
+ mono.AddCoreType (exception_type, ExceptionType,
ExceptionType, klass);
}
}
Modified: trunk/debugger/languages/mono/MonoObjectType.cs
===================================================================
--- trunk/debugger/languages/mono/MonoObjectType.cs 2007-09-27 08:56:27 UTC
(rev 86466)
+++ trunk/debugger/languages/mono/MonoObjectType.cs 2007-09-27 09:06:50 UTC
(rev 86467)
@@ -1,4 +1,5 @@
using System;
+using Mono.Debugger.Backends;
using Cecil = Mono.Cecil;
namespace Mono.Debugger.Languages.Mono
@@ -6,16 +7,40 @@
internal class MonoObjectType : TargetObjectType
{
MonoSymbolFile file;
+ Cecil.TypeDefinition typedef;
+ MonoClassInfo class_info;
MonoClassType class_type;
- public MonoObjectType (MonoSymbolFile file,
Cecil.TypeDefinition typedef, int size)
+ protected MonoObjectType (MonoSymbolFile file,
Cecil.TypeDefinition typedef, int size)
: base (file.MonoLanguage, "object", size)
{
this.file = file;
+ this.typedef = typedef;
+ }
- class_type = new MonoClassType (file, typedef);
+ public static MonoObjectType Create (MonoSymbolFile corlib,
TargetMemoryAccess memory,
+ TargetReader mono_defaults)
+ {
+ int object_size = 2 *
memory.TargetInfo.TargetAddressSize;
+
+ MonoObjectType type = new MonoObjectType (
+ corlib, corlib.ModuleDefinition.Types
["System.Object"],
+ object_size);
+
+ TargetAddress klass = mono_defaults.PeekAddress (
+
corlib.MonoLanguage.MonoMetadataInfo.MonoDefaultsObjectOffset);
+ type.create_type (memory, klass);
+
+ return type;
}
+ protected void create_type (TargetMemoryAccess memory,
TargetAddress klass)
+ {
+ class_info = file.MonoLanguage.CreateClassInfo (file,
typedef, memory, klass);
+ class_type = new MonoClassType (file, typedef,
class_info);
+ file.MonoLanguage.AddCoreType (typedef, this,
class_type, klass);
+ }
+
public MonoSymbolFile File {
get { return file; }
}
Deleted: trunk/debugger/languages/mono/MonoOpaqueType.cs
===================================================================
--- trunk/debugger/languages/mono/MonoOpaqueType.cs 2007-09-27 08:56:27 UTC
(rev 86466)
+++ trunk/debugger/languages/mono/MonoOpaqueType.cs 2007-09-27 09:06:50 UTC
(rev 86467)
@@ -1,53 +0,0 @@
-using System;
-using Cecil = Mono.Cecil;
-
-namespace Mono.Debugger.Languages.Mono
-{
- internal class MonoOpaqueType : TargetType
- {
- Cecil.TypeDefinition typedef;
- MonoClassType class_type;
-
- public MonoOpaqueType (MonoSymbolFile file,
Cecil.TypeDefinition typedef)
- : base (file.MonoLanguage, TargetObjectKind.Unknown)
- {
- this.typedef = typedef;
-
- class_type = new MonoClassType (file, typedef);
- }
-
- public override bool HasClassType {
- get { return true; }
- }
-
- public override TargetClassType ClassType {
- get { return class_type; }
- }
-
- public Cecil.TypeReference Type {
- get { return typedef; }
- }
-
- public override string Name {
- get { return typedef.FullName; }
- }
-
- public override bool IsByRef {
- get { return false; }
- }
-
- public override bool HasFixedSize {
- get { return false; }
- }
-
- public override int Size {
- get { return 0; }
- }
-
- protected override TargetObject DoGetObject (TargetLocation
location)
- {
- throw new TargetException (TargetError.LocationInvalid,
- "Cannot access variables of
type `{0}'", Name);
- }
- }
-}
Copied: trunk/debugger/languages/mono/MonoVoidType.cs (from rev 86458,
trunk/debugger/languages/mono/MonoOpaqueType.cs)
===================================================================
--- trunk/debugger/languages/mono/MonoOpaqueType.cs 2007-09-27 04:06:26 UTC
(rev 86458)
+++ trunk/debugger/languages/mono/MonoVoidType.cs 2007-09-27 09:06:50 UTC
(rev 86467)
@@ -0,0 +1,75 @@
+using System;
+using Mono.Debugger.Backends;
+using Cecil = Mono.Cecil;
+
+namespace Mono.Debugger.Languages.Mono
+{
+ internal class MonoVoidType : TargetType
+ {
+ MonoSymbolFile file;
+ Cecil.TypeDefinition typedef;
+ MonoClassInfo class_info;
+ MonoClassType class_type;
+
+ protected MonoVoidType (MonoSymbolFile file,
Cecil.TypeDefinition typedef)
+ : base (file.MonoLanguage, TargetObjectKind.Unknown)
+ {
+ this.file = file;
+ this.typedef = typedef;
+ }
+
+ public static MonoVoidType Create (MonoSymbolFile corlib,
TargetMemoryAccess memory,
+ TargetReader mono_defaults)
+ {
+ MonoVoidType type = new MonoVoidType (
+ corlib, corlib.ModuleDefinition.Types
["System.Void"]);
+
+ TargetAddress klass = mono_defaults.PeekAddress (
+
corlib.MonoLanguage.MonoMetadataInfo.MonoDefaultsVoidOffset);
+ type.create_type (memory, klass);
+
+ return type;
+ }
+
+ protected void create_type (TargetMemoryAccess memory,
TargetAddress klass)
+ {
+ class_info = file.MonoLanguage.CreateClassInfo (file,
typedef, memory, klass);
+ class_type = new MonoClassType (file, typedef,
class_info);
+ file.MonoLanguage.AddCoreType (typedef, this,
class_type, klass);
+ }
+
+ public override bool HasClassType {
+ get { return true; }
+ }
+
+ public override TargetClassType ClassType {
+ get { return class_type; }
+ }
+
+ public Cecil.TypeReference Type {
+ get { return typedef; }
+ }
+
+ public override string Name {
+ get { return typedef.FullName; }
+ }
+
+ public override bool IsByRef {
+ get { return false; }
+ }
+
+ public override bool HasFixedSize {
+ get { return false; }
+ }
+
+ public override int Size {
+ get { return 0; }
+ }
+
+ protected override TargetObject DoGetObject (TargetLocation
location)
+ {
+ throw new TargetException (TargetError.LocationInvalid,
+ "Cannot access variables of
type `{0}'", Name);
+ }
+ }
+}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches