Author: ankit
Date: 2006-02-19 05:40:06 -0500 (Sun, 19 Feb 2006)
New Revision: 57044

Modified:
   trunk/mcs/class/PEAPI/ChangeLog
   trunk/mcs/class/PEAPI/Metadata.cs
   trunk/mcs/ilasm/codegen/ChangeLog
   trunk/mcs/ilasm/codegen/CodeGen.cs
   trunk/mcs/ilasm/codegen/Module.cs
Log:
In ilasm/codegen:
        * CodeGen.cs (CodeGen.ThisModule): New.
        (CodeGen.Write): Set module name if not set by '.module' directive.
        * Module.cs: Inherit from ExternRef. 

In class/PEAPI:
        * Metadata.cs (Module): Implment IExternRef to allow reference to types
        in 'this' module.


Modified: trunk/mcs/class/PEAPI/ChangeLog
===================================================================
--- trunk/mcs/class/PEAPI/ChangeLog     2006-02-19 07:31:38 UTC (rev 57043)
+++ trunk/mcs/class/PEAPI/ChangeLog     2006-02-19 10:40:06 UTC (rev 57044)
@@ -1,3 +1,8 @@
+2006-02-19  Ankit Jain  <[EMAIL PROTECTED]>
+
+       * Metadata.cs (Module): Implment IExternRef to allow reference to types
+       in 'this' module.
+
 2006-02-15  Raja R Harinath  <[EMAIL PROTECTED]>
 
        * Metadata.cs (BoundArray.CompressSignedNum): Document the

Modified: trunk/mcs/class/PEAPI/Metadata.cs
===================================================================
--- trunk/mcs/class/PEAPI/Metadata.cs   2006-02-19 07:31:38 UTC (rev 57043)
+++ trunk/mcs/class/PEAPI/Metadata.cs   2006-02-19 10:40:06 UTC (rev 57044)
@@ -2510,7 +2510,7 @@
        /// <summary>
        /// Descriptor for THIS module
        /// </summary>
-       public class Module : ResolutionScope {
+       public class Module : ResolutionScope, IExternRef {
 
                Guid mvid;
                uint mvidIx = 0;
@@ -2526,6 +2526,21 @@
                        get { return mvid; }
                }
 
+               public ClassRef AddClass(string nsName, string name) 
+               {
+                       ClassRef aClass = new ClassRef (nsName, name, metaData);
+                       metaData.AddToTable (MDTable.TypeRef, aClass);
+                       aClass.SetParent (this);
+                       return aClass;
+               }
+
+               public ClassRef AddValueClass(string nsName, string name) 
+               {
+                       ClassRef aClass = AddClass (nsName, name);
+                       aClass.MakeValueClass (ValueClass.ValueType);
+                       return aClass;
+               }
+
                internal sealed override uint Size(MetaData md) 
                {
                        return 2 + md.StringsIndexSize() + 3 * 
md.GUIDIndexSize();

Modified: trunk/mcs/ilasm/codegen/ChangeLog
===================================================================
--- trunk/mcs/ilasm/codegen/ChangeLog   2006-02-19 07:31:38 UTC (rev 57043)
+++ trunk/mcs/ilasm/codegen/ChangeLog   2006-02-19 10:40:06 UTC (rev 57044)
@@ -1,3 +1,9 @@
+2006-02-19  Ankit Jain  <[EMAIL PROTECTED]>
+
+       * CodeGen.cs (CodeGen.ThisModule): New.
+       (CodeGen.Write): Set module name if not set by '.module' directive.
+       * Module.cs: Inherit from ExternRef. 
+
 2006-02-10  Ankit Jain  <[EMAIL PROTECTED]>
 
        * CodeGen.cs (CodeGen.ResolveMethod): Throw exception if global method

Modified: trunk/mcs/ilasm/codegen/CodeGen.cs
===================================================================
--- trunk/mcs/ilasm/codegen/CodeGen.cs  2006-02-19 07:31:38 UTC (rev 57043)
+++ trunk/mcs/ilasm/codegen/CodeGen.cs  2006-02-19 10:40:06 UTC (rev 57044)
@@ -278,6 +278,10 @@
                         return (name == assembly_name);
                 }
 
+                public Module ThisModule {
+                        get { return this_module; }
+                }
+                
                 public bool IsThisModule (string name)
                 {
                         return (this_module != null && name == 
this_module.Name);
@@ -494,10 +498,15 @@
                                 if (!is_dll && !HasEntryPoint)
                                         throw new Exception ("No EntryPoint 
found.");
 
+                                if (ThisModule == null)
+                                        this_module = new Module (output_file);
+
                                 out_stream = new FileStream (output_file, 
FileMode.Create, FileAccess.Write);
-                                pefile = new PEFile (assembly_name, 
(this_module != null ? this_module.Name : ""), is_dll, is_assembly, null, 
out_stream);
+                                pefile = new PEFile (assembly_name, 
ThisModule.Name, is_dll, is_assembly, null, out_stream);
                                 PEAPI.Assembly asmb = pefile.GetThisAssembly 
();
 
+                                ThisModule.PeapiModule = pefile.GetThisModule 
();
+
                                 if (file_ref != null)
                                         file_ref.Resolve (this);
 
@@ -526,8 +535,7 @@
                                                 cattr.AddTo (this, asmb);
                                 }
 
-                                if (this_module != null)
-                                        this_module.Resolve (this, 
pefile.GetThisModule ());
+                                ThisModule.Resolve (this, pefile.GetThisModule 
());
 
                                 if (assembly_declsec != null)
                                         assembly_declsec.AddTo (this, asmb);   
     

Modified: trunk/mcs/ilasm/codegen/Module.cs
===================================================================
--- trunk/mcs/ilasm/codegen/Module.cs   2006-02-19 07:31:38 UTC (rev 57043)
+++ trunk/mcs/ilasm/codegen/Module.cs   2006-02-19 10:40:06 UTC (rev 57044)
@@ -12,30 +12,42 @@
 
 namespace Mono.ILASM {
 
-        public class Module : ICustomAttrTarget {
-                string name;
-                ArrayList customattr_list;
+        public class Module : ExternRef {
 
+                PEAPI.Module module;
+
                 public Module (string name)
+                        : base (name)
                 {
-                        this.name = name;
-                        customattr_list = null;
                 }
 
-                public string Name {
-                        get { return name; }
+                public PEAPI.Module PeapiModule {
+                        get { return module; }
+                        set { module = value; }
                 }
 
-                public void AddCustomAttribute (CustomAttr customattr)
+                public override string FullName {
+                        get { 
+                                //'name' field should not contain the [ ]
+                                //as its used for resolving
+                                return String.Format ("[{0}]", name); 
+                        }
+                }
+
+                public override PEAPI.IExternRef GetExternRef ()
                 {
-                        if (customattr_list == null)
-                                customattr_list = new ArrayList ();
+                        return module;
+                }
 
-                        customattr_list.Add (customattr);
+                public override void Resolve (CodeGen code_gen)
+                {
+                        throw new Exception ("This should not get called");
                 }
 
                 public void Resolve (CodeGen code_gen, PEAPI.Module module)
                 {
+                        this.module = module;
+
                         if (customattr_list == null)
                                 return;
 

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

Reply via email to