2010-02-03 Sebastien Pouliot <sebastien@ximian.com>

[mono.git] / mcs / class / PEAPI / Metadata.cs

diff --git a/mcs/class/PEAPI/Metadata.cs b/mcs/class/PEAPI/Metadata.cs
index cd580be3d590ce8b98cbe1c2c8761c087a75c8f3..49ed4dc52331de7a14edb01a82f4c05dc2464089 100644 (file)
--- a/mcs/class/PEAPI/Metadata.cs
+++ b/mcs/class/PEAPI/Metadata.cs
@@ -29,7 +29,7 @@ namespace PEAPI {
        /// <summary>
        /// Attributes for this assembly
        /// </summary>
-       public enum AssemAttr { EnableJITCompileTracking = 0x8000, 
+       public enum AssemAttr { Retargetable = 0x100, EnableJITCompileTracking = 0x8000, 
                DisableJITCompileOptimizer = 0x4000}
 
        /// <summary>
@@ -72,7 +72,7 @@ namespace PEAPI {
                Family, FamOrAssem, Public, Static = 0x0010, PublicStatic = 0x16, 
                Final = 0x0020, PublicStaticFinal = 0x36, Virtual = 0x0040, 
                PrivateVirtual, PublicVirtual = 0x0046, HideBySig = 0x0080, 
-               NewSlot = 0x0100, Abstract = 0x0400, SpecialName = 0x0800,
+               NewSlot = 0x0100, Strict = 0x200, Abstract = 0x0400, SpecialName = 0x0800,
                RTSpecialName = 0x1000, SpecialRTSpecialName = 0x1800, 
                HasSecurity = 0x4000, RequireSecObject = 0x8000}
 
@@ -242,6 +242,8 @@ namespace PEAPI {
                protected bool done = false;
                protected MDTable tabIx;
                protected bool sortTable = false;
+               //Temporary hack.. 
+               private bool has_custom_attrs = false;
 
                internal MetaDataElement() { }
 
@@ -254,6 +256,11 @@ namespace PEAPI {
                        }
                }
 
+               public bool HasCustomAttr {
+                       get { return has_custom_attrs; }
+                       set { has_custom_attrs = value; }
+               }
+
                internal virtual uint GetCodedIx(CIx code) { return 0; }
 
                /// <summary>
@@ -464,9 +471,14 @@ namespace PEAPI {
 
                internal sealed override void BuildTables(MetaData md) 
                {
+                       md.AddToTable(MDTable.CustomAttribute, this);
+                       if (byteVal == null) {
+                               valIx = 0;
+                               return;
+                       }
+
                        BinaryWriter bw = new BinaryWriter(new MemoryStream());
                        bw.Write(byteVal);
-                       md.AddToTable(MDTable.CustomAttribute, this);
                        MemoryStream str = (MemoryStream)bw.BaseStream;
                        valIx = md.AddToBlobHeap(str.ToArray());
                }
@@ -1328,6 +1340,10 @@ namespace PEAPI {
                        tabIx = MDTable.Param;
                }
 
+               public bool HasMarshalInfo {
+                       get { return marshalInfo != null; }
+               }
+
                /// <summary>
                /// Add a default value to this parameter
                /// </summary>
@@ -1688,9 +1704,14 @@ namespace PEAPI {
                /// <param name="pars">parameters</param>
                /// <returns>a descriptor for this new method</returns>
                public MethodDef AddMethod(string name, Type retType, Param[] pars) 
+               {
+                       return AddMethod (name, new Param (ParamAttr.Default, "", retType), pars);
+               }
+
+               public MethodDef AddMethod (string name, Param ret_param, Param [] pars) 
                {
                        // Console.WriteLine("Adding method " + name + " to class " + this.name);
-                       MethodDef meth = new MethodDef(metaData,name,retType, pars);
+                       MethodDef meth = new MethodDef(metaData,name, ret_param, pars);
                        methods.Add(meth);
                        return meth;
                }
@@ -1705,9 +1726,9 @@ namespace PEAPI {
                /// <param name="pars">parameters</param>
                /// <returns>a descriptor for this new method</returns>
                public MethodDef AddMethod(MethAttr mAtts, ImplAttr iAtts, string name, 
-                               Type retType, Param[] pars) {
+                               Param ret_param, Param [] pars) {
                        // Console.WriteLine("Adding method " + name + " to class " + this.name);
-                       MethodDef meth = new MethodDef(metaData,mAtts,iAtts,name,retType,pars);
+                       MethodDef meth = new MethodDef (metaData, mAtts, iAtts, name, ret_param, pars);
                        methods.Add(meth);
                        return meth;
                }
@@ -3800,7 +3821,6 @@ namespace PEAPI {
                // private static readonly byte LocalSigByte = 0x7;
                uint parIx = 0, textOffset = 0;
                private CallConv callConv = CallConv.Default;
-               private Type retType;
                private int gen_param_count;
 
                MetaData metaData;
@@ -3817,21 +3837,23 @@ namespace PEAPI {
                ImplMap pinvokeImpl;
                Param ret_param;
 
-
-               internal MethodDef(MetaData md, string name, Type retType, Param[] pars) : base (name)
+               internal MethodDef (MetaData md, string name, Param ret_param, Param [] pars)
+                       : this (md, 0, 0, name, ret_param, pars)
                {
-                       this.retType = retType;
-                       metaData = md;
-                       parList = pars;
-                       if (parList != null) numPars = parList.Length;
-                       tabIx = MDTable.Method;
                }
 
                internal MethodDef (MetaData md, MethAttr mAttrSet, ImplAttr iAttrSet, string name, 
-                               Type retType, Param [] pars) : this (md, name, retType, pars)
+                               Param ret_param, Param [] pars) 
+                       : base (name)
                {
                        methFlags = (ushort)mAttrSet;
                        implFlags = (ushort)iAttrSet;
+                       this.ret_param = ret_param;
+                       metaData = md;
+                       parList = pars;
+                       if (parList != null) 
+                               numPars = parList.Length;
+                       tabIx = MDTable.Method;
                }
 
                internal Param[] GetPars() 
@@ -3917,7 +3939,6 @@ namespace PEAPI {
                /* Add Marshal info for return type */
                public void AddRetTypeMarshallInfo (NativeType marshallType) 
                {
-                       ret_param = new Param (ParamAttr.HasFieldMarshal, "", retType);
                        ret_param.AddMarshallInfo (marshallType);
                }
 
@@ -3952,7 +3973,7 @@ namespace PEAPI {
                        for (int i=0; i < numPars; i++) {
                                pars[i] = parList[i].GetParType();
                        }
-                       varArgSig = new MethodRef(this,name,retType,pars,true,optPars, 0);
+                       varArgSig = new MethodRef (this, name, ret_param.GetParType (), pars, true, optPars, 0);
 
                        if (varArgSigList == null)
                                varArgSigList = new ArrayList ();
@@ -3966,9 +3987,9 @@ namespace PEAPI {
                        if ((callConv & CallConv.Generic) == CallConv.Generic)
                                MetaData.CompressNum ((uint) gen_param_count, sig);
                        MetaData.CompressNum((uint)numPars,sig);
-                       if (ret_param != null)
-                               ret_param.seqNo = 0;
-                       retType.TypeSig(sig);
+
+                       ret_param.seqNo = 0;
+                       ret_param.TypeSig (sig);
                        for (ushort i=0; i < numPars; i++) {
                                parList[i].seqNo = (ushort)(i+1);
                                parList[i].TypeSig(sig);
@@ -3997,7 +4018,7 @@ namespace PEAPI {
                        nameIx = md.AddToStringsHeap(name);
                        sigIx = GetSigIx(md);
                        parIx = md.TableIndex(MDTable.Param);
-                       if (ret_param != null) {
+                       if (ret_param.HasMarshalInfo || ret_param.HasCustomAttr) {
                                md.AddToTable(MDTable.Param, ret_param);
                                ret_param.BuildTables(md);
                        }
@@ -4524,6 +4545,11 @@ namespace PEAPI {
                        tabIx = MDTable.AssemblyRef;
                }
 
+               public void AddAssemblyAttr (AssemAttr aa)
+               {
+                       flags |= (uint)aa;
+               }
+
                /// <summary>
                /// Add version information about this external assembly
                /// </summary>