* PEAPI.cs: Add generic method Mvar type. Add MethodSpec table,

	and an Api method for adding methods to the methodspec table.

svn path=/trunk/mcs/; revision=18797

mcs/class/PEAPI/ChangeLog

@@ -1,7 +1,12 @@
+2003-10-09 Jackson Harper <[email protected]>
+
+	* PEAPI.cs: Add generic method Mvar type. Add MethodSpec table,
+	and an Api method for adding methods to the methodspec table.
+	
 2003-10-08 Jackson Harper <[email protected]>
 
 	* PEAPI.cs: Remove some old hacks for adding methods to arrays,
-	typespecs are used for this now.
+	typespecs are used for this now. Add Generic call conv.
 	
 2003-10-08 Jackson Harper <[email protected]>
 

mcs/class/PEAPI/PEAPI.cs

@@ -95,6 +95,21 @@ namespace PEAPI
     public TypeSignatureException(string msg) : base(msg) { }
   }
 
+  public class MVar : Type {
+
+            private int index;
+
+            public MVar (int index) : base (0x1E) {
+                    this.index = index;
+                    tabIx = MDTable.TypeSpec;
+            }
+
+            internal sealed override void TypeSig(MemoryStream str) {
+                    str.WriteByte(typeIndex);
+                    MetaData.CompressNum ((uint) index, str);
+            }
+    }
+
     public class GenericTypeSpec : Type {
 
             private int index;
@@ -108,7 +123,7 @@ namespace PEAPI
                     str.WriteByte(typeIndex);
                     MetaData.CompressNum ((uint) index, str);
             }
-            }
+    }
 
   public class GenericTypeInst : Type {
 
@@ -4029,6 +4044,36 @@ if (rsrc != null)
 
 
         }
+
+        internal class MethodSpec : MetaDataElement
+        {
+                Method meth;
+                GenericTypeInst type_inst;
+                uint meth_idx;
+
+                internal MethodSpec (Method meth, GenericTypeInst type_inst) {
+                        this.meth = meth;
+                        this.type_inst = type_inst;
+                        tabIx = MDTable.MethodSpec;
+                }
+
+                internal sealed override void BuildTables (MetaData md) {
+                        if (done) return;
+                        meth_idx = meth.GetSigIx (md);
+                        done = true;
+                }
+
+                internal sealed override uint Size (MetaData md) {
+                        return (uint) (md.CodedIndexSize(CIx.MethodDefOrRef) +
+                                       md.BlobIndexSize ());
+                }
+
+                internal sealed override void Write (FileImage output) {
+                    output.WriteCodedIndex(CIx.MethodDefOrRef, meth);
+                    output.BlobIndex (meth_idx);
+                }
+        }
+
   /**************************************************************************/
         /// <summary>
         /// Descriptor for interface implemented by a class
@@ -4623,6 +4668,7 @@ if (rsrc != null)
       BuildTable(metaDataTables[(int)MDTable.TypeDef]);
       BuildTable(metaDataTables[(int)MDTable.MemberRef]);
       BuildTable(metaDataTables[(int)MDTable.GenericParam]);
+      BuildTable(metaDataTables[(int)MDTable.MethodSpec]);
       BuildTable(metaDataTables[(int)MDTable.GenericParamConstraint]);
       BuildTable(metaDataTables[(int)MDTable.CustomAttribute]);
 /*      for (int i=0; i < metaDataTables.Length; i++) {
@@ -5987,6 +6033,12 @@ if (rsrc != null)
             return field;
     }
 
+    public void AddMethodSpec (Method m, GenericTypeInst type_inst)
+    {
+            MethodSpec ms = new MethodSpec (m, type_inst);
+            metaData.AddToTable (MDTable.MethodSpec, ms);
+    }
+
     /// <summary>
     /// Add a "global" field to this module
     /// </summary>