PERWAPI/..svnbridge/Blank.pdb

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><ItemProperties xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><Properties><Property><Name>svn:mime-type</Name><Value>application/octet-stream</Value></Property></Properties></ItemProperties>

PERWAPI/CILWriter.cs

@@ -0,0 +1,126 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Diagnostics;
+using System.Collections;
+
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    // Class to Write CIL File
+    /**************************************************************************/
+    public class CILWriter : StreamWriter
+    {
+        PEFile pefile;
+        ArrayList externRefs = new ArrayList();
+        FieldDef[] fields;
+        MethodDef[] methods;
+        ClassDef[] classes;
+        private bool debug;
+
+        public CILWriter(string filename, bool debug, PEFile pefile)
+            : base(new FileStream(filename, FileMode.Create))
+        {
+            this.pefile = pefile;
+            WriteLine("// ILASM output by PERWAPI");
+            WriteLine("// for file <" + pefile.GetFileName() + ">");
+        }
+
+        internal void AddRef(ReferenceScope refScope)
+        {
+            if (!externRefs.Contains(refScope))
+            {
+                externRefs.Add(refScope);
+            }
+        }
+
+        internal bool Debug
+        {
+            get { return debug; }
+        }
+
+        internal void BuildCILInfo()
+        {
+            fields = pefile.GetFields();
+            methods = pefile.GetMethods();
+            classes = pefile.GetClasses();
+            if (fields != null)
+            {
+                for (int i = 0; i < fields.Length; i++)
+                {
+                    fields[i].BuildCILInfo(this);
+                }
+            }
+            if (methods != null)
+            {
+                for (int i = 0; i < methods.Length; i++)
+                {
+                    methods[i].BuildCILInfo(this);
+                }
+            }
+            if (classes != null)
+            {
+                for (int i = 0; i < classes.Length; i++)
+                {
+                    classes[i].BuildCILInfo(this);
+                }
+            }
+        }
+
+        public void WriteFile(bool debug)
+        {
+            this.debug = debug;
+            for (int i = 0; i < externRefs.Count; i++)
+            {
+                ((ReferenceScope)externRefs[i]).Write(this);
+            }
+            Assembly assem = pefile.GetThisAssembly();
+            if (assem != null)
+            {
+                assem.Write(this);
+            }
+            WriteLine(".module " + pefile.GetFileName());
+            if (fields != null)
+            {
+                for (int i = 0; i < fields.Length; i++)
+                {
+                    fields[i].Write(this);
+                }
+            }
+            if (methods != null)
+            {
+                for (int i = 0; i < methods.Length; i++)
+                {
+                    methods[i].Write(this);
+                }
+            }
+            if (classes != null)
+            {
+                for (int i = 0; i < classes.Length; i++)
+                {
+                    classes[i].Write(this);
+                }
+            }
+            this.Flush();
+            this.Close();
+        }
+
+    }
+}

PERWAPI/ClassLayout.cs

@@ -0,0 +1,120 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Security.Cryptography;
+
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    /// <summary>
+    /// Layout information for a class (.class [sequential | explicit])
+    /// </summary>
+    internal class ClassLayout : MetaDataElement
+    {
+        ClassDef parent;
+        ushort packSize = 0;
+        uint classSize = 0;
+        uint parentIx = 0;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal ClassLayout(int pack, int cSize, ClassDef par)
+        {
+            packSize = (ushort)pack;
+            classSize = (uint)cSize;
+            parent = par;
+            tabIx = MDTable.ClassLayout;
+        }
+
+        internal ClassLayout(ushort pack, uint cSize, ClassDef par)
+        {
+            packSize = pack;
+            classSize = cSize;
+            parent = par;
+            tabIx = MDTable.ClassLayout;
+        }
+
+        internal ClassLayout(PEReader buff)
+        {
+            packSize = buff.ReadUInt16();
+            classSize = buff.ReadUInt32();
+            parentIx = buff.GetIndex(MDTable.TypeDef);
+            tabIx = MDTable.ClassLayout;
+        }
+
+        internal static ClassLayout FindLayout(PEReader buff, ClassDef paren, uint classIx)
+        {
+            buff.SetElementPosition(MDTable.ClassLayout, 0);
+            for (int i = 0; i < buff.GetTableSize(MDTable.ClassLayout); i++)
+            {
+                ushort packSize = buff.ReadUInt16();
+                uint classSize = buff.ReadUInt32();
+                if (buff.GetIndex(MDTable.TypeDef) == classIx)
+                    return new ClassLayout(packSize, classSize, paren);
+            }
+            return null;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] layouts)
+        {
+            for (int i = 0; i < layouts.Length; i++)
+            {
+                layouts[i] = new ClassLayout(buff);
+            }
+        }
+
+        internal override void Resolve(PEReader buff)
+        {
+            parent = (ClassDef)buff.GetElement(MDTable.TypeDef, parentIx);
+            if (parent != null) parent.Layout = this;
+        }
+
+        /*------------------------- public set and get methods --------------------------*/
+
+        public void SetPack(int pack) { packSize = (ushort)pack; }
+        public int GetPack() { return (int)packSize; }
+        public void SetSize(int size) { classSize = (uint)size; }
+        public int GetSize() { return (int)classSize; }
+
+        /*----------------------------- internal functions ------------------------------*/
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(tabIx, this);
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return 6 + md.TableIndexSize(MDTable.TypeDef);
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.Write(packSize);
+            output.Write(classSize);
+            output.WriteIndex(MDTable.TypeDef, parent.Row);
+        }
+
+    }
+
+
+
+}

PERWAPI/CodeBlocks.cs

@@ -0,0 +1,331 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+
+using System;
+using System.Collections;
+using System.Text;
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    public abstract class CodeBlock
+    {
+        private static readonly int maxCodeSize = 255;
+        protected CILLabel start, end;
+        protected bool small = true;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public CodeBlock(CILLabel start, CILLabel end)
+        {
+            this.start = start;
+            this.end = end;
+        }
+
+        /// <summary>
+        /// The label that marks the start of this code block
+        /// </summary>
+        public CILLabel Start { get { return start; } }
+
+        /// <summary>
+        /// The label that marks the end of this code block
+        /// </summary>
+        public CILLabel End { get { return end; } }
+
+        internal virtual bool isFat()
+        {
+            // Console.WriteLine("block start = " + start.GetLabelOffset() +
+            //                  "  block end = " + end.GetLabelOffset());
+            return (end.GetLabelOffset() - start.GetLabelOffset()) > maxCodeSize;
+        }
+
+        internal virtual void Write(PEWriter output, bool fatFormat)
+        {
+            if (fatFormat) output.Write(start.GetLabelOffset());
+            else output.Write((short)start.GetLabelOffset());
+            uint len = end.GetLabelOffset() - start.GetLabelOffset();
+            if (Diag.DiagOn) Console.WriteLine("block start = " + start.GetLabelOffset() + "  len = " + len);
+            if (fatFormat) output.Write(len);
+            else output.Write((byte)len);
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// The descriptor for a guarded block (.try)
+    /// </summary>
+    public class TryBlock : CodeBlock
+    {
+        protected bool fatFormat = false;
+        protected ushort flags = 0;
+        ArrayList handlers = new ArrayList();
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        /// <summary>
+        /// Create a new try block
+        /// </summary>
+        /// <param name="start">start label for the try block</param>
+        /// <param name="end">end label for the try block</param>
+        public TryBlock(CILLabel start, CILLabel end) : base(start, end) { }
+
+        /// <summary>
+        /// Add a handler to this try block
+        /// </summary>
+        /// <param name="handler">a handler to be added to the try block</param>
+        public void AddHandler(HandlerBlock handler)
+        {
+            //flags = handler.GetFlag();
+            handlers.Add(handler);
+        }
+
+        /// <summary>
+        /// Get an array containing all the handlers.
+        /// </summary>
+        /// <returns>The list of handlers.</returns>
+        public HandlerBlock[] GetHandlers()
+        {
+            return (HandlerBlock[])handlers.ToArray(typeof(HandlerBlock));
+        }
+
+        internal void SetSize()
+        {
+            fatFormat = base.isFat();
+            if (fatFormat) return;
+            for (int i = 0; i < handlers.Count; i++)
+            {
+                HandlerBlock handler = (HandlerBlock)handlers[i];
+                if (handler.isFat())
+                {
+                    fatFormat = true;
+                    return;
+                }
+            }
+        }
+
+        internal int NumHandlers()
+        {
+            return handlers.Count;
+        }
+
+        internal override bool isFat()
+        {
+            return fatFormat;
+        }
+
+        internal void BuildTables(MetaDataOut md)
+        {
+            for (int i = 0; i < handlers.Count; i++)
+            {
+                ((HandlerBlock)handlers[i]).BuildTables(md);
+            }
+        }
+
+        internal void BuildCILInfo(CILWriter output)
+        {
+            for (int i = 0; i < handlers.Count; i++)
+            {
+                ((HandlerBlock)handlers[i]).BuildCILInfo(output);
+            }
+        }
+
+        internal override void Write(PEWriter output, bool fatFormat)
+        {
+            if (Diag.DiagOn) Console.WriteLine("writing exception details");
+            for (int i = 0; i < handlers.Count; i++)
+            {
+                if (Diag.DiagOn) Console.WriteLine("Except block " + i);
+                HandlerBlock handler = (HandlerBlock)handlers[i];
+                flags = handler.GetFlag();
+                if (Diag.DiagOn) Console.WriteLine("flags = " + flags);
+                if (fatFormat) output.Write((uint)flags);
+                else output.Write(flags);
+                base.Write(output, fatFormat);
+                handler.Write(output, fatFormat);
+            }
+        }
+    }
+
+    /**************************************************************************/
+    public abstract class HandlerBlock : CodeBlock
+    {
+        protected static readonly ushort ExceptionFlag = 0;
+        protected static readonly ushort FilterFlag = 0x01;
+        protected static readonly ushort FinallyFlag = 0x02;
+        protected static readonly ushort FaultFlag = 0x04;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public HandlerBlock(CILLabel start, CILLabel end) : base(start, end) { }
+
+        internal virtual ushort GetFlag()
+        {
+            if (Diag.DiagOn) Console.WriteLine("Catch Block");
+            return ExceptionFlag;
+        }
+
+        internal virtual void BuildTables(MetaDataOut md) { }
+
+        internal virtual void BuildCILInfo(CILWriter output) { }
+
+        internal override void Write(PEWriter output, bool fatFormat)
+        {
+            base.Write(output, fatFormat);
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// The descriptor for a catch clause (.catch)
+    /// </summary>
+    public class Catch : HandlerBlock
+    {
+        Class exceptType;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        /// <summary>
+        /// Create a new catch clause
+        /// </summary>
+        /// <param name="except">the exception to be caught</param>
+        /// <param name="handlerStart">start of the handler code</param>
+        /// <param name="handlerEnd">end of the handler code</param>
+        public Catch(Class except, CILLabel handlerStart, CILLabel handlerEnd)
+            : base(handlerStart, handlerEnd)
+        {
+            exceptType = except;
+        }
+
+        internal override void BuildTables(MetaDataOut md)
+        {
+            if (!(exceptType is ClassDef)) exceptType.BuildMDTables(md);
+        }
+
+        internal override void BuildCILInfo(CILWriter output)
+        {
+            if (!(exceptType is ClassDef)) exceptType.BuildCILInfo(output);
+        }
+
+        internal override void Write(PEWriter output, bool fatFormat)
+        {
+            base.Write(output, fatFormat);
+            output.Write(exceptType.Token());
+        }
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// The descriptor for a filter clause (.filter)
+    /// </summary>
+    public class Filter : HandlerBlock
+    {
+        CILLabel filterLabel;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        /// <summary>
+        /// Create a new filter clause
+        /// </summary>
+        /// <param name="filterLabel">the label where the filter code starts</param>
+        /// <param name="handlerStart">the start of the handler code</param>
+        /// <param name="handlerEnd">the end of the handler code</param>
+        public Filter(CILLabel filterLabel, CILLabel handlerStart,
+            CILLabel handlerEnd)
+            : base(handlerStart, handlerEnd)
+        {
+            this.filterLabel = filterLabel;
+        }
+
+        internal override ushort GetFlag()
+        {
+            if (Diag.DiagOn) Console.WriteLine("Filter Block");
+            return FilterFlag;
+        }
+
+        internal override void Write(PEWriter output, bool fatFormat)
+        {
+            base.Write(output, fatFormat);
+            output.Write(filterLabel.GetLabelOffset());
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a finally block (.finally)
+    /// </summary>
+    public class Finally : HandlerBlock
+    {
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        /// <summary>
+        /// Create a new finally clause
+        /// </summary>
+        /// <param name="finallyStart">start of finally code</param>
+        /// <param name="finallyEnd">end of finally code</param>
+        public Finally(CILLabel finallyStart, CILLabel finallyEnd)
+            : base(finallyStart, finallyEnd) { }
+
+        internal override ushort GetFlag()
+        {
+            if (Diag.DiagOn) Console.WriteLine("Finally Block");
+            return FinallyFlag;
+        }
+
+        internal override void Write(PEWriter output, bool fatFormat)
+        {
+            base.Write(output, fatFormat);
+            output.Write((int)0);
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a fault block (.fault)
+    /// </summary>
+    public class Fault : HandlerBlock
+    {
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        /// <summary>
+        /// Create a new fault clause
+        /// </summary>
+        /// <param name="faultStart">start of the fault code</param>
+        /// <param name="faultEnd">end of the fault code</param>
+        public Fault(CILLabel faultStart, CILLabel faultEnd)
+            : base(faultStart, faultEnd) { }
+
+        internal override ushort GetFlag()
+        {
+            if (Diag.DiagOn) Console.WriteLine("Fault Block");
+            return FaultFlag;
+        }
+
+        internal override void Write(PEWriter output, bool fatFormat)
+        {
+            base.Write(output, fatFormat);
+            output.Write((int)0);
+
+        }
+    }
+}

PERWAPI/Constants.cs

@@ -0,0 +1,776 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+
+using System;
+using System.IO;
+
+namespace QUT.PERWAPI
+{
+
+    /**************************************************************************/
+    // Classes used to describe constant values
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a constant value, to be written in the blob heap
+    /// </summary>
+    public abstract class Constant
+    {
+        protected uint size = 0;
+        internal ElementType type;
+        protected uint blobIndex;
+        internal MetaDataOut addedToBlobHeap;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal Constant() { }
+
+        internal virtual uint GetBlobIndex(MetaDataOut md) { return 0; }
+
+        internal uint GetSize() { return size; }
+
+        internal byte GetTypeIndex() { return (byte)type; }
+
+        internal virtual void Write(BinaryWriter bw) { }
+
+        internal virtual void Write(CILWriter output)
+        {
+            throw new NotYetImplementedException("Constant values for CIL");
+        }
+
+    }
+
+    /**************************************************************************/
+    public abstract class BlobConstant : Constant { }
+    /**************************************************************************/
+    /// <summary>
+    /// Boolean constant
+    /// </summary>
+    public class BoolConst : BlobConstant
+    {
+        bool val;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        /// <summary>
+        /// Create a new boolean constant with the value "val"
+        /// </summary>
+        /// <param name="val">value of this boolean constant</param>
+        public BoolConst(bool val)
+        {
+            this.val = val;
+            size = 1;
+            type = ElementType.Boolean;
+        }
+
+        public bool GetBool()
+        {
+            return val;
+        }
+
+        internal sealed override uint GetBlobIndex(MetaDataOut md)
+        {
+            if (addedToBlobHeap != md)
+            {
+                if (val) blobIndex = md.AddToBlobHeap(1, 1);
+                else blobIndex = md.AddToBlobHeap(0, 1);
+                addedToBlobHeap = md;
+            }
+            return blobIndex;
+        }
+
+        internal sealed override void Write(BinaryWriter bw)
+        {
+            if (val) bw.Write((sbyte)1);
+            else bw.Write((sbyte)0);
+        }
+
+    }
+    /**************************************************************************/
+    public class CharConst : BlobConstant
+    {
+        char val;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public CharConst(char val)
+        {
+            this.val = val;
+            size = 2;
+            type = ElementType.Char;
+        }
+
+        internal CharConst(PEReader buff)
+        {
+            val = buff.ReadChar();
+            size = 2;
+            type = ElementType.Char;
+        }
+
+        public char GetChar()
+        { // KJG addition 2005-Mar-01
+            return val;
+        }
+
+        internal sealed override uint GetBlobIndex(MetaDataOut md)
+        {
+            if (addedToBlobHeap != md)
+            {
+                blobIndex = md.AddToBlobHeap(val);
+                addedToBlobHeap = md;
+            }
+            return blobIndex;
+        }
+
+        internal sealed override void Write(BinaryWriter bw)
+        {
+            bw.Write(val);
+        }
+
+    }
+
+    /**************************************************************************/
+    public class NullRefConst : BlobConstant
+    {
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public NullRefConst()
+        {
+            size = 4;
+            type = ElementType.Class;
+        }
+
+        internal NullRefConst(PEReader buff)
+        {
+            uint junk = buff.ReadUInt32();
+            size = 4;
+            type = ElementType.Class;
+        }
+
+        internal sealed override uint GetBlobIndex(MetaDataOut md)
+        {
+            if (addedToBlobHeap != md)
+            {
+                blobIndex = md.AddToBlobHeap(0, 4);
+                addedToBlobHeap = md;
+            }
+            return blobIndex;
+        }
+
+        internal sealed override void Write(BinaryWriter bw)
+        {
+            bw.Write((int)0);
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Constant array
+    /// </summary>
+    public class ArrayConst : BlobConstant
+    {
+        Constant[] elements;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public ArrayConst(Constant[] elems)
+        {
+            type = ElementType.SZArray;
+            size = 5;  // one byte for SZARRAY, 4 bytes for length
+            elements = elems;
+            for (int i = 0; i < elements.Length; i++)
+            {
+                size += elements[i].GetSize();
+            }
+        }
+
+        public Constant[] GetArray()
+        {
+            return elements;
+        }
+
+        internal sealed override uint GetBlobIndex(MetaDataOut md)
+        {
+            if (addedToBlobHeap != md)
+            {
+                MemoryStream str = new MemoryStream();
+                BinaryWriter bw = new BinaryWriter(str);
+                Write(bw);
+                blobIndex = md.AddToBlobHeap(str.ToArray());
+                addedToBlobHeap = md;
+            }
+            return blobIndex;
+        }
+
+        internal sealed override void Write(BinaryWriter bw)
+        {
+            bw.Write((byte)type);
+            bw.Write(elements.Length);
+            for (int i = 0; i < elements.Length; i++)
+            {
+                elements[i].Write(bw);
+            }
+        }
+
+    }
+
+    /**************************************************************************/
+    public class ClassTypeConst : BlobConstant
+    {
+        string name;
+        Class desc;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public ClassTypeConst(string className)
+        {
+            name = className;
+            type = ElementType.ClassType;
+        }
+
+        public ClassTypeConst(Class classDesc)
+        {
+            desc = classDesc;
+            type = ElementType.ClassType;
+        }
+
+        public Class GetClass()
+        {
+            return desc;
+        }
+
+        public String GetClassName()
+        {
+            if (name == null) name = desc.TypeName();
+            // CHECK - ClassName or TypeName
+            // if (name == null) return desc.ClassName();
+            return name;
+        }
+
+        internal override void Write(BinaryWriter bw)
+        {
+            if (name == null) name = desc.TypeName();
+            // CHECK - ClassName or TypeName
+            // if (name == null)  name = desc.ClassName();
+            bw.Write(name);
+        }
+
+    }
+
+    /**************************************************************************/
+    public class BoxedSimpleConst : BlobConstant
+    {
+        SimpleConstant sConst;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public BoxedSimpleConst(SimpleConstant con)
+        {
+            sConst = con;
+            type = (ElementType)sConst.GetTypeIndex();
+        }
+
+        public SimpleConstant GetConst()
+        {
+            return sConst;
+        }
+
+        internal override void Write(BinaryWriter bw)
+        {
+            bw.Write((byte)type);
+            sConst.Write(bw);
+        }
+    }
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a constant value
+    /// </summary>
+    public abstract class DataConstant : Constant
+    {
+        private uint dataOffset = 0;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal DataConstant() { }
+
+        public uint DataOffset
+        {
+            get { return dataOffset; }
+            set { dataOffset = value; }
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Constant for a memory address
+    /// </summary>
+    public class AddressConstant : DataConstant
+    {
+        DataConstant data;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public AddressConstant(DataConstant dConst)
+        {
+            data = dConst;
+            size = 4;
+            type = ElementType.TypedByRef;
+        }
+
+        internal AddressConstant(PEReader buff)
+        {
+        }
+
+        public DataConstant GetConst()
+        {
+            return data;
+        }
+
+        internal sealed override void Write(BinaryWriter bw)
+        {
+            ((PEWriter)bw).WriteDataRVA(data.DataOffset);
+        }
+
+    }
+
+    /**************************************************************************/
+    public class ByteArrConst : DataConstant
+    {
+        byte[] val;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public ByteArrConst(byte[] val)
+        {
+            this.val = val;
+            size = (uint)val.Length;
+        }
+
+        public byte[] GetArray()
+        {
+            return val;
+        }
+
+        internal sealed override uint GetBlobIndex(MetaDataOut md)
+        {
+            if (addedToBlobHeap != md)
+            {
+                blobIndex = md.AddToBlobHeap(val);
+                addedToBlobHeap = md;
+            }
+            return blobIndex;
+        }
+
+        internal sealed override void Write(BinaryWriter bw)
+        {
+            bw.Write(val);
+        }
+
+    }
+
+    /**************************************************************************/
+    public class RepeatedConstant : DataConstant
+    {
+        DataConstant data;
+        uint repCount;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public RepeatedConstant(DataConstant dConst, int repeatCount)
+        {
+            data = dConst;
+            repCount = (uint)repeatCount;
+            type = ElementType.SZArray;
+            size = data.GetSize() * repCount;
+        }
+
+        public DataConstant GetConst()
+        {
+            return data;
+        }
+
+        public uint GetCount()
+        {
+            return repCount;
+        }
+
+        internal sealed override void Write(BinaryWriter bw)
+        {
+            for (int i = 0; i < repCount; i++)
+            {
+                data.Write(bw);
+            }
+        }
+
+    }
+
+    /**************************************************************************/
+    public class StringConst : DataConstant
+    {
+        string val;
+        byte[] strBytes;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public StringConst(string val)
+        {
+            this.val = val;
+            size = (uint)val.Length;  // need to add null ??
+            type = ElementType.String;
+        }
+
+        internal StringConst(byte[] sBytes)
+        {
+            strBytes = sBytes;
+            size = (uint)strBytes.Length;
+            type = ElementType.String;
+        }
+
+        public string GetString()
+        {
+            return val;
+        }
+
+        public byte[] GetStringBytes()
+        {
+            return strBytes;
+        }
+
+        internal sealed override uint GetBlobIndex(MetaDataOut md)
+        {
+            if (addedToBlobHeap != md)
+            {
+                if (val == null)
+                    blobIndex = md.AddToBlobHeap(strBytes);
+                else
+                    blobIndex = md.AddToBlobHeap(val);
+                addedToBlobHeap = md;
+            }
+            return blobIndex;
+        }
+
+        internal sealed override void Write(BinaryWriter bw)
+        {
+            if ((val == null) && (strBytes != null))
+            {
+                bw.Write(strBytes);
+            }
+            else
+                bw.Write(val);
+        }
+
+    }
+
+    /**************************************************************************/
+    public abstract class SimpleConstant : DataConstant { }
+
+    /**************************************************************************/
+    public class IntConst : SimpleConstant
+    {
+        long val;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public IntConst(sbyte val)
+        {
+            this.val = val;
+            size = 1; //8;
+            type = ElementType.I8;
+        }
+
+        public IntConst(short val)
+        {
+            this.val = val;
+            size = 2; //16;
+            type = ElementType.I2;
+        }
+
+        public IntConst(int val)
+        {
+            this.val = val;
+            size = 4; //32;
+            type = ElementType.I4;
+        }
+
+        public IntConst(long val)
+        {
+            this.val = val;
+            size = 8; //64;
+            type = ElementType.I8;
+        }
+
+        internal IntConst(PEReader buff, int numBytes)
+        {
+            switch (numBytes)
+            {
+                case (1): val = buff.ReadSByte();
+                    type = ElementType.I8;
+                    break;
+                case (2): val = buff.ReadInt16();
+                    type = ElementType.I2;
+                    break;
+                case (4): val = buff.ReadInt32();
+                    type = ElementType.I4;
+                    break;
+                case (8): val = buff.ReadInt64();
+                    type = ElementType.I8;
+                    break;
+                default: val = 0;
+                    break;
+            }
+            size = (uint)numBytes; // * 4;
+        }
+
+        public int GetIntSize()
+        {
+            return (int)size;
+        }
+
+        public ElementType GetIntType()
+        {
+            return type;
+        }
+
+        public int GetInt()
+        {
+            if (size < 8)
+                return (int)val;
+            else
+                throw new Exception("Constant is long");
+        }
+
+        public long GetLong()
+        {
+            return val;
+        }
+
+        internal sealed override uint GetBlobIndex(MetaDataOut md)
+        {
+            if (addedToBlobHeap != md)
+            {
+                blobIndex = md.AddToBlobHeap(val, size);
+                //switch (size) {
+                //  case (1) : md.AddToBlobHeap((sbyte)val); break;
+                //  case (2) : md.AddToBlobHeap((short)val); break;
+                //  case (4) : md.AddToBlobHeap((int)val); break;
+                //  default : md.AddToBlobHeap(val); break; 
+                //}
+                addedToBlobHeap = md;
+            }
+            return blobIndex;
+        }
+
+        internal sealed override void Write(BinaryWriter bw)
+        {
+            switch (size)
+            {
+                case (1): bw.Write((sbyte)val); break;
+                case (2): bw.Write((short)val); break;
+                case (4): bw.Write((int)val); break;
+                default: bw.Write(val); break;
+            }
+        }
+
+    }
+
+    /**************************************************************************/
+    public class UIntConst : SimpleConstant
+    {
+        ulong val;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public UIntConst(byte val)
+        {
+            this.val = val;
+            size = 1;
+            type = ElementType.U8;
+        }
+        public UIntConst(ushort val)
+        {
+            this.val = val;
+            size = 2;
+            type = ElementType.U2;
+        }
+        public UIntConst(uint val)
+        {
+            this.val = val;
+            size = 4;
+            type = ElementType.U4;
+        }
+        public UIntConst(ulong val)
+        {
+            this.val = val;
+            size = 8;
+            type = ElementType.U8;
+        }
+
+        public int GetIntSize()
+        {
+            return (int)size;
+        }
+
+        public ElementType GetUIntType()
+        {
+            return type;
+        }
+
+        public uint GetUInt()
+        {
+            return (uint)val;
+        }
+
+        public ulong GetULong()
+        {
+            return val;
+        }
+
+        public long GetLong()
+        {           // KJG addition
+            if (val <= (ulong)(System.Int64.MaxValue))
+                return (long)val;
+            else
+                throw new Exception("UInt Constant too large");
+        }
+
+        public long GetULongAsLong()
+        {   // KJG addition
+            return (long)val;
+        }
+
+        internal sealed override uint GetBlobIndex(MetaDataOut md)
+        {
+            if (addedToBlobHeap != md)
+            {
+                blobIndex = md.AddToBlobHeap(val, size);
+                //switch (size) {
+                //  case (1) : blobIndex = md.AddToBlobHeap((byte)val); break;
+                //  case (2) : blobIndex = md.AddToBlobHeap((ushort)val); break;
+                //  case (4) : blobIndex = md.AddToBlobHeap((uint)val); break;
+                //  default : blobIndex = md.AddToBlobHeap(val); break;
+                //}
+                addedToBlobHeap = md;
+            }
+            return blobIndex;
+        }
+
+        internal sealed override void Write(BinaryWriter bw)
+        {
+            switch (size)
+            {
+                case (1): bw.Write((byte)val); break;
+                case (2): bw.Write((ushort)val); break;
+                case (4): bw.Write((uint)val); break;
+                default: bw.Write(val); break;
+            }
+        }
+    }
+
+    /**************************************************************************/
+    public class FloatConst : SimpleConstant
+    {
+        float val;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public FloatConst(float val)
+        {
+            this.val = val;
+            size = 4;
+            type = ElementType.R4;
+        }
+
+        internal FloatConst(PEReader buff)
+        {
+            val = buff.ReadSingle();
+            size = 4;
+            type = ElementType.R4;
+        }
+
+        public float GetFloat()
+        {
+            return val;
+        }
+
+        public double GetDouble()
+        { // KJG addition 2005-Mar-01
+            return (double)val;
+        }
+
+        internal sealed override uint GetBlobIndex(MetaDataOut md)
+        {
+            if (addedToBlobHeap != md)
+            {
+                blobIndex = md.AddToBlobHeap(val);
+                addedToBlobHeap = md;
+            }
+            return blobIndex;
+        }
+
+        internal sealed override void Write(BinaryWriter bw)
+        {
+            bw.Write(val);
+        }
+
+    }
+
+    /**************************************************************************/
+    public class DoubleConst : SimpleConstant
+    {
+        double val;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public DoubleConst(double val)
+        {
+            this.val = val;
+            size = 8;
+            type = ElementType.R8;
+        }
+
+        internal DoubleConst(PEReader buff)
+        {
+            val = buff.ReadDouble();
+            size = 8;
+            type = ElementType.R8;
+        }
+
+        public double GetDouble()
+        { // KJG addition 2005-Mar-01
+            return val;
+        }
+
+        internal sealed override uint GetBlobIndex(MetaDataOut md)
+        {
+            if (addedToBlobHeap != md)
+            {
+                blobIndex = md.AddToBlobHeap(val);
+                addedToBlobHeap = md;
+            }
+            return blobIndex;
+        }
+
+        internal sealed override void Write(BinaryWriter bw)
+        {
+            bw.Write(val);
+        }
+
+    }
+}

PERWAPI/CustomAttribute.cs

@@ -0,0 +1,293 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Security.Cryptography;
+
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a Custom Attribute (.custom) 
+    /// </summary>
+    public class CustomAttribute : MetaDataElement
+    {
+        internal static readonly ushort prolog = 0x0001;
+        private static readonly int initSize = 5;
+        MetaDataElement parent;
+        Method type;
+        uint valIx, parentIx, typeIx;
+        Constant[] argVals, vals;
+        byte[] byteVal;
+        ushort numNamed = 0;
+        string[] names;
+        bool[] isField;
+        bool changed = false;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal CustomAttribute(MetaDataElement paren, Method constrType,
+            Constant[] val)
+        {
+            parent = paren;
+            type = constrType;
+            argVals = val;
+            changed = true;
+            sortTable = true;
+            tabIx = MDTable.CustomAttribute;
+        }
+
+        internal CustomAttribute(MetaDataElement paren, Method constrType,
+            byte[] val)
+        {
+            parent = paren;
+            type = constrType;
+            tabIx = MDTable.CustomAttribute;
+            byteVal = val;
+            sortTable = true;
+            changed = true;
+        }
+
+        internal CustomAttribute(PEReader buff)
+        {
+            parentIx = buff.GetCodedIndex(CIx.HasCustomAttr);
+            typeIx = buff.GetCodedIndex(CIx.CustomAttributeType);
+            valIx = buff.GetBlobIx();
+            sortTable = true;
+            tabIx = MDTable.CustomAttribute;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] attrs)
+        {
+            for (int i = 0; i < attrs.Length; i++)
+            {
+                attrs[i] = new CustomAttribute(buff);
+            }
+        }
+
+        internal override void Resolve(PEReader buff)
+        {
+            parent = buff.GetCodedElement(CIx.HasCustomAttr, parentIx);
+            if (parent == null) return;
+            parent.AddCustomAttribute(this);
+            type = (Method)buff.GetCodedElement(CIx.CustomAttributeType, typeIx);
+            byteVal = buff.GetBlob(valIx);
+        }
+
+        /*------------------------- public set and get methods --------------------------*/
+
+        public void AddFieldOrProp(string name, Constant val, bool isFld)
+        {
+            if ((byteVal != null) && !changed) DecodeCustomAttributeBlob();
+            if (numNamed == 0)
+            {
+                names = new string[initSize];
+                vals = new Constant[initSize];
+                isField = new bool[initSize];
+            }
+            else if (numNamed >= names.Length)
+            {
+                string[] tmpNames = names;
+                Constant[] tmpVals = vals;
+                bool[] tmpField = isField;
+                names = new String[names.Length + initSize];
+                vals = new Constant[vals.Length + initSize];
+                isField = new bool[isField.Length + initSize];
+                for (int i = 0; i < numNamed; i++)
+                {
+                    names[i] = tmpNames[i];
+                    vals[i] = tmpVals[i];
+                    isField[i] = tmpField[i];
+                }
+            }
+            names[numNamed] = name;
+            vals[numNamed] = val;
+            isField[numNamed++] = isFld;
+            changed = true;
+        }
+
+        public Constant[] Args
+        {
+            get
+            {
+                if (!changed && (byteVal != null))
+                {
+                    try
+                    {
+                        DecodeCustomAttributeBlob();
+                    }
+                    catch
+                    {
+                    }
+                }
+                return argVals;
+            }
+            set
+            {
+                argVals = value;
+                changed = true;
+            }
+        }
+
+        public string[] GetNames()
+        {
+            return names;
+        }
+
+        public bool[] GetIsField()
+        {
+            return isField;
+        }
+        public Constant[] GetNamedArgs()
+        {
+            return vals;
+        }
+
+        /*----------------------------- internal functions ------------------------------*/
+
+        internal void DecodeCustomAttributeBlob()
+        {
+            MemoryStream caBlob = new MemoryStream(byteVal);
+            BinaryReader blob = new BinaryReader(caBlob, System.Text.Encoding.UTF8);
+            if (blob.ReadUInt16() != CustomAttribute.prolog) throw new PEFileException("Invalid Custom Attribute Blob");
+            Type[] parTypes = type.GetParTypes();
+            argVals = new Constant[parTypes.Length];
+            for (int i = 0; i < parTypes.Length; i++)
+            {
+                Type argType = parTypes[i];
+                bool arrayConst = argType is Array;
+                if (arrayConst) argType = ((ZeroBasedArray)(parTypes[i])).ElemType();
+                bool boxed = argType is SystemClass;
+                int eType = argType.GetTypeIndex();
+                if (arrayConst)
+                {
+                    Constant[] elems = new Constant[blob.ReadUInt32()];
+                    for (int j = 0; j < elems.Length; j++)
+                    {
+                        if (boxed)
+                        {
+                            eType = blob.ReadByte();
+                            elems[j] = new BoxedSimpleConst((SimpleConstant)PEReader.ReadConst(eType, blob));
+                        }
+                        else
+                        {
+                            elems[j] = PEReader.ReadConst(eType, blob);
+                        }
+                    }
+                    argVals[i] = new ArrayConst(elems);
+                }
+                else if (boxed)
+                {
+                    argVals[i] = new BoxedSimpleConst((SimpleConstant)PEReader.ReadConst(blob.ReadByte(), blob));
+                }
+                else
+                {
+                    argVals[i] = PEReader.ReadConst(eType, blob);
+                }
+            }
+            uint numNamed = 0;
+            if (blob.BaseStream.Position != byteVal.Length)
+                numNamed = blob.ReadUInt16();
+            if (numNamed > 0)
+            {
+                names = new string[numNamed];
+                vals = new Constant[numNamed];
+                isField = new bool[numNamed];
+                for (int i = 0; i < numNamed; i++)
+                {
+                    isField[i] = blob.ReadByte() == 0x53;
+                    int eType = blob.ReadByte();
+                    names[i] = blob.ReadString();
+                    vals[i] = PEReader.ReadConst(eType, blob);
+                }
+            }
+        }
+
+        internal void AddFieldOrProps(string[] names, Constant[] vals, bool[] isField)
+        {
+            this.names = names;
+            this.vals = vals;
+            this.isField = isField;
+            numNamed = (ushort)names.Length;
+        }
+
+        internal void SetBytes(byte[] bytes)
+        {
+            this.byteVal = bytes;
+        }
+
+        internal Method GetCAType()
+        {
+            return type;
+        }
+
+        internal override uint SortKey()
+        {
+            return (parent.Row << MetaData.CIxShiftMap[(uint)CIx.HasCustomAttr])
+                | parent.GetCodedIx(CIx.HasCustomAttr);
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(tabIx, this);
+            type.BuildMDTables(md);
+            // more adding to tables if data is not bytes
+            if (changed || (byteVal == null))
+            {
+                MemoryStream str = new MemoryStream();
+                BinaryWriter bw = new BinaryWriter(str);
+                bw.Write((ushort)1);
+                if (argVals != null)
+                {
+                    for (int i = 0; i < argVals.Length; i++)
+                    {
+                        argVals[i].Write(bw);
+                    }
+                }
+                bw.Write(numNamed);
+                for (int i = 0; i < numNamed; i++)
+                {
+                    if (isField[i]) bw.Write(Field.FieldTag);
+                    else bw.Write(Property.PropertyTag);
+                    bw.Write(vals[i].GetTypeIndex());
+                    bw.Write(names[i]);  // check this is the right format!!!
+                    vals[i].Write(bw);
+                }
+                byteVal = str.ToArray();
+            }
+            valIx = md.AddToBlobHeap(byteVal);
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return md.CodedIndexSize(CIx.HasCustomAttr) + md.CodedIndexSize(CIx.CustomAttributeType) + md.BlobIndexSize();
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.WriteCodedIndex(CIx.HasCustomAttr, parent);
+            output.WriteCodedIndex(CIx.CustomAttributeType, type);
+            output.BlobIndex(valIx);
+        }
+
+    }
+
+
+}

PERWAPI/EHClause.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections;
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    internal enum EHClauseType { Exception, Filter, Finally, Fault = 4 }
+
+    internal class EHClause
+    {
+        EHClauseType clauseType;
+        uint tryOffset, tryLength, handlerOffset, handlerLength, filterOffset = 0;
+        MetaDataElement classToken = null;
+
+        internal EHClause(EHClauseType cType, uint tOff, uint tLen, uint hOff, uint hLen)
+        {
+            clauseType = cType;
+            tryOffset = tOff;
+            tryLength = tLen;
+            handlerOffset = hOff;
+            handlerLength = hLen;
+        }
+
+        internal void ClassToken(MetaDataElement cToken)
+        {
+            classToken = cToken;
+        }
+
+        internal void FilterOffset(uint fOff)
+        {
+            filterOffset = fOff;
+        }
+
+        internal TryBlock MakeTryBlock(ArrayList labels)
+        {
+            TryBlock tBlock = new TryBlock(CILInstructions.GetLabel(labels, tryOffset),
+                CILInstructions.GetLabel(labels, tryOffset + tryLength));
+            CILLabel hStart = CILInstructions.GetLabel(labels, handlerOffset);
+            CILLabel hEnd = CILInstructions.GetLabel(labels, handlerOffset + handlerLength);
+            HandlerBlock handler = null;
+            switch (clauseType)
+            {
+                case (EHClauseType.Exception):
+                    handler = new Catch((Class)classToken, hStart, hEnd);
+                    break;
+                case (EHClauseType.Filter):
+                    handler = new Filter(CILInstructions.GetLabel(labels, filterOffset), hStart, hEnd);
+                    break;
+                case (EHClauseType.Finally):
+                    handler = new Finally(hStart, hEnd);
+                    break;
+                case (EHClauseType.Fault):
+                    handler = new Fault(hStart, hEnd);
+                    break;
+            }
+            tBlock.AddHandler(handler);
+            return tBlock;
+        }
+
+    }
+}

PERWAPI/Enumerations.cs

@@ -0,0 +1,460 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+
+    // Various Enumerations for PEFiles
+
+    /// <summary>
+    /// flags for the assembly (.corflags)
+    /// </summary>
+    public enum CorFlags
+    {
+        /// <summary>
+        /// IL only
+        /// </summary>
+        CF_IL_ONLY = 1,
+        /// <summary>
+        /// 32 bits
+        /// </summary>
+        CF_32_BITREQUIRED = 2,
+        /// <summary>
+        /// strong name signed
+        /// </summary>
+        CF_STRONGNAMESIGNED = 8,
+        /// <summary>
+        /// track debug data
+        /// </summary>
+        CF_TRACKDEBUGDATA = 0x10000
+    }
+
+    /// <summary>
+    /// subsystem for the assembly (.subsystem)
+    /// </summary>
+    public enum SubSystem
+    {
+        /// <summary>
+        /// native subsystem
+        /// </summary>
+        Native = 1,
+        /// <summary>
+        /// gui app
+        /// </summary>
+        Windows_GUI = 2,
+        /// <summary>
+        /// console app
+        /// </summary>
+        Windows_CUI = 3,
+        /// <summary>
+        /// os2 console
+        /// </summary>
+        OS2_CUI = 5,
+        /// <summary>
+        /// posix console
+        /// </summary>
+        POSIX_CUI = 7,
+        /// <summary>
+        /// native windows
+        /// </summary>
+        Native_Windows = 8,
+        /// <summary>
+        /// CE gui
+        /// </summary>
+        Windows_CE_GUI = 9
+    }
+
+    /// <summary>
+    /// Hash algorithms for the assembly
+    /// </summary>
+    public enum HashAlgorithmType
+    {
+        /// <summary>
+        /// No hash algorithm
+        /// </summary>
+        None,
+        /// <summary>
+        /// SHA1
+        /// </summary>
+        SHA1 = 0x8004
+    }
+
+    /// <summary>
+    /// Attributes for this assembly
+    /// </summary>
+    public enum AssemAttr
+    {
+        /// <summary>
+        /// Public key assembly attribute
+        /// </summary>
+        PublicKey = 0x01,
+        /// <summary>
+        /// retargetable assembly
+        /// </summary>
+        Retargetable = 0x100,
+        /// <summary>
+        /// JIT tracking
+        /// </summary>
+        EnableJITCompileTracking = 0x8000,
+        /// <summary>
+        /// Disable JIT compile optimizer
+        /// </summary>
+        DisableJITCompileOptimizer = 0x4000
+    }
+
+    /// <summary>
+    /// Method call conventions
+    /// </summary>
+    [FlagsAttribute]
+    public enum CallConv
+    {
+        /// <summary>
+        /// default cc
+        /// </summary>
+        Default,
+        /// <summary>
+        /// cdecl
+        /// </summary>
+        Cdecl,
+        /// <summary>
+        /// stdcall
+        /// </summary>
+        Stdcall,
+        /// <summary>
+        /// this call
+        /// </summary>
+        Thiscall,
+        /// <summary>
+        /// fast call
+        /// </summary>
+        Fastcall,
+        /// <summary>
+        /// var arg
+        /// </summary>
+        Vararg,
+        /// <summary>
+        /// generic
+        /// </summary>
+        Generic = 0x10,
+        /// <summary>
+        /// instance
+        /// </summary>
+        Instance = 0x20,
+        /// <summary>
+        /// explicit instance
+        /// </summary>
+        InstanceExplicit = 0x60
+    }
+
+    /// <summary>
+    /// Method Types for Events and Properties
+    /// </summary>
+    public enum MethodType
+    {
+        /// <summary>
+        /// setter
+        /// </summary>
+        Setter = 0x01,
+        /// <summary>
+        /// getter
+        /// </summary>
+        Getter,
+        /// <summary>
+        /// other
+        /// </summary>
+        Other = 0x04,
+        /// <summary>
+        /// add on
+        /// </summary>
+        AddOn = 0x08,
+        /// <summary>
+        /// remove on
+        /// </summary>
+        RemoveOn = 0x10,
+        /// <summary>
+        /// Fire
+        /// </summary>
+        Fire = 0x20
+    }
+
+    /// <summary>
+    /// Type custom modifier
+    /// </summary>
+    public enum CustomModifier
+    {
+        /// <summary>
+        /// mod req
+        /// </summary>
+        modreq = 0x1F,
+        /// <summary>
+        /// mod opt
+        /// </summary>
+        modopt
+    };
+
+    /// <summary>
+    /// Attibutes for a class
+    /// </summary>
+    [FlagsAttribute]
+    public enum TypeAttr
+    {
+        Private, Public, NestedPublic, NestedPrivate,
+        NestedFamily, NestedAssembly, NestedFamAndAssem, NestedFamOrAssem,
+        SequentialLayout, ExplicitLayout = 0x10, Interface = 0x20,
+        Abstract = 0x80, PublicAbstract = 0x81, Sealed = 0x100,
+        PublicSealed = 0x101, SpecialName = 0x400, RTSpecialName = 0x800,
+        Import = 0x1000, Serializable = 0x2000, UnicodeClass = 0x10000,
+        AutoClass = 0x20000, BeforeFieldInit = 0x100000
+    }
+
+    /// <summary>
+    /// Attributes for a field
+    /// </summary>
+    [FlagsAttribute]
+    public enum FieldAttr
+    {
+        Default, Private, FamAndAssem, Assembly,
+        Family, FamOrAssem, Public, Static = 0x10, PublicStatic = 0x16,
+        Initonly = 0x20, Literal = 0x40, Notserialized = 0x80,
+        SpecialName = 0x200, RTSpecialName = 0x400
+    }
+
+    /// <summary>
+    /// Attributes for a method
+    /// </summary>
+    [FlagsAttribute]
+    public enum MethAttr
+    {
+        Default, Private, FamAndAssem, Assembly,
+        Family, FamOrAssem, Public, Static = 0x0010, PublicStatic = 0x16,
+        Final = 0x0020, PublicStaticFinal = 0x36, Virtual = 0x0040,
+        PrivateVirtual, PublicVirtual = 0x0046, HideBySig = 0x0080,
+        NewSlot = 0x0100, Abstract = 0x0400, SpecialName = 0x0800,
+        RTSpecialName = 0x1000, SpecialRTSpecialName = 0x1800,
+        RequireSecObject = 0x8000
+    }
+
+    /// <summary>
+    /// Attributes for .pinvokeimpl method declarations
+    /// </summary>
+    [FlagsAttribute]
+    public enum PInvokeAttr
+    {
+        ansi = 2, unicode = 4, autochar = 6,
+        lasterr = 0x040, winapi = 0x100, cdecl = 0x200, stdcall = 0x300,
+        thiscall = 0x400, fastcall = 0x500
+    }
+
+    /// <summary>
+    /// Implementation attributes for a method
+    /// </summary>
+    [FlagsAttribute]
+    public enum ImplAttr
+    {
+        IL, Native, OPTIL, Runtime, Unmanaged,
+        ForwardRef = 0x10, PreserveSig = 0x0080, InternalCall = 0x1000,
+        Synchronised = 0x0020, Synchronized = 0x0020, NoInLining = 0x0008
+    }
+
+    /// <summary>
+    /// Modes for a parameter
+    /// </summary>
+    [FlagsAttribute]
+    public enum ParamAttr { Default, In, Out, Opt = 4 }
+
+    /// <summary>
+    /// Flags for a generic parameter
+    /// </summary>
+    [Flags]
+    public enum GenericParamAttr
+    {
+        NonVariant,
+        Covariant,
+        Contravariant,
+        ReferenceType = 0x4,
+        RequireDefaultCtor = 0x10
+    }
+
+    /// <summary>
+    /// Which version of PE file to build
+    /// </summary>
+    public enum NetVersion
+    {
+        Everett,   /* version 1.1.4322  */
+        Whidbey40, /* version 2.0.40607 beta 1*/
+        Whidbey41, /* version 2.0.41202 */
+        Whidbey50, /* version 2.0.50215 beta2*/
+        Version2,  /* version 2.0.50727.0 */
+        V2_Compact /* version 2.0.0.0 compact framework */
+    }
+
+    /// <summary>
+    /// CIL instructions
+    /// </summary>
+    public enum Op
+    {
+        nop, breakOp, ldarg_0, ldarg_1, ldarg_2, ldarg_3, ldloc_0, ldloc_1, ldloc_2,
+        ldloc_3, stloc_0, stloc_1, stloc_2, stloc_3,
+        ldnull = 0x14, ldc_i4_m1, ldc_i4_0, ldc_i4_1, ldc_i4_2, ldc_i4_3,
+        ldc_i4_4, ldc_i4_5, ldc_i4_6, ldc_i4_7, ldc_i4_8, dup = 0x25, pop,
+        ret = 0x2A, ldind_i1 = 0x46, ldind_u1, ldind_i2, ldind_u2, ldind_i4,
+        ldind_u4, ldind_i8, ldind_i, ldind_r4, ldind_r8, ldind_ref, stind_ref,
+        stind_i1, stind_i2, stind_i4, stind_i8, stind_r4, stind_r8, add, sub, mul,
+        div, div_un, rem, rem_un, and, or, xor, shl, shr, shr_un, neg, not,
+        conv_i1, conv_i2, conv_i4, conv_i8, conv_r4, conv_r8, conv_u4, conv_u8,
+        conv_r_un = 0x76, throwOp = 0x7A, conv_ovf_i1_un = 0x82, conv_ovf_i2_un,
+        conv_ovf_i4_un, conv_ovf_i8_un, conf_ovf_u1_un, conv_ovf_u2_un,
+        conv_ovf_u4_un, conv_ovf_u8_un, conv_ovf_i_un, conv_ovf_u_un,
+        ldlen = 0x8E, ldelem_i1 = 0x90, ldelem_u1, ldelem_i2, ldelem_u2,
+        ldelem_i4, ldelem_u4, ldelem_i8, ldelem_i, ldelem_r4, ldelem_r8,
+        ldelem_ref, stelem_i, stelem_i1, stelem_i2, stelem_i4, stelem_i8,
+        stelem_r4, stelem_r8, stelem_ref, conv_ovf_i1 = 0xb3, conv_ovf_u1,
+        conv_ovf_i2, conv_ovf_u2, conv_ovf_i4, conv_ovf_u4, conv_ovf_i8,
+        conv_ovf_u8, ckfinite = 0xC3, conv_u2 = 0xD1, conv_u1, conv_i,
+        conv_ovf_i, conv_ovf_u, add_ovf, add_ovf_un, mul_ovf, mul_ovf_un,
+        sub_ovf, sub_ovf_un, endfinally, stind_i = 0xDF, conv_u,
+        arglist = 0xFE00, ceq, cgt, cgt_un, clt, clt_un, localloc = 0xFE0F,
+        endfilter = 0xFE11, volatile_ = 0xFE13, tail_, cpblk = 0xFE17, initblk,
+        rethrow = 0xFE1A, refanytype = 0xFE1D, readOnly
+    }
+
+    /// <summary>
+    /// CIL instructions requiring an integer parameter
+    /// </summary>
+    public enum IntOp
+    {
+        ldarg_s = 0x0E, ldarga_s, starg_s, ldloc_s, ldloca_s,
+        stloc_s, ldc_i4_s = 0x1F, ldc_i4, ldarg = 0xFE09,
+        ldarga, starg, ldloc, ldloca, stloc, unaligned = 0xFE12
+    }
+
+    /// <summary>
+    /// CIL instructions requiring a field parameter
+    /// </summary>
+    public enum FieldOp
+    {
+        ldfld = 0x7B, ldflda, stfld, ldsfld, ldsflda,
+        stsfld, ldtoken = 0xD0
+    }
+
+    /// <summary>
+    /// CIL instructions requiring a method parameter
+    /// </summary>
+    public enum MethodOp
+    {
+        jmp = 0x27, call, callvirt = 0x6F, newobj = 0x73,
+        ldtoken = 0xD0, ldftn = 0xFE06, ldvirtfn
+    }
+
+    /// <summary>
+    /// CIL instructions requiring a type parameter
+    /// </summary>
+    public enum TypeOp
+    {
+        cpobj = 0x70, ldobj, castclass = 0x74, isinst,
+        unbox = 0x79, stobj = 0x81, box = 0x8C, newarr,
+        ldelema = 0x8F, ldelem_any = 0xA3, stelem_any, unbox_any,
+        refanyval = 0xC2, mkrefany = 0xC6,
+        ldtoken = 0xD0, initobj = 0xFE15, constrained, sizeOf = 0xFE1C
+    }
+
+    /// <summary>
+    /// CIL branch instructions
+    /// </summary>
+    public enum BranchOp
+    {
+        br_s = 0x2B, brfalse_s, brtrue_s, beq_s, bge_s, bgt_s, ble_s,
+        blt_s, bne_un_s, bge_un_s, bgt_un_s, ble_un_s, blt_un_s,
+        br, brfalse, brtrue, beq, bge, bgt, ble, blt, bne_un, bge_un, bgt_un, ble_un, blt_un,
+        leave = 0xDD, leave_s
+    }
+
+    public enum SpecialOp
+    {
+        ldc_i8 = 0x21, ldc_r4, ldc_r8, calli = 0x29,
+        Switch = 0x45, ldstr = 0x72
+    }
+
+    /// <summary>
+    /// Index for all the tables in the meta data
+    /// </summary>
+    public enum MDTable
+    {
+        Module, TypeRef, TypeDef, Field = 0x04, Method = 0x06,
+        Param = 0x08, InterfaceImpl, MemberRef, Constant, CustomAttribute,
+        FieldMarshal, DeclSecurity, ClassLayout, FieldLayout, StandAloneSig,
+        EventMap, Event = 0x14, PropertyMap, Property = 0x17, MethodSemantics,
+        MethodImpl, ModuleRef, TypeSpec, ImplMap, FieldRVA, Assembly = 0x20,
+        AssemblyProcessor, AssemblyOS, AssemblyRef, AssemblyRefProcessor,
+        AssemblyRefOS, File, ExportedType, ManifestResource, NestedClass,
+        GenericParam, MethodSpec, GenericParamConstraint, MaxMDTable
+    }
+
+    public enum NativeTypeIx
+    {
+        Void = 0x01, Boolean, I1, U1, I2, U2, I4, U4,
+        I8, U8, R4, R8, SysChar, Variant, Currency, Ptr, Decimal, Date, BStr,
+        LPStr, LPWStr, LPTStr, FixedSysString, ObjectRef, IUnknown, IDispatch,
+        Struct, Intf, SafeArray, FixedArray, Int, UInt, NestedStruct, ByValStr,
+        AnsiBStr, TBStr, VariantBool, Func, AsAny = 0x28, Array = 0x2A, LPStruct,
+        CustomMarshaller, Error
+    }
+
+    public enum SafeArrayType
+    {
+        int16 = 2, int32, float32, float64,
+        currency, date, bstr, dispatch, error, boolean, variant, unknown,
+        Decimal, int8 = 16, uint8, uint16, uint32, Int = 22, UInt,
+        record = 0x24,
+        MAX = 0x50
+    }
+
+    internal enum CIx
+    {
+        TypeDefOrRef, HasConstant, HasCustomAttr, HasFieldMarshal,
+        HasDeclSecurity, MemberRefParent, HasSemantics, MethodDefOrRef,
+        MemberForwarded, Implementation, CustomAttributeType, ResolutionScope,
+        TypeOrMethodDef, MaxCIx
+    }
+
+    internal enum MapType { eventMap, propertyMap, nestedClass }
+
+    public enum ElementType : byte
+    {
+        End, Void, Boolean, Char, I1, U1, I2, U2, I4, U4,
+        I8, U8, R4, R8, String, Ptr, ByRef, ValueType, Class, Var, Array, GenericInst,
+        TypedByRef, I = 0x18, U, FnPtr = 0x1B, Object, SZArray, MVar, CmodReqd,
+        CmodOpt, Internal, Modifier = 0x40, Sentinel, Pinned = 0x45, ClassType = 0x50
+    }
+
+    public enum SecurityAction
+    {
+        Request = 0x01, Demand, Assert, Deny, PermitOnly,
+        LinkDemand, InheritanceDemand, RequestMinimum, RequestOptional, RequestRefuse,
+        PreJITGrant, PreJITDeny, NonCASDemand, NonCASLinkDemand, NonCASInheritanceDemand
+    }
+
+    internal enum IType
+    {
+        op, methOp, fieldOp, typeOp, specialOp, int8Op, uint8Op, uint16Op,
+        int32Op, branchOp
+    }
+
+}

PERWAPI/FieldMarshal.cs

@@ -0,0 +1,123 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Security.Cryptography;
+
+
+namespace QUT.PERWAPI
+{
+    /*****************************************************************************/
+    /// <summary>
+    /// Marshalling information for a field or param
+    /// </summary>
+    public class FieldMarshal : MetaDataElement
+    {
+        MetaDataElement field;
+        NativeType nt;
+        uint ntIx, parentIx;
+
+        /*-------------------- Added by Carlo Kok ---------------------------------*/
+
+        private SafeArrayType safeArraySubType;
+        public SafeArrayType SafeArraySubType { get { return safeArraySubType; ; } set { safeArraySubType = value; } }
+
+        private string safeArrayUserDefinedSubType;
+        public string SafeArrayUserDefinedSubType { get { return safeArrayUserDefinedSubType; } set { safeArrayUserDefinedSubType = value; } }
+
+        private NativeTypeIx arraySubType = (NativeTypeIx)0x50; // default, important
+        public NativeTypeIx ArraySubType { get { return arraySubType; } set { arraySubType = value; } }
+
+        private int sizeConst = -1;
+        public int SizeConst { get { return sizeConst; } set { sizeConst = value; } }
+
+        private int sizeParamIndex = -1;
+        public int SizeParamIndex { get { return sizeParamIndex; } set { sizeParamIndex = value; } }
+
+        private string customMarshallingType;
+        public string CustomMarshallingType { get { return customMarshallingType; } set { customMarshallingType = value; } }
+
+        private string customMarshallingCookie;
+        public string CustomMarshallingCookie { get { return customMarshallingCookie; } set { customMarshallingCookie = value; } }
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal FieldMarshal(MetaDataElement field, NativeType nType)
+        {
+            this.field = field;
+            this.nt = nType;
+            sortTable = true;
+            tabIx = MDTable.FieldMarshal;
+        }
+
+        internal FieldMarshal(PEReader buff)
+        {
+            parentIx = buff.GetCodedIndex(CIx.HasFieldMarshal);
+            ntIx = buff.GetBlobIx();
+            sortTable = true;
+            tabIx = MDTable.FieldMarshal;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] fMarshal)
+        {
+            for (int i = 0; i < fMarshal.Length; i++)
+                fMarshal[i] = new FieldMarshal(buff);
+        }
+
+        internal override void Resolve(PEReader buff)
+        {
+            field = buff.GetCodedElement(CIx.HasFieldMarshal, parentIx);
+            nt = buff.GetBlobNativeType(ntIx);
+            if (field is FieldDef)
+            {
+                ((FieldDef)field).SetMarshalType(nt);
+            }
+            else
+            {
+                ((Param)field).SetMarshalType(nt);
+            }
+        }
+
+        internal override uint SortKey()
+        {
+            return (field.Row << MetaData.CIxShiftMap[(uint)CIx.HasFieldMarshal])
+                | field.GetCodedIx(CIx.HasFieldMarshal);
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.FieldMarshal, this);
+            ntIx = md.AddToBlobHeap(nt.ToBlob());
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return md.CodedIndexSize(CIx.HasFieldMarshal) + md.BlobIndexSize();
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.WriteCodedIndex(CIx.HasFieldMarshal, field);
+            output.BlobIndex(ntIx);
+        }
+
+    }
+
+
+}

PERWAPI/FieldRVA.cs

@@ -0,0 +1,84 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Security.Cryptography;
+
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for the address of a field's value in the PE file
+    /// </summary>
+    public class FieldRVA : MetaDataElement
+    {
+        FieldDef field;
+        DataConstant data;
+        uint rva = 0, fieldIx = 0;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal FieldRVA(FieldDef field, DataConstant data)
+        {
+            this.field = field;
+            this.data = data;
+            tabIx = MDTable.FieldRVA;
+        }
+
+        internal FieldRVA(PEReader buff)
+        {
+            rva = buff.ReadUInt32();
+            fieldIx = buff.GetIndex(MDTable.Field);
+            tabIx = MDTable.FieldRVA;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] fRVAs)
+        {
+            for (int i = 0; i < fRVAs.Length; i++)
+                fRVAs[i] = new FieldRVA(buff);
+        }
+
+        internal sealed override void Resolve(PEReader buff)
+        {
+            field = (FieldDef)buff.GetElement(MDTable.Field, fieldIx);
+            field.AddDataValue(buff.GetDataConstant(rva, field.GetFieldType()));
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.FieldRVA, this);
+            md.AddData(data);
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return 4 + md.TableIndexSize(MDTable.Field);
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.WriteDataRVA(data.DataOffset);
+            output.WriteIndex(MDTable.Field, field.Row);
+        }
+
+    }
+
+
+}

PERWAPI/FileImage.cs

@@ -0,0 +1,267 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+
+namespace QUT.PERWAPI
+{
+
+    /**************************************************************************/
+    // Class of PEFile constant values
+    /**************************************************************************/
+    /// <summary>
+    /// Image for a PEFile
+    /// File Structure
+    ///     DOS Header (128 bytes) 
+    ///     PE Signature ("PE\0\0") 
+    ///     PEFileHeader (20 bytes)
+    ///     PEOptionalHeader (224 bytes) 
+    ///     SectionHeaders (40 bytes * NumSections)
+    ///
+    ///     Sections .text (always present - contains metadata)
+    ///              .sdata (contains any initialised data in the file - may not be present)
+    ///                     (for ilams /debug this contains the Debug table)
+    ///              .reloc (always present - in pure CIL only has one fixup)
+    ///               others???  c# produces .rsrc section containing a Resource Table
+    ///
+    /// .text layout
+    ///     IAT (single entry 8 bytes for pure CIL)
+    ///     CLIHeader (72 bytes)
+    ///     CIL instructions for all methods (variable size)
+    ///     MetaData 
+    ///       Root (20 bytes + UTF-8 Version String + quad align padding)
+    ///       StreamHeaders (8 bytes + null terminated name string + quad align padding)
+    ///       Streams 
+    ///         #~        (always present - holds metadata tables)
+    ///         #Strings  (always present - holds identifier strings)
+    ///         #US       (Userstring heap)
+    ///         #Blob     (signature blobs)
+    ///         #GUID     (guids for assemblies or Modules)
+    ///    ImportTable (40 bytes)
+    ///    ImportLookupTable(8 bytes) (same as IAT for standard CIL files)
+    ///    Hint/Name Tables with entry "_CorExeMain" for .exe file and "_CorDllMain" for .dll (14 bytes)
+    ///    ASCII string "mscoree.dll" referenced in ImportTable (+ padding = 16 bytes)
+    ///    Entry Point  (0xFF25 followed by 4 bytes 0x400000 + RVA of .text)
+    ///
+    ///  #~ stream structure
+    ///    Header (24 bytes)
+    ///    Rows   (4 bytes * numTables)
+    ///    Tables
+    /// </summary>
+    internal class FileImage
+    {
+        internal readonly static uint DelaySignSize = 128; // Current assemblies are always 128
+        internal readonly static uint[] iByteMask = { 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000 };
+        internal readonly static ulong[] lByteMask = {0x00000000000000FF, 0x000000000000FF00,
+                                                         0x0000000000FF0000, 0x00000000FF000000,
+                                                         0x000000FF00000000, 0x0000FF0000000000,
+                                                         0x00FF000000000000, 0xFF00000000000000 };
+        internal readonly static uint nibble0Mask = 0x0000000F;
+        internal readonly static uint nibble1Mask = 0x000000F0;
+
+        internal static readonly byte[] DOSHeader = { 0x4d,0x5a,0x90,0x00,0x03,0x00,0x00,0x00,
+                                                        0x04,0x00,0x00,0x00,0xff,0xff,0x00,0x00,
+                                                        0xb8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                                                        0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                                                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                                                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                                                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                                                        0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,
+                                                        0x0e,0x1f,0xba,0x0e,0x00,0xb4,0x09,0xcd,
+                                                        0x21,0xb8,0x01,0x4c,0xcd,0x21,0x54,0x68,
+                                                        0x69,0x73,0x20,0x70,0x72,0x6f,0x67,0x72,
+                                                        0x61,0x6d,0x20,0x63,0x61,0x6e,0x6e,0x6f,
+                                                        0x74,0x20,0x62,0x65,0x20,0x72,0x75,0x6e,
+                                                        0x20,0x69,0x6e,0x20,0x44,0x4f,0x53,0x20,
+                                                        0x6d,0x6f,0x64,0x65,0x2e,0x0d,0x0d,0x0a,
+                                                        0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                                                        0x50,0x45,0x00,0x00};
+        internal static readonly int PESigOffset = 0x3C;
+        internal static byte[] PEHeader = { 0x4c, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                              0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                              0xE0, 0x00, 0x0E, 0x01, // PE Header Standard Fields
+                                              0x0B, 0x01, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                              0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                              0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                          };
+
+        internal static IType[] instrMap = { 
+                                               IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op,   // 0x00 - 0x08
+                                               IType.op, IType.op, IType.op, IType.op, IType.op, IType.uint8Op, IType.uint8Op, // 0x09 - 0x0F
+                                               IType.uint8Op, IType.uint8Op, IType.uint8Op, IType.uint8Op,   // 0x10 - 0x13
+                                               IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op,   // 0x14 - 0x1C
+                                               IType.op, IType.op, IType.int8Op, IType.int32Op, IType.specialOp,   // 0x1D - 0x21
+                                               IType.specialOp, IType.specialOp,IType.op,IType.op,IType.op,IType.methOp, // 0x22 - 0x27
+                                               IType.methOp, IType.specialOp, IType.op, IType.branchOp, IType.branchOp,// 0x28 - 0x2C
+                                               IType.branchOp, IType.branchOp, IType.branchOp, IType.branchOp,       // 0x2D - 0x30
+                                               IType.branchOp, IType.branchOp, IType.branchOp, IType.branchOp,       // 0x31 - 0x34
+                                               IType.branchOp, IType.branchOp, IType.branchOp, IType.branchOp,      // 0x35 - 0x38
+                                               IType.branchOp, IType.branchOp, IType.branchOp, IType.branchOp,   // 0x39 - 0x3C
+                                               IType.branchOp, IType.branchOp, IType.branchOp, IType.branchOp,   // 0x3D - 0x40
+                                               IType.branchOp, IType.branchOp, IType.branchOp, IType.branchOp,   // 0x41 - 0x44
+                                               IType.specialOp, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op,    // 0x45 - 0x4B
+                                               IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op,   // 0x4C - 0x54
+                                               IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op,   // 0x55 - 0x5D
+                                               IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op,   // 0x5E - 0x66
+                                               IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op,       // 0x67 - 0x6E
+                                               IType.methOp, IType.typeOp, IType.typeOp, IType.specialOp,     // 0x6F - 0x72
+                                               IType.methOp, IType.typeOp, IType.typeOp, IType.op, IType.op, IType.op,   // 0x73 - 0x78
+                                               IType.typeOp, IType.op, IType.fieldOp, IType.fieldOp, IType.fieldOp,// 0x79 - 0x7D
+                                               IType.fieldOp, IType.fieldOp, IType.fieldOp, IType.typeOp,    // 0x7E - 0x81
+                                               IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op,   // 0x82 - 0x8A
+                                               IType.op, IType.typeOp, IType.typeOp, IType.op, IType.typeOp, IType.op,   // 0x8B - 0x90
+                                               IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op,   // 0x91 - 0x99
+                                               IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op,   // 0x9A - 0xA2
+                                               IType.typeOp, IType.typeOp, IType.typeOp, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op,   // 0xA3 - 0xAB
+                                               IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op,   // 0xAC - 0xB4
+                                               IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op,   // 0xB5 - 0xBD
+                                               IType.op, IType.op, IType.op, IType.op, IType.typeOp, IType.op, IType.op, IType.op,   // 0xBE - 0xC5
+                                               IType.typeOp, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op,   // 0xC6 - 0xCD
+                                               IType.op, IType.op, IType.specialOp, IType.op, IType.op, IType.op, IType.op,    // 0xCE - 0xD4
+                                               IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.op,       // 0xD5 - 0xDC
+                                               IType.branchOp, IType.branchOp, IType.op, IType.op };                            // 0xDD - 0xE0
+
+        internal static IType[] longInstrMap = { IType.op, IType.op, IType.op, IType.op, IType.op, IType.op, IType.methOp,   // 0x00 - 0x06
+                                                   IType.methOp, IType.uint16Op, IType.uint16Op,       // 0x07 - 0x09
+                                                   IType.uint16Op, IType.uint16Op, IType.uint16Op,     // 0x0A - 0x0C
+                                                   IType.uint16Op, IType.uint16Op, IType.op, IType.op, IType.op,   // 0x0D - 0x11
+                                                   IType.uint8Op, IType.op, IType.op, IType.typeOp, IType.typeOp, IType.op,  // 0x12 - 0x17
+                                                   IType.op, IType.op, IType.op, IType.op, IType.typeOp, IType.op, IType.op};  // 0x18 - 0x1D
+
+        internal static readonly uint bitmask0 = 0x00000001;
+        internal static readonly uint bitmask1 = 0x00000002;
+        internal static readonly uint bitmask2 = 0x00000004;
+        internal static readonly uint bitmask3 = 0x00000008;
+        internal static readonly uint bitmask4 = 0x00000010;
+        internal static readonly uint bitmask5 = 0x00000020;
+        internal static readonly uint bitmask6 = 0x00000040;
+        internal static readonly uint bitmask7 = 0x00000080;
+        internal static readonly uint bitmask8 = 0x00000100;
+        internal static readonly uint bitmask9 = 0x00000200;
+        internal static readonly uint bitmask10 = 0x00000400;
+        internal static readonly uint bitmask11 = 0x00000800;
+        internal static readonly uint bitmask12 = 0x00001000;
+        internal static readonly uint bitmask13 = 0x00002000;
+        internal static readonly uint bitmask14 = 0x00004000;
+        internal static readonly uint bitmask15 = 0x00008000;
+        internal static readonly uint bitmask16 = 0x00010000;
+        internal static readonly uint bitmask17 = 0x00020000;
+        internal static readonly uint bitmask18 = 0x00040000;
+        internal static readonly uint bitmask19 = 0x00080000;
+        internal static readonly uint bitmask20 = 0x00100000;
+        internal static readonly uint bitmask21 = 0x00200000;
+        internal static readonly uint bitmask22 = 0x00400000;
+        internal static readonly uint bitmask23 = 0x00800000;
+        internal static readonly uint bitmask24 = 0x01000000;
+        internal static readonly uint bitmask25 = 0x02000000;
+        internal static readonly uint bitmask26 = 0x04000000;
+        internal static readonly uint bitmask27 = 0x08000000;
+        internal static readonly uint bitmask28 = 0x10000000;
+        internal static readonly uint bitmask29 = 0x20000000;
+        internal static readonly uint bitmask30 = 0x40000000;
+        internal static readonly uint bitmask31 = 0x80000000;
+        internal static readonly ulong bitmask32 = 0x0000000100000000;
+        internal static readonly ulong bitmask33 = 0x0000000200000000;
+        internal static readonly ulong bitmask34 = 0x0000000400000000;
+        internal static readonly ulong bitmask35 = 0x0000000800000000;
+        internal static readonly ulong bitmask36 = 0x0000001000000000;
+        internal static readonly ulong bitmask37 = 0x0000002000000000;
+        internal static readonly ulong bitmask38 = 0x0000004000000000;
+        internal static readonly ulong bitmask39 = 0x0000008000000000;
+        internal static readonly ulong bitmask40 = 0x0000010000000000;
+        internal static readonly ulong bitmask41 = 0x0000020000000000;
+        internal static readonly ulong bitmask42 = 0x0000040000000000;
+        internal static readonly ulong bitmask43 = 0x0000080000000000;
+        internal static readonly ulong bitmask44 = 0x0000100000000000;
+        internal static readonly ulong bitmask45 = 0x0000200000000000;
+        internal static readonly ulong bitmask46 = 0x0000400000000000;
+        internal static readonly ulong bitmask47 = 0x0000800000000000;
+        internal static readonly ulong bitmask48 = 0x0001000000000000;
+        internal static readonly ulong bitmask49 = 0x0002000000000000;
+        internal static readonly ulong bitmask50 = 0x0004000000000000;
+        internal static readonly ulong bitmask51 = 0x0008000000000000;
+        internal static readonly ulong bitmask52 = 0x0010000000000000;
+        internal static readonly ulong bitmask53 = 0x0020000000000000;
+        internal static readonly ulong bitmask54 = 0x0040000000000000;
+        internal static readonly ulong bitmask55 = 0x0080000000000000;
+        internal static readonly ulong bitmask56 = 0x0100000000000000;
+        internal static readonly ulong bitmask57 = 0x0200000000000000;
+        internal static readonly ulong bitmask58 = 0x0400000000000000;
+        internal static readonly ulong bitmask59 = 0x0800000000000000;
+        internal static readonly ulong bitmask60 = 0x1000000000000000;
+        internal static readonly ulong bitmask61 = 0x2000000000000000;
+        internal static readonly ulong bitmask62 = 0x4000000000000000;
+        internal static readonly ulong bitmask63 = 0x8000000000000000;
+
+        internal static readonly ulong[] bitmasks = { bitmask0 , bitmask1 , bitmask2 , bitmask3 ,
+                                                        bitmask4 , bitmask5 , bitmask6 , bitmask7 ,
+                                                        bitmask8 , bitmask9 , bitmask10, bitmask11,
+                                                        bitmask12, bitmask13, bitmask14, bitmask15,
+                                                        bitmask16, bitmask17, bitmask18, bitmask19,
+                                                        bitmask20, bitmask21, bitmask22, bitmask23,
+                                                        bitmask24, bitmask25, bitmask26, bitmask27,
+                                                        bitmask28, bitmask29, bitmask30, bitmask31,
+                                                        bitmask32, bitmask33, bitmask34, bitmask35,
+                                                        bitmask36, bitmask37, bitmask38, bitmask39,
+                                                        bitmask40, bitmask41, bitmask42, bitmask43,
+                                                        bitmask44, bitmask45, bitmask46, bitmask47,
+                                                        bitmask48, bitmask49, bitmask50, bitmask51,
+                                                        bitmask52, bitmask53, bitmask54, bitmask55,
+                                                        bitmask56, bitmask57, bitmask58, bitmask59,
+                                                        bitmask60, bitmask61, bitmask62, bitmask63 };
+
+
+        internal static readonly uint TableMask = 0xFF000000;
+        internal static readonly uint ElementMask = 0x00FFFFFF;
+        internal static readonly int NAMELEN = 8, STRLEN = 200;
+        internal static readonly uint machine = 0x14C;
+        internal static readonly uint machinex64 = 0x8664;
+        internal static readonly uint magic = 0x10B;
+        internal static readonly uint magic64 = 0x20B;
+        internal static readonly uint minFileAlign = 0x200;
+        internal static readonly uint midFileAlign = 0x400;
+        internal static readonly uint maxFileAlign = 0x1000;
+        internal static readonly uint fileHeaderSize = 0x178;
+        internal static readonly uint sectionHeaderSize = 40;
+        internal static readonly uint SectionAlignment = 0x2000;
+        internal static readonly uint ImageBase = 0x400000;
+        internal static readonly uint ImportTableSize = 40;
+        internal static readonly uint IATSize = 8;
+        internal static readonly uint CLIHeaderSize = 72;
+        internal static readonly uint relocFlags = 0x42000040;
+        internal static readonly ushort exeCharacteristics = 0x010E;
+        internal static readonly ushort dllCharacteristics = 0x210E;
+        internal static readonly ushort dllFlag = 0x2000;
+        // section names are all 8 bytes
+        internal static readonly string textName = ".text\0\0\0";
+        internal static readonly string sdataName = ".sdata\0\0";
+        internal static readonly string relocName = ".reloc\0\0";
+        internal static readonly string rsrcName = ".rsrc\0\0\0";
+        internal static readonly string exeHintNameTable = "\0\0_CorExeMain\0";
+        internal static readonly string dllHintNameTable = "\0\0_CorDllMain\0";
+        internal static readonly string runtimeEngineName = "mscoree.dll\0\0";
+        internal static readonly DateTime origin = new DateTime(1970, 1, 1);
+        internal static readonly ushort DLLFlags = (ushort)0x400; // for ver 1.1.4322 prev = (short)0;
+        internal static readonly uint StackReserveSize = 0x100000;
+        internal static readonly uint StackCommitSize = 0x1000;
+        internal static readonly uint HeapReserveSize = 0x100000;
+        internal static readonly uint HeapCommitSize = 0x1000;
+        internal static readonly uint LoaderFlags = 0;
+        internal static readonly uint NumDataDirectories = 0x10;
+    }
+}

PERWAPI/Instructions.cs

@@ -0,0 +1,3203 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Diagnostics;
+using SCG = System.Collections.Generic;
+
+
+namespace QUT.PERWAPI
+{
+
+
+    /**************************************************************************/
+    // Classes to represent CIL Byte Codes
+    /**************************************************************************/
+    /// <summary>
+    /// The IL instructions for a method
+    /// </summary>
+    public class CILInstructions
+    {
+        private static readonly uint MaxClauses = 10;
+        private static readonly uint ExHeaderSize = 4;
+        private static readonly uint FatExClauseSize = 24;
+        private static readonly uint SmlExClauseSize = 12;
+        private static readonly sbyte maxByteVal = 127;
+        private static readonly sbyte minByteVal = -128;
+        private static readonly byte maxUByteVal = 255;
+        private static readonly int smallSize = 64;
+        internal static readonly ushort TinyFormat = 0x2;
+        internal static readonly ushort FatFormat = 0x03;
+        internal static readonly ushort FatFormatHeader = 0x3003;
+        internal static readonly ushort MoreSects = 0x8;
+        internal static readonly ushort InitLocals = 0x10;
+        private static readonly uint FatSize = 12;
+        private static readonly uint FatWords = FatSize / 4;
+        internal static readonly byte FatExceptTable = 0x41;
+        internal static readonly byte SmlExceptTable = 0x01;
+        internal static readonly uint EHTable = 0x1;
+        internal static readonly uint SectFatFormat = 0x40;
+        internal static readonly uint SectMoreSects = 0x80;
+
+        private ArrayList exceptions, sourceLines, defaultLines;
+        private SourceFile defaultSourceFile;
+        private Stack blockStack;
+        //private bool codeChecked = false;
+        private static readonly int INITSIZE = 5;
+        private CILInstruction[] buffer = new CILInstruction[INITSIZE];
+        // REPLACE with ArrayList<CILInstruction> for next version of .NET
+        private CILInstruction[] saveBuffer;
+        private int tide = 0, saveTide = 0;
+        private uint offset = 0;
+        private ushort headerFlags = 0;
+        private short maxStack;
+        private uint paddingNeeded = 0;
+        private byte exceptHeader = 0;
+        private int currI = -1;
+        uint localSigIx = 0;
+        int numReplace = 0;
+        uint codeSize = 0, exceptSize = 0;
+        bool tinyFormat, fatExceptionFormat = false, inserting = false;
+        MethodDef thisMeth;
+
+        internal Scope currentScope;
+
+        /// <summary>
+        /// Shows if return statements in this code block require a value on the stack or not.
+        /// </summary>
+        internal bool ReturnsVoid;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal CILInstructions(MethodDef meth)
+        {
+            thisMeth = meth;
+        }
+
+        /*--------------------- public general editing methods ---------------------------*/
+        /// <summary>
+        /// The source file containing these IL instructions
+        /// </summary>
+        public SourceFile DefaultSourceFile
+        {
+            get { return defaultSourceFile; }
+            set { defaultSourceFile = value; }
+        }
+
+        /// <summary>
+        /// The number of instructions currently in the buffer. 
+        /// </summary>
+        public int NumInstructions()
+        {
+            if (inserting) return tide + saveTide;
+            return tide;
+        }
+
+        /// <summary>
+        /// Get the next instruction in the instruction buffer in sequence.  
+        /// An internal index is kept to keep track of which instruction was the last
+        /// retrieved by this method.  On the first call, the first instruction in 
+        /// the buffer is retrieved.  The instruction index may be zeroed 
+        /// using ResetInstCounter().  This method cannot be called when in "insert" mode.
+        /// </summary>
+        /// <returns></returns>
+        public CILInstruction GetNextInstruction()
+        {
+            if (inserting) throw new Exception("Cannot access next instruction during insert");
+            if (currI + 1 < tide)
+                return buffer[++currI];
+            return null;
+        }
+
+        /// <summary>
+        /// Get the previous instruction in the instruction buffer in sequence.  
+        /// An internal index is kept to keep track of which instruction was the last
+        /// retrieved by this method. This method cannot be called when in "insert" mode.
+        /// </summary>
+        /// <returns></returns>
+        public CILInstruction GetPrevInstruction()
+        {
+            if (inserting) throw new Exception("Cannot access previous instruction during insert");
+            if (currI > 0)
+                return buffer[--currI];
+            return null;
+        }
+
+        /// <summary>
+        /// Reset the counter for GetNextInstuction to the first instruction.
+        /// This method cannot be called when in "insert" mode.
+        /// </summary>
+        public void ResetInstCounter()
+        {
+            if (inserting) throw new Exception("Cannot reset instruction counter during insert");
+            currI = -1;
+        }
+
+        /// <summary>
+        /// Reset the counter for GetNextInstuction to the first instruction.
+        /// This method cannot be called when in "insert" mode.
+        /// </summary>
+        public void EndInstCounter()
+        {
+            if (inserting) throw new Exception("Cannot reset instruction counter during insert");
+            currI = tide;
+        }
+
+        /// <summary>
+        /// Get all the IL instructions.
+        /// This method cannot be called when in "insert" mode.
+        /// </summary>
+        /// <returns></returns>
+        public CILInstruction[] GetInstructions()
+        {
+            if (inserting) throw new Exception("Cannot get instructions during insert");
+            return buffer;
+        }
+
+        /// <summary>
+        /// Set the instruction to be the new array of instructions, this will replace
+        /// any existing instructions.  This method cannot be called when in "insert" mode.
+        /// </summary>
+        /// <param name="insts">The new instructions</param>
+        public void SetInstructions(CILInstruction[] insts)
+        {
+            if (inserting) throw new Exception("Cannot replace instructions during insert.");
+            buffer = insts;
+            tide = buffer.Length;
+            for (int i = 0; i < tide; i++)
+            {
+                if (insts[i] == null)
+                    tide = i;
+                insts[i].index = (uint)i;
+            }
+        }
+
+        /// <summary>
+        /// This method should only be used to insert instructions into a buffer which 
+        /// already contains some instructions.
+        /// Start inserting instructions into the instruction buffer ie. set the buffer
+        /// to "insert" mode.  The position of the insertion will be directly after 
+        /// the "current instruction" as used be GetNextInstruction().  The 
+        /// instructions to be inserted are any calls to the instruction specific 
+        /// methods - Inst, TypeInst, MethodInst, etc.
+        /// This method cannot be called if already in "insert" mode.
+        /// </summary>
+        public void StartInsert()
+        {
+            if (inserting)
+                throw new Exception("Cannot insert into an instruction buffer already in insert mode");
+            inserting = true;
+            saveTide = tide;
+            saveBuffer = buffer;
+            tide = 0;
+            buffer = new CILInstruction[INITSIZE];
+        }
+
+        /// <summary>
+        /// Stop inserting instructions into the buffer.  Any instructions added after 
+        /// this call will go at the end of the instruction buffer.  
+        /// To be used with StartInsert().
+        /// This method cannot be called if not in "insert" mode.
+        /// </summary>
+        public void EndInsert()
+        {
+            if (!inserting)
+                throw new Exception("Cannot stop inserting if not in insert mode");
+            CILInstruction[] newInsts = buffer;
+            buffer = saveBuffer;
+            int numNew = tide;
+            tide = saveTide;
+            int insPos = currI + 1;
+            if (numReplace > 0) insPos--;
+            InsertInstructions(insPos, newInsts, numNew);
+            inserting = false;
+            numReplace = 0;
+        }
+
+        /// <summary>
+        /// Check if the buffer is ready for insertion of extra instructions.
+        /// The buffer only needs to be in insert mode when instructions need
+        /// to be added to existing instructions, not for addition of instructions
+        /// to the end of the buffer.
+        /// </summary>
+        /// <returns></returns>
+        public bool InInsertMode() { return inserting; }
+
+        /// <summary>
+        /// Remove the instruction at a specified position from the buffer.  If you 
+        /// remove the "current" instruction (from GetNext or GetPrev) then the
+        /// "current" instruction becomes the instruction before that in the buffer.
+        /// </summary>
+        /// <param name="pos">position of the instruction to be removed</param>
+        public void RemoveInstruction(int pos)
+        {
+            if (pos < 0) return;
+            for (int i = pos; i < tide - 1; i++)
+            {
+                buffer[i] = buffer[i + 1];
+                buffer[i].index = (uint)i;
+            }
+            tide--;
+            if (pos == currI) currI = pos - 1;
+        }
+
+        /// <summary>
+        /// Remove the instructions from position "startRange" to (and including)
+        /// position "endRange" from the buffer.  If the range removed contains the
+        /// "current" instruction (from GetNext or GetPrev) then the "current" 
+        /// instruction becomes the instruction before startRange in the buffer.
+        /// </summary>
+        public void RemoveInstructions(int startRange, int endRange)
+        {
+            if (startRange < 0) startRange = 0;
+            if (endRange >= tide - 1)
+            {// cut to startRange
+                tide = startRange;
+                return;
+            }
+            int offset = endRange - startRange + 1;
+            for (int i = endRange + 1; i < tide; i++)
+            {
+                buffer[i - offset] = buffer[i];
+                buffer[i - offset].index = (uint)(i - offset);
+            }
+            tide -= offset;
+            if ((currI >= startRange) && (currI <= endRange)) currI = startRange - 1;
+        }
+
+        /// <summary>
+        /// Replace a single IL instruction at position pos in the buffer 
+        /// with some new instruction(s).  This removes the instruction and puts 
+        /// the instruction buffer into "insert" mode at the position of the removed 
+        /// instruction.  EndInsert must be called to insert the new instructions.
+        /// This method cannot be called when in "insert" mode.
+        /// </summary>
+        /// <param name="pos">position of the instruction to be replaced</param>
+        public void ReplaceInstruction(int pos)
+        {
+            if (inserting) throw new Exception("Cannot replace instructions during insert.");
+            currI = pos;
+            if ((pos > 0) || (pos < tide))
+            {
+                numReplace = 1;
+                StartInsert();
+            }
+        }
+
+        /// <summary>
+        /// Replace a number of IL instructions beginning at position pos in the buffer 
+        /// with some new instruction(s).  This removes the instructions and puts 
+        /// the instruction buffer into "insert" mode at the position of the removed 
+        /// instructions.  EndInsert must be called to insert the new instructions.
+        /// The instructions from index "from" up to and including index "to" will
+        /// be replaced by the new instructions entered.
+        /// This method cannot be called when in "insert" mode.
+        /// </summary>
+        /// <param name="from">the index to start replacing instruction from</param>
+        /// <param name="to">the last index of the instructions to be replaced</param>
+        public void ReplaceInstruction(int from, int to)
+        {
+            if (inserting) throw new Exception("Cannot replace instructions during insert.");
+            currI = from;
+            if ((from < 0) || (from >= tide) || (to < 0))
+                throw new Exception("replace index is out of range");
+            if (to >= tide) to = tide - 1;
+            numReplace = to - from + 1;
+            StartInsert();
+        }
+
+        /*---------------- public instruction specific methods ------------------------*/
+
+        /// <summary>
+        /// Add a simple IL instruction
+        /// </summary>
+        /// <param name="inst">the IL instruction</param>
+        public void Inst(Op inst)
+        {
+            AddToBuffer(new Instr(inst));
+        }
+
+        /// <summary>
+        /// Add an IL instruction with an integer parameter
+        /// </summary>
+        /// <param name="inst">the IL instruction</param>
+        /// <param name="val">the integer parameter value</param>
+        public void IntInst(IntOp inst, int val)
+        {
+            if ((inst == IntOp.ldc_i4_s) || (inst == IntOp.ldc_i4))
+            {
+                if ((val < 9) && (val >= -1))
+                {
+                    AddToBuffer(new Instr((Op)((int)Op.ldc_i4_0 + val)));
+                }
+                else
+                {
+                    AddToBuffer(new IntInstr(inst, val));
+                }
+            }
+            else
+                AddToBuffer(new UIntInstr(inst, (uint)val));
+        }
+
+        /// <summary>
+        /// Add the load long instruction
+        /// </summary>
+        /// <param name="cVal">the long value</param>
+        public void ldc_i8(long cVal)
+        {
+            AddToBuffer(new LongInstr(SpecialOp.ldc_i8, cVal));
+        }
+
+        /// <summary>
+        /// Add the load float32 instruction
+        /// </summary>
+        /// <param name="cVal">the float value</param>
+        public void ldc_r4(float cVal)
+        {
+            AddToBuffer(new FloatInstr(SpecialOp.ldc_r4, cVal));
+        }
+
+        /// <summary>
+        /// Add the load float64 instruction
+        /// </summary>
+        /// <param name="cVal">the float value</param>
+        public void ldc_r8(double cVal)
+        {
+            AddToBuffer(new DoubleInstr(SpecialOp.ldc_r8, cVal));
+        }
+
+        /// <summary>
+        /// Add the load string instruction
+        /// </summary>
+        /// <param name="str">the string value</param>
+        public void ldstr(string str)
+        {
+            AddToBuffer(new StringInstr(SpecialOp.ldstr, str));
+        }
+
+        /// <summary>
+        /// Add the calli instruction
+        /// </summary>
+        /// <param name="sig">the signature for the calli</param>
+        public void calli(CalliSig sig)
+        {
+            AddToBuffer(new SigInstr(SpecialOp.calli, sig));
+        }
+
+        /// <summary>
+        /// Create a new CIL label.  To place the label in the CIL instruction
+        /// stream use CodeLabel.
+        /// </summary>
+        /// <returns>a new CIL label</returns>
+        public CILLabel NewLabel()
+        {
+            return new CILLabel();
+        }
+
+        /// <summary>
+        /// Create a new label at this position in the code buffer
+        /// </summary>
+        /// <returns>the label at the current position</returns>
+        public CILLabel NewCodedLabel()
+        {
+            CILLabel lab = new CILLabel();
+            lab.Buffer = this;
+            AddToBuffer(lab);
+            return lab;
+        }
+
+        /// <summary>
+        /// Add a label to the CIL instructions
+        /// </summary>
+        /// <param name="lab">the label to be added</param>
+        public void CodeLabel(CILLabel lab)
+        {
+            if (lab.Buffer == null)
+            {
+                lab.Buffer = this;
+            }
+            else if (lab.Buffer != this)
+            {
+                throw new DescriptorException("Cannot add a label to two different code buffers");
+            }
+            AddToBuffer(lab);
+        }
+
+        /// <summary>
+        /// Add an instruction with a field parameter
+        /// </summary>
+        /// <param name="inst">the CIL instruction</param>
+        /// <param name="f">the field parameter</param>
+        public void FieldInst(FieldOp inst, Field f)
+        {
+            Debug.Assert(f != null);
+            if (f is FieldDef)
+                if (((FieldDef)f).GetScope() != thisMeth.GetScope())
+                    throw new DescriptorException();
+            AddToBuffer(new FieldInstr(inst, f));
+        }
+
+        /// <summary>
+        /// Add an instruction with a method parameter
+        /// </summary>
+        /// <param name="inst">the CIL instruction</param>
+        /// <param name="m">the method parameter</param>
+        public void MethInst(MethodOp inst, Method m)
+        {
+            Debug.Assert(m != null);
+            if (m is MethodDef)
+                if (((MethodDef)m).GetScope() != thisMeth.GetScope())
+                    throw new DescriptorException();
+            AddToBuffer(new MethInstr(inst, m));
+        }
+
+        /// <summary>
+        /// Add an instruction with a type parameter
+        /// </summary>
+        /// <param name="inst">the CIL instruction</param>
+        /// <param name="aType">the type argument for the CIL instruction</param>
+        public void TypeInst(TypeOp inst, Type aType)
+        {
+            Debug.Assert(aType != null);
+            if (aType is ClassDef)
+            {
+                if (((ClassDef)aType).GetScope() != thisMeth.GetScope())
+                    throw new DescriptorException();
+            }
+            AddToBuffer(new TypeInstr(inst, aType));
+        }
+
+        /// <summary>
+        /// Add a branch instruction
+        /// </summary>
+        /// <param name="inst">the branch instruction</param>
+        /// <param name="lab">the label that is the target of the branch</param>
+        public void Branch(BranchOp inst, CILLabel lab)
+        {
+            Debug.Assert(lab != null);
+            AddToBuffer(new BranchInstr(inst, lab));
+        }
+
+        /// <summary>
+        /// Add a switch instruction
+        /// </summary>
+        /// <param name="labs">the target labels for the switch</param>
+        public void Switch(CILLabel[] labs)
+        {
+            AddToBuffer(new SwitchInstr(labs));
+        }
+
+        /// <summary>
+        /// Add a byte to the CIL instructions (.emitbyte)
+        /// </summary>
+        /// <param name="bVal"></param>
+        public void emitbyte(byte bVal)
+        {
+            AddToBuffer(new CILByte(bVal));
+        }
+
+        /// <summary>
+        /// Add an instruction which puts an integer on TOS.  This method
+        /// selects the correct instruction based on the value of the integer.
+        /// </summary>
+        /// <param name="i">the integer value</param>
+        public void PushInt(int i)
+        {
+            if (i == -1)
+            {
+                AddToBuffer(new Instr(Op.ldc_i4_m1));
+            }
+            else if ((i >= 0) && (i <= 8))
+            {
+                Op op = (Op)(Op.ldc_i4_0 + i);
+                AddToBuffer(new Instr(op));
+            }
+            else if ((i >= minByteVal) && (i <= maxByteVal))
+            {
+                AddToBuffer(new IntInstr(IntOp.ldc_i4_s, i));
+            }
+            else
+            {
+                AddToBuffer(new IntInstr(IntOp.ldc_i4, i));
+            }
+        }
+
+        /// <summary>
+        /// Add the instruction to load a long on TOS
+        /// </summary>
+        /// <param name="l">the long value</param>
+        public void PushLong(long l)
+        {
+            AddToBuffer(new LongInstr(SpecialOp.ldc_i8, l));
+        }
+
+        /// <summary>
+        /// Add an instruction to push the boolean value true on TOS
+        /// </summary>
+        public void PushTrue()
+        {
+            AddToBuffer(new Instr(Op.ldc_i4_1));
+        }
+
+        /// <summary>
+        ///  Add an instruction to push the boolean value false on TOS
+        /// </summary>
+        public void PushFalse()
+        {
+            AddToBuffer(new Instr(Op.ldc_i4_0));
+        }
+
+        /// <summary>
+        /// Add the instruction to load an argument on TOS.  This method
+        /// selects the correct instruction based on the value of argNo
+        /// </summary>
+        /// <param name="argNo">the number of the argument</param>
+        public void LoadArg(int argNo)
+        {
+            if (argNo < 4)
+            {
+                Op op = (Op)Op.ldarg_0 + argNo;
+                AddToBuffer(new Instr(op));
+            }
+            else if (argNo <= maxUByteVal)
+            {
+                AddToBuffer(new UIntInstr(IntOp.ldarg_s, (uint)argNo));
+            }
+            else
+            {
+                AddToBuffer(new UIntInstr(IntOp.ldarg, (uint)argNo));
+            }
+        }
+
+        /// <summary>
+        /// Add the instruction to load the address of an argument on TOS.
+        /// This method selects the correct instruction based on the value
+        /// of argNo.
+        /// </summary>
+        /// <param name="argNo">the number of the argument</param>
+        public void LoadArgAdr(int argNo)
+        {
+            if (argNo <= maxUByteVal)
+            {
+                AddToBuffer(new UIntInstr(IntOp.ldarga_s, (uint)argNo));
+            }
+            else
+            {
+                AddToBuffer(new UIntInstr(IntOp.ldarga, (uint)argNo));
+            }
+        }
+
+        /// <summary>
+        /// Add the instruction to load a local on TOS.  This method selects
+        /// the correct instruction based on the value of locNo.
+        /// </summary>
+        /// <param name="locNo">the number of the local to load</param>
+        public void LoadLocal(int locNo)
+        {
+            if (locNo < 4)
+            {
+                Op op = (Op)Op.ldloc_0 + locNo;
+                AddToBuffer(new Instr(op));
+            }
+            else if (locNo <= maxUByteVal)
+            {
+                AddToBuffer(new UIntInstr(IntOp.ldloc_s, (uint)locNo));
+            }
+            else
+            {
+                AddToBuffer(new UIntInstr(IntOp.ldloc, (uint)locNo));
+            }
+        }
+
+        /// <summary>
+        /// Add the instruction to load the address of a local on TOS.
+        /// This method selects the correct instruction based on the 
+        /// value of locNo.
+        /// </summary>
+        /// <param name="locNo">the number of the local</param>
+        public void LoadLocalAdr(int locNo)
+        {
+            if (locNo <= maxUByteVal)
+            {
+                AddToBuffer(new UIntInstr(IntOp.ldloca_s, (uint)locNo));
+            }
+            else
+            {
+                AddToBuffer(new UIntInstr(IntOp.ldloca, (uint)locNo));
+            }
+        }
+
+        /// <summary>
+        /// Add the instruction to store to an argument.  This method
+        /// selects the correct instruction based on the value of argNo.
+        /// </summary>
+        /// <param name="argNo">the argument to be stored to</param>
+        public void StoreArg(int argNo)
+        {
+            if (argNo <= maxUByteVal)
+            {
+                AddToBuffer(new UIntInstr(IntOp.starg_s, (uint)argNo));
+            }
+            else
+            {
+                AddToBuffer(new UIntInstr(IntOp.starg, (uint)argNo));
+            }
+        }
+
+        /// <summary>
+        /// Add the instruction to store to a local.  This method selects
+        /// the correct instruction based on the value of locNo.
+        /// </summary>
+        /// <param name="locNo">the local to be stored to</param>
+        public void StoreLocal(int locNo)
+        {
+            if (locNo < 4)
+            {
+                Op op = (Op)Op.stloc_0 + locNo;
+                AddToBuffer(new Instr(op));
+            }
+            else if (locNo <= maxUByteVal)
+            {
+                AddToBuffer(new UIntInstr(IntOp.stloc_s, (uint)locNo));
+            }
+            else
+            {
+                AddToBuffer(new UIntInstr(IntOp.stloc, (uint)locNo));
+            }
+        }
+
+        public void IntLine(int num)
+        {
+            Line((uint)num, 1);
+        }
+
+        /// <summary>
+        /// CLS compliant version of Line()
+        /// </summary>
+        /// <param name="sLin">The start line</param>
+        /// <param name="sCol">The start column</param>
+        /// <param name="eLin">The end line</param>
+        /// <param name="eCol">The end column</param>
+        public void IntLine(int sLin, int sCol, int eLin, int eCol)
+        {
+            Line((uint)sLin, (uint)sCol, (uint)eLin, (uint)eCol);
+        }
+
+        /// <summary>
+        /// Create a new line instruction.
+        /// </summary>
+        /// <param name="num">The line for the given code segment.</param>
+        /// <param name="startCol">The starting column for the code segment.</param>
+        public void Line(uint num, uint startCol)
+        {
+            if (this.DefaultSourceFile == null) throw new Exception("Method can only be used if DefaultSourceFile has been set.");
+            AddToBuffer(new Line(num, startCol, this.DefaultSourceFile));
+        }
+
+        /// <summary>
+        /// Create a new line instruction.
+        /// </summary>
+        /// <param name="num">The line for the given code segment.</param>
+        /// <param name="startCol">The starting column for the code segment.</param>
+        /// <param name="endCol">The ending column for the code segment.</param>
+        public void Line(uint num, uint startCol, uint endCol)
+        {
+            if (this.DefaultSourceFile == null) throw new Exception("Method can only be used if DefaultSourceFile has been set.");
+            AddToBuffer(new Line(num, startCol, num, endCol, this.DefaultSourceFile));
+        }
+
+        /// <summary>
+        /// Create a new line instruction.
+        /// </summary>
+        /// <param name="startNum">The starting line for the code segment.</param>
+        /// <param name="startCol">The starting column for the code segment.</param>
+        /// <param name="endNum">The ending line for the code segment.</param>
+        /// <param name="endCol">The ending column for the code segment.</param>
+        public void Line(uint startNum, uint startCol, uint endNum, uint endCol)
+        {
+            if (this.DefaultSourceFile == null) throw new Exception("Method can only be used if DefaultSourceFile has bene set.");
+            AddToBuffer(new Line(startNum, startCol, endNum, endCol, this.DefaultSourceFile));
+        }
+
+        /// <summary>
+        /// Create a new line instruction.
+        /// </summary>
+        /// <param name="startNum">The starting line for the code segment.</param>
+        /// <param name="startCol">The starting column for the code segment.</param>
+        /// <param name="endNum">The ending line for the code segment.</param>
+        /// <param name="endCol">The ending column for the code segment.</param>
+        /// <param name="sFile">The source file for the given code segment.</param>
+        public void Line(uint startNum, uint startCol, uint endNum, uint endCol, SourceFile sFile)
+        {
+            AddToBuffer(new Line(startNum, startCol, endNum, endCol, sFile));
+        }
+
+        /// <summary>
+        /// The current scope.
+        /// </summary>
+        public Scope CurrentScope
+        {
+            get { return currentScope; }
+        }
+
+        /// <summary>
+        /// Open a new scope.
+        /// </summary>
+        public void OpenScope()
+        {
+            currentScope = new Scope(currentScope, thisMeth);
+            AddToBuffer(new OpenScope(currentScope));
+            //Console.WriteLine("Open scope on " + currentScope._thisMeth.Name());
+        }
+
+        /// <summary>
+        /// Close the current scope.
+        /// </summary>
+        public void CloseScope()
+        {
+            //Console.WriteLine("Close scope on " + currentScope._thisMeth.Name());
+            AddToBuffer(new CloseScope(currentScope));
+            currentScope = currentScope._parent;
+        }
+
+        /// <summary>
+        /// Bind a local to the CIL instructions.
+        /// </summary>
+        /// <param name="name">The name of the local variable..</param>
+        /// <param name="index">The index of the local variable.</param>
+        /// <returns>The LocalBinding object created with the given values.</returns>
+        public LocalBinding BindLocal(string name, int index)
+        {
+            if (currentScope == null)
+                throw new Exception("Scope must be opened before locals can be bound.");
+            return currentScope.AddLocalBinding(name, index);
+        }
+
+        /// <summary>
+        /// Bind a local to the CIL instructions.
+        /// </summary>
+        /// <param name="local">The local variable to load.</param>
+        /// <returns>The LocalBinding object created for the given Local object.</returns>
+        public LocalBinding BindLocal(Local local)
+        {
+            return BindLocal(local.Name, local.GetIndex());
+        }
+
+        /// <summary>
+        /// Bind a constant to the CIL instructions.
+        /// </summary>
+        /// <param name="name">The name of the constant.</param>
+        /// <param name="value">The value of the constant.</param>
+        /// <param name="type">The type of the constant.</param>
+        /// <returns>Return the ConstantBinding created with the given values.</returns>
+        public ConstantBinding BindConstant(string name, object value, Type type)
+        {
+            if (currentScope == null)
+                throw new Exception("Scope must be opened before constants can be bound.");
+            return currentScope.AddConstantBinding(name, value, type);
+        }
+
+        /// <summary>
+        /// Mark this position as the start of a new block
+        /// (try, catch, filter, finally or fault)
+        /// </summary>
+        public void StartBlock()
+        {
+            if (blockStack == null) blockStack = new Stack();
+            blockStack.Push(NewCodedLabel());
+        }
+
+        /// <summary>
+        /// Mark this position as the end of the last started block and
+        /// make it a try block.  This try block is added to the current 
+        /// instructions (ie do not need to call AddTryBlock)
+        /// </summary>
+        /// <returns>The try block just ended</returns>
+        public TryBlock EndTryBlock()
+        {
+            TryBlock tBlock = new TryBlock((CILLabel)blockStack.Pop(), NewCodedLabel());
+            AddTryBlock(tBlock);
+            return tBlock;
+        }
+
+        /// <summary>
+        /// Mark this position as the end of the last started block and
+        /// make it a catch block.  This catch block is associated with the
+        /// specified try block.
+        /// </summary>
+        /// <param name="exceptType">the exception type to be caught</param>
+        /// <param name="tryBlock">the try block associated with this catch block</param>
+        public void EndCatchBlock(Class exceptType, TryBlock tryBlock)
+        {
+            Catch catchBlock = new Catch(exceptType, (CILLabel)blockStack.Pop(), NewCodedLabel());
+            tryBlock.AddHandler(catchBlock);
+        }
+
+        /// <summary>
+        /// Mark this position as the end of the last started block and
+        /// make it a filter block.  This filter block is associated with the
+        /// specified try block.  The format is:
+        /// filterLab:   ...
+        ///              ...
+        /// filterHandler :  ...
+        ///                  ...             
+        /// </summary>
+        /// <param name="filterLab">the label where the filter code is</param>
+        /// <param name="tryBlock">the try block associated with this filter block</param>
+        public void EndFilterBlock(CILLabel filterLab, TryBlock tryBlock)
+        {
+            Filter filBlock = new Filter(filterLab, (CILLabel)blockStack.Pop(), NewCodedLabel());
+            tryBlock.AddHandler(filBlock);
+        }
+
+        /// <summary>
+        /// Mark this position as the end of the last started block and
+        /// make it a finally block.  This finally block is associated with the
+        /// specified try block.
+        /// </summary>
+        /// <param name="tryBlock">the try block associated with this finally block</param>
+        public void EndFinallyBlock(TryBlock tryBlock)
+        {
+            Finally finBlock = new Finally((CILLabel)blockStack.Pop(), NewCodedLabel());
+            tryBlock.AddHandler(finBlock);
+        }
+
+        /// <summary>
+        /// Mark this position as the end of the last started block and
+        /// make it a fault block.  This fault block is associated with the
+        /// specified try block.
+        /// </summary>
+        /// <param name="tryBlock">the try block associated with this fault block</param>
+        public void EndFaultBlock(TryBlock tryBlock)
+        {
+            Fault fBlock = new Fault((CILLabel)blockStack.Pop(), NewCodedLabel());
+            tryBlock.AddHandler(fBlock);
+        }
+
+        public void AddTryBlock(TryBlock tryBlock)
+        {
+            if (exceptions == null)
+                exceptions = new ArrayList();
+            else if (exceptions.Contains(tryBlock)) return;
+            exceptions.Add(tryBlock);
+        }
+
+        /*------------------------- private methods ----------------------------*/
+
+        private void AddToBuffer(CILInstruction inst)
+        {
+            if (tide >= buffer.Length)
+            {
+                CILInstruction[] tmp = buffer;
+                buffer = new CILInstruction[tmp.Length * 2];
+                for (int i = 0; i < tide; i++)
+                {
+                    buffer[i] = tmp[i];
+                }
+            }
+            //Console.WriteLine("Adding instruction at offset " + offset + " with size " + inst.size);
+            //inst.offset = offset;
+            //offset += inst.size;
+            inst.index = (uint)tide;
+            buffer[tide++] = inst;
+        }
+
+        private void UpdateIndexesFrom(int ix)
+        {
+            for (int i = ix; i < tide; i++)
+            {
+                buffer[i].index = (uint)i;
+            }
+        }
+
+        private void InsertInstructions(int ix, CILInstruction[] newInsts, int numNew)
+        {
+            CILInstruction[] newBuff = buffer, oldBuff = buffer;
+            int newSize = tide + numNew - numReplace;
+            if (buffer.Length < newSize)
+            {
+                newBuff = new CILInstruction[newSize];
+                for (int i = 0; i < ix; i++)
+                {
+                    newBuff[i] = oldBuff[i];
+                }
+            }
+            // shuffle up
+            int offset = numNew - numReplace;
+            int end = ix + numReplace;
+            for (int i = tide - 1; i >= end; i--)
+            {
+                newBuff[i + offset] = oldBuff[i];
+            }
+            // insert new instructions
+            for (int i = 0; i < numNew; i++)
+            {
+                newBuff[ix + i] = newInsts[i];
+            }
+            buffer = newBuff;
+            tide += numNew - numReplace;
+            UpdateIndexesFrom(ix);
+        }
+
+        internal bool IsEmpty()
+        {
+            return tide == 0;
+        }
+
+        internal static CILLabel GetLabel(ArrayList labs, uint targetOffset)
+        {
+            CILLabel lab;
+            int i = 0;
+            while ((i < labs.Count) && (((CILLabel)labs[i]).offset < targetOffset)) i++;
+            if (i < labs.Count)
+            {
+                if (((CILLabel)labs[i]).offset == targetOffset) // existing label
+                    lab = (CILLabel)labs[i];
+                else
+                {
+                    lab = new CILLabel(targetOffset);
+                    labs.Insert(i, lab);
+                }
+            }
+            else
+            {
+                lab = new CILLabel(targetOffset);
+                labs.Add(lab);
+            }
+            return lab;
+        }
+
+        internal void AddEHClause(EHClause ehc)
+        {
+            if (exceptions == null)
+                exceptions = new ArrayList();
+            exceptions.Add(ehc);
+        }
+
+        internal void SetAndResolveInstructions(CILInstruction[] insts)
+        {
+            offset = 0;
+            ArrayList labels = new ArrayList();
+            for (int i = 0; i < insts.Length; i++)
+            {
+                insts[i].offset = offset;
+                offset += insts[i].size;
+                if (insts[i] is BranchInstr)
+                {
+                    ((BranchInstr)insts[i]).MakeTargetLabel(labels);
+                }
+                else if (insts[i] is SwitchInstr)
+                {
+                    ((SwitchInstr)insts[i]).MakeTargetLabels(labels);
+                }
+            }
+            if (exceptions != null)
+            {
+                for (int i = 0; i < exceptions.Count; i++)
+                {
+                    exceptions[i] = ((EHClause)exceptions[i]).MakeTryBlock(labels);
+                }
+            }
+            if (labels.Count == 0) { buffer = insts; tide = buffer.Length; return; }
+            buffer = new CILInstruction[insts.Length + labels.Count];
+            int currentPos = 0;
+            tide = 0;
+            for (int i = 0; i < labels.Count; i++)
+            {
+                CILLabel lab = (CILLabel)labels[i];
+                while ((currentPos < insts.Length) && (insts[currentPos].offset < lab.offset))
+                    buffer[tide++] = insts[currentPos++];
+                buffer[tide++] = lab;
+            }
+            while (currentPos < insts.Length)
+            {
+                buffer[tide++] = insts[currentPos++];
+            }
+        }
+
+        internal uint GetCodeSize()
+        {
+            return codeSize + paddingNeeded + exceptSize;
+        }
+
+        internal void BuildTables(MetaDataOut md)
+        {
+            for (int i = 0; i < tide; i++)
+            {
+                buffer[i].BuildTables(md);
+            }
+            if (exceptions != null)
+            {
+                for (int i = 0; i < exceptions.Count; i++)
+                {
+                    ((TryBlock)exceptions[i]).BuildTables(md);
+                }
+            }
+        }
+
+        internal void BuildCILInfo(CILWriter output)
+        {
+            for (int i = 0; i < tide; i++)
+            {
+                buffer[i].BuildCILInfo(output);
+            }
+            if (exceptions != null)
+            {
+                for (int i = 0; i < exceptions.Count; i++)
+                {
+                    ((TryBlock)exceptions[i]).BuildCILInfo(output);
+                }
+            }
+        }
+
+        internal void ChangeRefsToDefs(ClassDef newType, ClassDef[] oldTypes)
+        {
+            for (int i = 0; i < tide; i++)
+            {
+                if (buffer[i] is SigInstr)
+                {
+                    CalliSig sig = ((SigInstr)buffer[i]).GetSig();
+                    sig.ChangeRefsToDefs(newType, oldTypes);
+                }
+                else if (buffer[i] is TypeInstr)
+                {
+                    TypeInstr tinst = (TypeInstr)buffer[i];
+                    if (tinst.GetTypeArg() is ClassDef)
+                    {
+                        ClassDef iType = (ClassDef)tinst.GetTypeArg();
+                        bool changed = false;
+                        for (int j = 0; (j < oldTypes.Length) && !changed; j++)
+                        {
+                            if (iType == oldTypes[j])
+                                tinst.SetTypeArg(newType);
+                        }
+                    }
+                }
+            }
+        }
+
+        internal void AddToLines(Line line)
+        {
+            if ((line.sourceFile == null) || (line.sourceFile.Match(defaultSourceFile)))
+            {
+                if (defaultLines == null)
+                {
+                    if (defaultSourceFile == null)
+                        throw new Exception("No Default Source File Set");
+                    defaultLines = new ArrayList();
+                }
+                defaultLines.Add(line);
+                return;
+            }
+            if (sourceLines == null)
+            {
+                sourceLines = new ArrayList();
+            }
+            else
+            {
+                for (int i = 0; i < sourceLines.Count; i++)
+                {
+                    ArrayList lineList = (ArrayList)sourceLines[i];
+                    if (((Line)lineList[0]).sourceFile.Match(line.sourceFile))
+                    {
+                        lineList.Add(line);
+                        return;
+                    }
+                }
+                ArrayList newList = new ArrayList();
+                newList.Add(line);
+                sourceLines.Add(newList);
+            }
+        }
+
+        internal void CheckCode(uint locSigIx, bool initLocals, int maxStack, MetaDataOut metaData)
+        {
+            if (tide == 0) return;
+            offset = 0;
+            for (int i = 0; i < tide; i++)
+            {
+                buffer[i].offset = offset;
+                offset += buffer[i].size;
+                if (buffer[i] is Line)
+                    AddToLines((Line)buffer[i]);
+            }
+            bool changed = true;
+            while (changed)
+            {
+                changed = false;
+                Line prevLine = null;
+                for (int i = 0; i < tide; i++)
+                {
+                    if (buffer[i] is Line)
+                    {
+                        if (prevLine != null)
+                            prevLine.CalcEnd((Line)buffer[i]);
+                        prevLine = (Line)buffer[i];
+                    }
+                    changed = buffer[i].Check(metaData) || changed;
+                }
+                if (prevLine != null) prevLine.Last();
+                if (changed)
+                {
+                    for (int i = 1; i < tide; i++)
+                    {
+                        buffer[i].offset = buffer[i - 1].offset + buffer[i - 1].size;
+                    }
+                    offset = buffer[tide - 1].offset + buffer[tide - 1].size;
+                }
+            }
+            codeSize = offset;
+            if (Diag.DiagOn) Console.WriteLine("codeSize before header added = " + codeSize);
+            if (maxStack == 0) this.maxStack = 8;
+            else this.maxStack = (short)maxStack;
+            if ((offset < smallSize) && (maxStack <= 8) && (locSigIx == 0) && (exceptions == null))
+            {
+                // can use tiny header
+                if (Diag.DiagOn) Console.WriteLine("Tiny Header");
+                tinyFormat = true;
+                headerFlags = (ushort)(TinyFormat | ((ushort)codeSize << 2));
+                codeSize++;
+                if ((codeSize % 4) != 0) { paddingNeeded = 4 - (codeSize % 4); }
+            }
+            else
+            {
+                if (Diag.DiagOn) Console.WriteLine("Fat Header");
+                tinyFormat = false;
+                localSigIx = locSigIx;
+                //this.maxStack = (short)maxStack;
+                headerFlags = FatFormatHeader;
+                if (exceptions != null)
+                {
+                    // Console.WriteLine("Got exceptions");
+                    headerFlags |= MoreSects;
+                    uint numExceptClauses = 0;
+                    for (int i = 0; i < exceptions.Count; i++)
+                    {
+                        TryBlock tryBlock = (TryBlock)exceptions[i];
+                        tryBlock.SetSize();
+                        numExceptClauses += (uint)tryBlock.NumHandlers();
+                        if (tryBlock.isFat()) fatExceptionFormat = true;
+                    }
+                    if (numExceptClauses > MaxClauses) fatExceptionFormat = true;
+                    if (Diag.DiagOn) Console.WriteLine("numexceptclauses = " + numExceptClauses);
+                    if (fatExceptionFormat)
+                    {
+                        if (Diag.DiagOn) Console.WriteLine("Fat exception format");
+                        exceptHeader = FatExceptTable;
+                        exceptSize = ExHeaderSize + numExceptClauses * FatExClauseSize;
+                    }
+                    else
+                    {
+                        if (Diag.DiagOn) Console.WriteLine("Tiny exception format");
+                        exceptHeader = SmlExceptTable;
+                        exceptSize = ExHeaderSize + numExceptClauses * SmlExClauseSize;
+                    }
+                    if (Diag.DiagOn) Console.WriteLine("exceptSize = " + exceptSize);
+                }
+                if (initLocals) headerFlags |= InitLocals;
+                if ((offset % 4) != 0) { paddingNeeded = 4 - (offset % 4); }
+                codeSize += FatSize;
+            }
+            if (Diag.DiagOn)
+                Console.WriteLine("codeSize = " + codeSize + "  headerFlags = " + Hex.Short(headerFlags));
+        }
+
+        /// <summary>
+        /// Returns the maximum stack depth required by these CIL instructions.
+        /// </summary>
+        /// <returns>The integer value of the stck depth.</returns>
+        public int GetMaxStackDepthRequired()
+        {
+            if (tide == 0) return 0;
+
+            // Store the code blocks we find
+            SCG.List<CodeBlock> codeBlocks = new SCG.List<CodeBlock>();
+            SCG.Dictionary<CILLabel, CodeBlock> cbTable = new SCG.Dictionary<CILLabel, CodeBlock>();
+            SCG.List<CodeBlock> extraStartingBlocks = new SCG.List<CodeBlock>();
+
+            // Start a default code block
+            CodeBlock codeBlock = new CodeBlock(this);
+            codeBlock.StartIndex = 0;
+
+            //
+            // Identify the code blocks
+            //
+            for (int i = 0; i < tide; i++)
+            {
+
+                /* Handling the tail instruction:
+                 * The tail instruction has not been handled even though
+                 * it indicates the end of a code block is coming.  The
+                 * reason for this is because any valid tail instruction
+                 * must be followed by a call* instruction and then a ret
+                 * instruction.  Given a ret instruction must be the second
+                 * next instruction anyway it has been decided to just let 
+                 * the end block be caught then.
+                 */
+
+                // If we reach a branch instruction or a switch instruction 
+                // then end the current code block inclusive of the instruction.
+                if ((buffer[i] is BranchInstr) || (buffer[i] is SwitchInstr))
+                {
+
+                    // Close the old block
+                    codeBlock.EndIndex = i;
+                    if (codeBlock.EndIndex >= codeBlock.StartIndex) // Don't add empty blocks
+                        codeBlocks.Add(codeBlock);
+
+                    // Open a new block
+                    codeBlock = new CodeBlock(this);
+                    codeBlock.StartIndex = i + 1;
+
+                    // If we reach a label then we need to start a new
+                    // code block as the label is an entry point.
+                }
+                else if (buffer[i] is CILLabel)
+                {
+
+                    // Close the old block
+                    codeBlock.EndIndex = i - 1;
+                    if (codeBlock.EndIndex >= codeBlock.StartIndex) // Don't add empty blocks
+                        codeBlocks.Add(codeBlock);
+
+                    // Open a new block
+                    codeBlock = new CodeBlock(this);
+                    codeBlock.StartIndex = i;
+
+                    // Set this label as the entry point for the code block
+                    codeBlock.EntryLabel = (CILLabel)buffer[i];
+                    // AND ... list in the dictionary.
+                    cbTable.Add(codeBlock.EntryLabel, codeBlock);
+
+                    // Check for the ret, throw, rethrow, or jmp instruction as they also end a block
+                }
+                else if (buffer[i] is Instr)
+                {
+                    if (
+                        (((Instr)buffer[i]).GetOp() == Op.ret) ||
+                        (((Instr)buffer[i]).GetOp() == Op.throwOp) ||
+                        (((Instr)buffer[i]).GetOp() == Op.rethrow) ||
+                        ((buffer[i] is MethInstr) && (((MethInstr)buffer[i]).GetMethodOp() == MethodOp.jmp))
+                       )
+                    {
+
+                        // Close the old block
+                        codeBlock.EndIndex = i;
+                        if (codeBlock.EndIndex >= codeBlock.StartIndex) // Don't add empty blocks
+                            codeBlocks.Add(codeBlock);
+
+                        // Open a new block
+                        // In theory this should never happen but just in case
+                        // someone feels like adding dead code it is supported.
+                        codeBlock = new CodeBlock(this);
+                        codeBlock.StartIndex = i + 1;
+
+                    }
+
+                }
+
+            }
+
+            // Close the last block
+            codeBlock.EndIndex = tide - 1;
+            if (codeBlock.EndIndex >= codeBlock.StartIndex) // Don't add empty blocks
+                codeBlocks.Add(codeBlock);
+            codeBlock = null;
+
+            // Check how many code blocks there are.  If an blocks return 0.
+            if (codeBlocks.Count == 0) return 0;
+
+            //
+            // Loop through each code block and calculate the delta distance
+            //
+            for (int j = 0; j < codeBlocks.Count; j++)
+            {
+                CodeBlock block = codeBlocks[j];
+
+                int maxDepth = 0;
+                int currentDepth = 0;
+
+                // Loop through each instruction to work out the max depth
+                for (int i = block.StartIndex; i <= block.EndIndex; i++)
+                {
+
+                    // Get the depth after the next instruction
+                    currentDepth += buffer[i].GetDeltaDistance();
+
+                    // If the new current depth is greater then the maxDepth adjust the maxDepth to reflect
+                    if (currentDepth > maxDepth)
+                        maxDepth = currentDepth;
+
+                }
+
+                // Set the depth of the block
+                block.MaxDepth = maxDepth;
+                block.DeltaDistance = currentDepth;
+
+                //
+                // Link up the next blocks
+                //
+
+                // If the block ends with a branch statement set the jump and fall through.
+                if (buffer[block.EndIndex] is BranchInstr)
+                {
+                    BranchInstr branchInst = (BranchInstr)buffer[block.EndIndex];
+
+                    // If this is not a "br" or "br.s" then set the fall through code block
+                    if ((branchInst.GetBranchOp() != BranchOp.br) &&
+                        (branchInst.GetBranchOp() != BranchOp.br_s))
+                        // If there is a following code block set it as the fall through
+                        if (j < (codeBlocks.Count - 1))
+                            block.NextBlocks.Add(codeBlocks[j + 1]);
+
+                    // Set the code block we are jumping to
+                    CodeBlock cb = null;
+                    cbTable.TryGetValue(branchInst.GetDest(), out cb);
+                    if (cb == null)
+                        throw new Exception("Missing Branch Label");
+                    block.NextBlocks.Add(cb);
+
+                    // If the block ends in a switch instruction work out the possible next blocks
+                }
+                else if (buffer[block.EndIndex] is SwitchInstr)
+                {
+                    SwitchInstr switchInstr = (SwitchInstr)buffer[block.EndIndex];
+
+                    // If there is a following code block set it as the fall through
+                    if (j < (codeBlocks.Count - 1))
+                        block.NextBlocks.Add(codeBlocks[j + 1]);
+
+                    // Add each destination block
+                    foreach (CILLabel label in switchInstr.GetDests())
+                    {
+
+                        // Check all of the code blocks to find the jump destination
+                        CodeBlock cb = null;
+                        cbTable.TryGetValue(label, out cb);
+                        if (cb == null) throw new Exception("Missing Case Label");
+                        block.NextBlocks.Add(cb);
+
+                    }
+
+                    // So long as the block doesn't end with a terminating instruction like ret or throw, just fall through to the next block
+                }
+                else if (!IsTerminatingInstruction(buffer[block.EndIndex]))
+                {
+
+                    // If there is a following code block set it as the fall through
+                    if (j < (codeBlocks.Count - 1))
+                        block.NextBlocks.Add(codeBlocks[j + 1]);
+                }
+
+            }
+
+            //
+            // Join up any exception blocks
+            //
+
+            if (exceptions != null)
+            {
+                foreach (TryBlock tryBlock in exceptions)
+                {
+
+                    // Try to find the code block where this try block starts
+                    CodeBlock tryCodeBlock;
+                    cbTable.TryGetValue(tryBlock.Start, out tryCodeBlock);
+
+                    // Declare that the entry to this code block must be empty
+                    tryCodeBlock.RequireEmptyEntry = true;
+
+                    // Work with each of the handlers
+                    foreach (HandlerBlock hb in tryBlock.GetHandlers())
+                    {
+
+                        // Find the code block where this handler block starts.
+                        CodeBlock handlerCodeBlock;
+                        cbTable.TryGetValue(hb.Start, out handlerCodeBlock);
+
+                        // If the code block is a catch or filter block increment the delta 
+                        // distance by 1. This is to factor in the exception object that will 
+                        // be secretly placed on the stack by the runtime engine.
+                        // However, this also means that the MaxDepth is up by one also!
+                        if (hb is Catch || hb is Filter)
+                        {
+                            handlerCodeBlock.DeltaDistance++;
+                            handlerCodeBlock.MaxDepth++;
+                        }
+
+                        // If the code block is a filter block increment the delta distance by 1
+                        // This is to factor in the exception object that will be placed on the stack.
+                        // if (hb is Filter) handlerCodeBlock.DeltaDistance++;
+
+                        // Add this handler to the list of starting places
+                        extraStartingBlocks.Add(handlerCodeBlock);
+
+                    }
+
+                }
+            }
+
+
+            //
+            // Traverse the code blocks and get the depth
+            //
+
+            // Get the max depth at the starting entry point
+            int finalMaxDepth = this.TraverseMaxDepth(codeBlocks[0]);
+
+            // Check the additional entry points
+            // If the additional points have a greater depth update the max depth
+            foreach (CodeBlock cb in extraStartingBlocks)
+            {
+                // int tmpMaxDepth = cb.TraverseMaxDepth();
+                int tmpMaxDepth = this.TraverseMaxDepth(cb);
+                if (tmpMaxDepth > finalMaxDepth) finalMaxDepth = tmpMaxDepth;
+            }
+
+            // Return the max depth we have found
+            return finalMaxDepth;
+
+        }
+
+
+        int TraverseMaxDepth(CodeBlock entryBlock)
+        {
+            int max = 0;
+            SCG.Queue<CodeBlock> worklist = new SCG.Queue<CodeBlock>();
+            entryBlock.Visited = true;
+            entryBlock.LastVisitEntryDepth = 0;
+            worklist.Enqueue(entryBlock);
+            while (worklist.Count > 0)
+            {
+                int count = worklist.Count;
+                CodeBlock unit = worklist.Dequeue();
+
+                int maxDepth = unit.LastVisitEntryDepth + unit.MaxDepth;
+                int exitDepth = unit.LastVisitEntryDepth + unit.DeltaDistance;
+
+                if (maxDepth > max) max = maxDepth;
+
+                foreach (CodeBlock succ in unit.NextBlocks)
+                {
+                    if (succ.Visited)
+                    {
+                        if (succ.LastVisitEntryDepth != exitDepth)
+                            throw new InvalidStackDepth("inconsistent stack depth at offset " + succ.StartIndex.ToString());
+                    }
+                    else
+                    {
+                        succ.Visited = true;
+                        succ.LastVisitEntryDepth = exitDepth;
+                        worklist.Enqueue(succ);
+                    }
+                }
+            }
+            return max;
+        }
+
+        private bool IsTerminatingInstruction(CILInstruction cilInstr)
+        {
+            // Return or throw instructions are terminating instructions
+            if (cilInstr is Instr)
+            {
+                if (((Instr)cilInstr).GetOp() == Op.ret) return true;
+                if (((Instr)cilInstr).GetOp() == Op.throwOp) return true;
+                if (((Instr)cilInstr).GetOp() == Op.rethrow) return true;
+            }
+            // jmp is a terminating instruction
+            if (cilInstr is MethInstr)
+            {
+                if (((MethInstr)cilInstr).GetMethodOp() == MethodOp.jmp) return true;
+            }
+            return false;
+        }
+
+        internal void Write(PEWriter output)
+        {
+            if (Diag.DiagOn) Console.WriteLine("Writing header flags = " + Hex.Short(headerFlags));
+            if (tinyFormat)
+            {
+                if (Diag.DiagOn) Console.WriteLine("Writing tiny code");
+                output.Write((byte)headerFlags);
+            }
+            else
+            {
+                if (Diag.DiagOn) Console.WriteLine("Writing fat code");
+                output.Write(headerFlags);
+                output.Write((ushort)maxStack);
+                output.Write(offset);
+                output.Write(localSigIx);
+            }
+            if (Diag.DiagOn)
+            {
+                Console.WriteLine(Hex.Int(tide) + " CIL instructions");
+                Console.WriteLine("starting instructions at " + output.Seek(0, SeekOrigin.Current));
+            }
+
+            // Added to enable PDB generation
+            if (output.pdbWriter != null)
+            {
+
+                // Open the method
+                output.pdbWriter.OpenMethod((int)thisMeth.Token());
+
+                // Check if this is the entry point method
+                if (thisMeth.HasEntryPoint()) output.pdbWriter.SetEntryPoint((int)thisMeth.Token());
+            }
+
+            // Write out each memember of the buffer
+            for (int i = 0; i < tide; i++)
+            {
+                buffer[i].Write(output);
+            }
+
+            // Added to enable PDB generation
+            if (output.pdbWriter != null && tide > 0)
+            {
+                output.pdbWriter.CloseMethod();
+            }
+            if (Diag.DiagOn) Console.WriteLine("ending instructions at " + output.Seek(0, SeekOrigin.Current));
+            for (int i = 0; i < paddingNeeded; i++) { output.Write((byte)0); }
+            if (exceptions != null)
+            {
+                // Console.WriteLine("Writing exceptions");
+                // Console.WriteLine("header = " + Hex.Short(exceptHeader) + " exceptSize = " + Hex.Int(exceptSize));
+                output.Write(exceptHeader);
+                output.Write3Bytes((uint)exceptSize);
+                for (int i = 0; i < exceptions.Count; i++)
+                {
+                    TryBlock tryBlock = (TryBlock)exceptions[i];
+                    tryBlock.Write(output, fatExceptionFormat);
+                }
+            }
+        }
+
+        internal void Write(CILWriter output)
+        {
+            for (int i = 0; i < tide; i++)
+            {
+                if (!(buffer[i] is CILLabel))
+                {
+                    output.Write("    ");
+                }
+                output.Write("    ");
+                buffer[i].Write(output);
+            }
+            if (exceptions != null)
+            {
+                throw new NotYetImplementedException("Exceptions not yet implemented for CIL Instructions");
+                // Console.WriteLine("Writing exceptions");
+                // Console.WriteLine("header = " + Hex.Short(exceptHeader) + " exceptSize = " + Hex.Int(exceptSize));
+                //output.Write(exceptHeader);
+                //output.Write3Bytes((uint)exceptSize);
+                //for (int i = 0; i < exceptions.Count; i++) {
+                //     TryBlock tryBlock = (TryBlock)exceptions[i];
+                //    tryBlock.Write(output, fatExceptionFormat);
+                //}
+            }
+        }
+
+        /// <summary>
+        /// Stores the details of a given code block
+        /// </summary>
+        private class CodeBlock
+        {
+            internal int StartIndex;
+            internal int EndIndex;
+            internal int DeltaDistance;
+            internal int MaxDepth;
+            internal CILLabel EntryLabel;
+            internal ArrayList NextBlocks = new ArrayList(); // List of CodeBlock objects
+            // internal int Visits;
+            internal int LastVisitEntryDepth;
+            internal bool RequireEmptyEntry;
+            internal bool Visited = false;
+            private CILInstructions cilInstr;
+
+            /// <summary>
+            /// Create a new code block definition
+            /// </summary>
+            /// <param name="instructions">The buffer the code block relates to</param>
+            internal CodeBlock(CILInstructions instructions)
+            {
+                cilInstr = instructions;
+            }
+        }
+    }
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for an IL instruction
+    /// </summary>
+    public abstract class CILInstruction
+    {
+        protected static readonly sbyte maxByteVal = 127;
+        protected static readonly sbyte minByteVal = -128;
+        protected static readonly byte leadByte = 0xFE;
+        protected static readonly uint USHeapIndex = 0x70000000;
+        protected static readonly uint longInstrStart = (uint)Op.arglist;
+        protected static readonly string[] opcode = { 
+            "nop",     "break",   "ldarg.0", "ldarg.1", "ldarg.2", "ldarg.3", "ldloc.0", "ldloc.1",
+            "ldloc.2", "ldloc.3", "stloc.0", "stloc.1", "stloc.2", "stloc.3", "ldarg.s", "ldarga.s",
+            "starg.s", "ldloc.s", "ldloca.s","stloc.s", "ldnull",  "ldc.i4.m1","ldc.i4.0","ldc.i4.1",
+            "ldc.i4.2","ldc.i4.3","ldc.i4.4","ldc.i4.5","ldc.i4.6","ldc.i4.7","ldc.i4.8","ldc.i4.s",
+            "ldc.i4",  "ldc.i8",  "ldc.r4",  "ldc.r8",  "ERROR",   "dup",     "pop",     "jmp",     
+            "call",    "calli",   "ret",     "br.s",   "brfalse.s","brtrue.s","beq.s",   "bge.s",
+            "bgt.s",   "ble.s",   "blt.s",   "bne.un.s","bge.un.s","bgt.un.s","ble.un.s","blt.un.s",
+            "br",      "brfalse", "brtrue",  "beq",     "bge",     "bgt",     "ble",     "blt",
+            "bne.un",  "bge.un",  "bgt.un",  "ble.un",  "blt.un",  "switch",  "ldind.i1","ldind.u1",
+            "ldind.i2","ldind.u2","ldind.i4","ldind.u4","ldind.i8","ldind.i", "ldind.r4","ldind.r8",
+            "ldind.ref","stind.ref","stind.i1","stind.i2","stind.i4","stind.i8","stind.r4","stind.r8",
+            "add",     "sub",     "mul",     "div",     "div.un",  "rem",     "rem.un",  "and",
+            "or",      "xor",     "shl",     "shr",     "shr.un",  "neg",     "not",     "conv.i1",
+            "conv.i2", "conv.i4", "conv.i8", "conv.r4", "conv.r8", "conv.u4", "conv.u8", "callvirt",
+            "cpobj",   "ldobj",   "ldstr",   "newobj", "castclass","isinst",  "conv.r.un","ERROR",
+            "ERROR",   "unbox",   "throw",   "ldfld",   "ldflda",  "stfld",   "ldsfld",  "ldsflda",
+            "stsfld",             "stobj",              "conv.ovf.i1.un",         "conv.ovf.i2.un",
+            "conv.ovf.i4.un",   "conv.ovf.i8.un",     "conv.ovf.u1.un",         "conv.ovf.u2.un",
+            "conv.ovf.u4.un",     "conv.ovf.u8.un",     "conv.ovf.i.un",          "conv.ovf.u.un",
+            "box",              "newarr",             "ldlen",                  "ldelema",
+            "ldelem.i1",          "ldelem.u1",          "ldelem.i2",              "ldelem.u2",
+            "ldelem.i4",        "ldelem.u4",          "ldelem.i8",              "ldelem.i",
+            "ldelem.r4",          "ldelem.r8",          "ldelem.ref",             "stelem.i",
+            "stelem.i1",        "stelem.i2",          "stelem.i4",              "stelem.i8",
+            "stelem.r4",          "stelem.r8",          "stelem.ref",             "ERROR",
+            "ERROR",            "ERROR",              "ERROR",                  "ERROR",
+            "ERROR",   "ERROR",   "ERROR",   "ERROR",   "ERROR",   "ERROR",   "ERROR",   "ERROR",
+            "ERROR",              "ERROR",              "ERROR",                  "conv.ovf.i1",
+            "conv.ovf.u1",      "conv.ovf.i2",        "conv.ovf.u2",            "conv.ovf.i4",
+            "conv.ovf.u4",        "conv.ovf.i8",        "conv.ovf.u8",            "ERROR",
+            "ERROR",            "ERROR",              "ERROR",                  "ERROR",
+            "ERROR",   "ERROR",  "refanyval","ckfinite","ERROR",   "ERROR",   "mkrefany","ERROR",
+            "ERROR",   "ERROR",   "ERROR",   "ERROR",   "ERROR",   "ERROR",   "ERROR",   "ERROR",
+            "ldtoken","conv.u2","conv.u1","conv.i","conv.ovf.i","conv.ovf.u","add.ovf","add.ovf.un",
+            "mul.ovf","mul.ovf.un","sub.ovf","sub.ovf.un","endfinally","leave","leave.s","stind.i",
+            "conv.u"};
+
+        protected static readonly int[] opDeltaDistance = { 
+              0 /* nop */,             0 /* break */,           1 /* ldarg.0 */,         1 /* ldarg.1 */,         1 /* ldarg.2 */,   1 /* ldarg.3 */,    1 /* ldloc.0 */,     1 /* ldloc.1 */,
+              1 /* ldloc.2 */,         1 /* ldloc.3 */,        -1 /* stloc.0 */,        -1 /* stloc.1 */,        -1 /* stloc.2 */,  -1 /* stloc.3 */,    1 /* ldarg.s */,     1 /* ldarga.s */,
+             -1 /* starg.s */,         1 /* ldloc.s */,         1 /* ldloca.s */,       -1 /* stloc.s */,         1 /* ldnull */,    1 /* ldc.i4.m1 */,  1 /* ldc.i4.0 */,    1 /* ldc.i4.1 */,
+              1 /* ldc.i4.2 */,        1 /* ldc.i4.3 */,        1 /* ldc.i4.4 */,        1 /* ldc.i4.5 */,        1 /* ldc.i4.6 */,  1 /* ldc.i4.7 */,   1 /* ldc.i4.8 */,    1 /* ldc.i4.s */,
+              1 /* ldc.i4 */,          1 /* ldc.i8 */,          1 /* ldc.r4 */,          1 /* ldc.r8 */,        -99 /* ERROR */,     1 /* dup */,       -1 /* pop */,         0 /* jmp */,     
+            -99 /* call */,          -99 /* calli */,           0 /* ret */,             0 /* br.s */,           -1 /* brfalse.s */,-1 /* brtrue.s */,  -2 /* beq.s */,      -2 /* bge.s */,
+             -2 /* bgt.s */,          -2 /* ble.s */,          -2 /* blt.s */,          -2 /* bne.un.s */,       -2 /* bge.un.s */, -2 /* bgt.un.s */,  -2 /* ble.un.s */,   -2 /* blt.un.s */,
+              0 /* br */,             -1 /* brfalse */,        -1 /* brtrue */,         -2 /* beq */,            -2 /* bge */,      -2 /* bgt */,       -2 /* ble */,        -2 /* blt */,
+             -2 /* bne.un */,         -2 /* bge.un */,         -2 /* bgt.un */,         -2 /* ble.un */,         -2 /* blt.un */,   -1 /* switch */,     0 /* ldind.i1 */,    0 /* ldind.u1 */,
+              0 /* ldind.i2 */,        0 /* ldind.u2 */,        0 /* ldind.i4 */,        0 /* ldind.u4 */,        0 /* ldind.i8 */,  0 /* ldind.i */,    0 /* ldind.r4 */,    0 /* ldind.r8 */,
+              0 /* ldind.ref */,      -2 /* stind.ref */,      -2 /* stind.i1 */,       -2 /* stind.i2 */,       -2 /* stind.i4 */, -2 /* stind.i8 */,  -2 /* stind.r4 */,   -2 /* stind.r8 */,
+             -1 /* add */,            -1 /* sub */,            -1 /* mul */,            -1 /* div */,            -1 /* div.un */,   -1 /* rem */,       -1 /* rem.un */,     -1 /* and */,
+             -1 /* or */,             -1 /* xor */,            -1 /* shl */,            -1 /* shr */,            -1 /* shr.un */,    0 /* neg */,        0 /* not */,         0 /* conv.i1 */,
+              0 /* conv.i2 */,         0 /* conv.i4 */,         0 /* conv.i8 */,         0 /* conv.r4 */,         0 /* conv.r8 */,   0 /* conv.u4 */,    0 /* conv.u8 */,   -99 /* callvirt */,
+             -2 /* cpobj */,           0 /* ldobj */,           1 /* ldstr */,         -99 /* newobj */,          0 /* castclass */, 0 /* isinst */,     0 /* conv.r.un */, -99 /* ERROR */,
+            -99 /* ERROR */,           0 /* unbox */,          -1 /* throw */,           0 /* ldfld */,           0 /* ldflda */,   -2 /* stfld */,      1 /* ldsfld */,      1 /* ldsflda */,
+             -1 /* stsfld */,         -2 /* stobj */,           0 /* conv.ovf.i1.un */,  0 /* conv.ovf.i2.un */,
+              0 /* conv.ovf.i4.un */,  0 /* conv.ovf.i8.un */,  0 /* conv.ovf.u1.un */,  0 /* conv.ovf.u2.un */,
+              0 /* conv.ovf.u4.un */,  0 /* conv.ovf.u8.un */,  0 /* conv.ovf.i.un */,   0 /* conv.ovf.u.un */,
+              0 /* box */,             0 /* newarr */,          0 /* ldlen */,          -1 /* ldelema */,
+             -1 /* ldelem.i1 */,      -1 /* ldelem.u1 */,      -1 /* ldelem.i2 */,      -1 /* ldelem.u2 */,
+             -1 /* ldelem.i4 */,      -1 /* ldelem.u4 */,      -1 /* ldelem.i8 */,      -1 /* ldelem.i */,
+             -1 /* ldelem.r4 */,      -1 /* ldelem.r8 */,      -1 /* ldelem.ref */,     -3 /* stelem.i */,
+             -3 /* stelem.i1 */,      -3 /* stelem.i2 */,      -3 /* stelem.i4 */,      -3 /* stelem.i8 */,
+             -3 /* stelem.r4 */,      -3 /* stelem.r8 */,      -3 /* stelem.ref */,    -99 /* ERROR */,
+            -99 /* ERROR */,         -99 /* ERROR */,         -99 /* ERROR */,         -99 /* ERROR */,
+            -99 /* ERROR */,         -99 /* ERROR */,         -99 /* ERROR */,         -99 /* ERROR */,         -99 /* ERROR */,   -99 /* ERROR */,    -99 /* ERROR */,     -99 /* ERROR */,
+            -99 /* ERROR */,         -99 /* ERROR */,         -99 /* ERROR */,           0 /* conv.ovf.i1 */,
+              0 /* conv.ovf.u1 */,     0 /* conv.ovf.i2 */,     0 /* conv.ovf.u2 */,     0 /* conv.ovf.i4 */,
+              0 /* conv.ovf.u4 */,     0 /* conv.ovf.i8 */,     0 /* conv.ovf.u8 */,   -99 /* ERROR */,
+            -99 /* ERROR */,         -99 /* ERROR */,         -99 /* ERROR */,         -99 /* ERROR */,
+            -99 /* ERROR */,         -99 /* ERROR */,           0 /* refanyval */,       0 /* ckfinite */,      -99 /* ERROR */,   -99 /* ERROR */,      0 /* mkrefany */,  -99 /* ERROR */,
+            -99 /* ERROR */,         -99 /* ERROR */,         -99 /* ERROR */,         -99 /* ERROR */,         -99 /* ERROR */,   -99 /* ERROR */,    -99 /* ERROR */,     -99 /* ERROR */,
+              1 /* ldtoken */,         0 /* conv.u2 */,         0 /* conv.u1 */,         0 /* conv.i */,          0 /* conv.ovf.i */,0 /* conv.ovf.u */,-1 /* add.ovf */,    -1 /* add.ovf.un */,
+             -1 /* mul.ovf */,        -1 /* mul.ovf.un */,     -1 /* sub.ovf */,        -1 /* sub.ovf.un */,      0 /* endfinally */,0 /* leave */,      0 /* leave.s */,    -2 /* stind.i */,
+              0 /* conv.u */};
+
+        /// <summary>
+        /// A list of the delta distances for the given CIL instructions.
+        /// </summary>
+        protected static readonly string[] FEopcode = {
+            "arglist", "ceq", "cgt", "cgt.un", "clt", "clt.un", "ldftn", "ldvirtftn",
+            "ERROR", "ldarg", "ldarga", "starg", "ldloc", "ldloca", "stloc", "localloc",
+            "ERROR", "endfilter", "unaligned", "volatile", "tail", "initobj", "ERROR", "cpblk",
+            "initblk", "ERROR", "rethrow", "ERROR", "sizeof", "refanytype", "readonly"};
+
+        /// <summary>
+        /// A list of the delta distances for the given FE CIL instructions.
+        /// </summary>
+        protected static readonly int[] FEopDeltaDistance = {
+            1 /* arglist */, -1 /* ceq */, -1 /* cgt */, -1 /* cgt.un */, -1 /* clt */, -1 /* clt.un */, 1 /* ldftn */, 0 /* ldvirtftn */,
+            -99 /* ERROR */, 1 /* ldarg */, 1 /* ldarga */, -1 /* starg */, 1 /* ldloc */, 1 /* ldloca */, -1 /* stloc */, 0 /* localloc */,
+            -99 /* ERROR */, -1 /* endfilter */, 0 /* unaligned */, 0 /* volatile */, 0 /* tail */, -1 /* initobj */, -99 /* ERROR */, -3 /* cpblk */,
+            -3 /* initblk */, -99 /* ERROR */, 0 /* rethrow */, -99 /* ERROR */, 1 /* sizeof */, 0 /* refanytype */, 0 /* readonly */};
+
+        internal bool twoByteInstr = false;
+        internal uint size = 1;
+        internal uint offset, index;
+
+        internal virtual bool Check(MetaDataOut md)
+        {
+            return false;
+        }
+
+        internal virtual void Resolve() { }
+
+        public int GetPos() { return (int)index; }
+
+        internal abstract string GetInstName();
+
+        /// <summary>
+        /// Get the delta distance for this instruction.
+        /// </summary>
+        /// <remarks>
+        /// The delta distance is the resulting difference of items 
+        /// left on the stack after calling this instruction.
+        /// </remarks>
+        /// <returns>An integer value representing the delta distance.</returns>
+        internal abstract int GetDeltaDistance();
+
+        internal virtual void BuildTables(MetaDataOut md) { }
+
+        internal virtual void BuildCILInfo(CILWriter output) { }
+
+        internal virtual void Write(PEWriter output) { }
+
+        internal virtual void Write(CILWriter output) { }
+
+    }
+
+    /**************************************************************************/
+    public class CILByte : CILInstruction
+    {
+        byte byteVal;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal CILByte(byte bVal)
+        {
+            byteVal = bVal;
+        }
+
+        public byte GetByte() { return byteVal; }
+
+        internal override string GetInstName()
+        {
+            return Hex.Byte(byteVal);
+        }
+
+        /// <summary>
+        /// Get the delta distance for this instruction.
+        /// </summary>
+        /// <remarks>
+        /// The delta distance is the resulting difference of items 
+        /// left on the stack after calling this instruction.
+        /// </remarks>
+        /// <returns>Zero, the delta distance for a CILByte</returns>
+        internal override int GetDeltaDistance()
+        {
+            return 0;
+        }
+
+        internal override void Write(PEWriter output)
+        {
+            output.Write(byteVal);
+        }
+
+        internal override void Write(CILWriter output)
+        {
+            output.WriteLine(".emitbyte " + Hex.Byte(byteVal));  // ???? CHECK THIS ????
+        }
+
+    }
+
+    /**************************************************************************/
+    public class Instr : CILInstruction
+    {
+        protected uint instr;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public Instr(Op inst)
+        {
+            instr = (uint)inst;
+            if (instr >= longInstrStart)
+            {
+                instr -= longInstrStart;
+                twoByteInstr = true;
+                size++;
+            }
+        }
+
+        internal Instr(uint inst)
+        {
+            instr = (uint)inst;
+            if (instr >= longInstrStart)
+            {
+                instr -= longInstrStart;
+                twoByteInstr = true;
+                size++;
+            }
+        }
+
+        public Op GetOp()
+        {
+            if (twoByteInstr)
+                return (Op)(longInstrStart + instr);
+            return (Op)instr;
+        }
+
+        internal override string GetInstName()
+        {
+            Op opInst = GetOp();
+            return "" + opInst;
+        }
+
+        internal override void Write(PEWriter output)
+        {
+            //Console.WriteLine("Writing instruction " + instr + " with size " + size);
+            if (twoByteInstr) output.Write(leadByte);
+            output.Write((byte)instr);
+        }
+
+        internal string GetInstrString()
+        {
+            if (twoByteInstr)
+            {
+                return FEopcode[instr] + " ";
+            }
+            else
+            {
+                return opcode[instr] + " ";
+            }
+        }
+
+        /// <summary>
+        /// Get the delta distance for this instruction.
+        /// </summary>
+        /// <remarks>
+        /// The delta distance is the resulting difference of items 
+        /// left on the stack after calling this instruction.
+        /// </remarks>
+        /// <returns>An integer value representing the delta distance.</returns>
+        internal override int GetDeltaDistance()
+        {
+            if (twoByteInstr)
+            {
+                return FEopDeltaDistance[instr];
+            }
+            else
+            {
+                return opDeltaDistance[instr];
+            }
+        }
+
+        internal override void Write(CILWriter output)
+        {
+            if (twoByteInstr)
+            {
+                output.WriteLine(FEopcode[instr]);
+            }
+            else
+            {
+                output.WriteLine(opcode[instr]);
+            }
+        }
+
+    }
+
+    /**************************************************************************/
+    public class IntInstr : Instr
+    {
+        int val;
+        bool byteNum;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public IntInstr(IntOp inst, int num)
+            : base((uint)inst)
+        {
+            byteNum = inst == IntOp.ldc_i4_s;
+            val = num;
+            if (byteNum) size++;
+            else size += 4;
+        }
+
+        public int GetInt() { return val; }
+        public void SetInt(int num) { val = num; }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            base.Write(output);
+            if (byteNum)
+                output.Write((sbyte)val);
+            else
+                output.Write(val);
+        }
+
+        /// <summary>
+        /// Get the delta distance for this instruction.
+        /// </summary>
+        /// <remarks>
+        /// The delta distance is the resulting difference of items 
+        /// left on the stack after calling this instruction.
+        /// </remarks>
+        /// <returns>An integer value representing the delta distance.</returns>
+        internal override int GetDeltaDistance()
+        {
+            return opDeltaDistance[instr];
+        }
+
+        internal override void Write(CILWriter output)
+        {
+            output.WriteLine(opcode[instr] + " " + val);
+        }
+
+    }
+
+    /**************************************************************************/
+    public class UIntInstr : Instr
+    {
+        uint val;
+        bool byteNum;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public UIntInstr(IntOp inst, uint num)
+            : base((uint)inst)
+        {
+            byteNum = (inst < IntOp.ldc_i4_s) || (inst == IntOp.unaligned);
+            val = num;
+            if (byteNum) size++;
+            else size += 2;
+        }
+
+        public uint GetUInt() { return val; }
+        public void SetUInt(uint num) { val = num; }
+
+        /// <summary>
+        /// Get the delta distance for this instruction.
+        /// </summary>
+        /// <remarks>
+        /// The delta distance is the resulting difference of items 
+        /// left on the stack after calling this instruction.
+        /// </remarks>
+        /// <returns>An integer value representing the delta distance.</returns>
+        internal override int GetDeltaDistance()
+        {
+            if (twoByteInstr)
+            {
+                return FEopDeltaDistance[instr];
+            }
+            else
+            {
+                return opDeltaDistance[instr];
+            }
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            base.Write(output);
+            if (byteNum)
+                output.Write((byte)val);
+            else
+                output.Write((ushort)val);
+        }
+
+        internal override void Write(CILWriter output)
+        {
+            if (twoByteInstr)
+            {
+                output.Write(FEopcode[instr]);
+            }
+            else
+            {
+                output.Write(opcode[instr]);
+            }
+            output.WriteLine(" " + val);
+        }
+
+    }
+
+    /**************************************************************************/
+    public class LongInstr : Instr
+    {
+        long val;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public LongInstr(SpecialOp inst, long l)
+            : base((uint)inst)
+        {
+            val = l;
+            size += 8;
+        }
+
+        public long GetLong() { return val; }
+        public void SetLong(long num) { val = num; }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            base.Write(output);
+            output.Write(val);
+        }
+
+        internal override void Write(CILWriter output)
+        {
+            output.WriteLine("ldc.i8 " + val);
+        }
+
+    }
+
+    /**************************************************************************/
+    public class FloatInstr : Instr
+    {
+        float fVal;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public FloatInstr(SpecialOp inst, float f)
+            : base((uint)inst)
+        {
+            fVal = f;
+            size += 4;
+        }
+
+        public float GetFloat() { return fVal; }
+        public void SetFloat(float num) { fVal = num; }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.Write((byte)0x22);
+            output.Write(fVal);
+        }
+
+        internal override void Write(CILWriter output)
+        {
+            output.WriteLine("ldc.r4 " + fVal);
+        }
+
+    }
+
+    /**************************************************************************/
+    public class DoubleInstr : Instr
+    {
+        double val;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public DoubleInstr(SpecialOp inst, double d)
+            : base((uint)inst)
+        {
+            val = d;
+            size += 8;
+        }
+
+        public double GetDouble() { return val; }
+        public void SetDouble(double num) { val = num; }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            base.Write(output);
+            output.Write(val);
+        }
+
+        internal override void Write(CILWriter output)
+        {
+            output.WriteLine("ldc.r8 " + val);
+        }
+
+    }
+
+    /**************************************************************************/
+    public class StringInstr : Instr
+    {
+        string val;
+        uint strIndex;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public StringInstr(SpecialOp inst, string str)
+            : base((uint)inst)
+        {
+            val = str;
+            size += 4;
+        }
+
+        public string GetString() { return val; }
+        public void SetString(string str) { val = str; }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            if (Diag.DiagOn) Console.WriteLine("Adding a code string to the US heap");
+            strIndex = md.AddToUSHeap(val);
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            base.Write(output);
+            output.Write(USHeapIndex | strIndex);
+        }
+
+        internal override void Write(CILWriter output)
+        {
+            output.WriteLine("ldstr \"" + val + "\"");
+        }
+
+    }
+
+    /**************************************************************************/
+    public class CILLabel : CILInstruction
+    {
+        private static int labelNum = 0;
+        private int num = -1;
+        private CILInstructions buffer;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public CILLabel()
+        {
+            size = 0;
+        }
+
+        internal CILLabel(uint offs)
+        {
+            size = 0;
+            offset = offs;
+        }
+
+        internal uint GetLabelOffset()
+        {
+            return offset;
+        }
+
+        internal override string GetInstName()
+        {
+            return "Label" + num;
+        }
+
+        internal CILInstructions Buffer
+        {
+            get { return buffer; }
+            set { buffer = value; }
+        }
+
+        internal override void BuildCILInfo(CILWriter output)
+        {
+            if (num == -1)
+            {
+                num = labelNum++;
+            }
+        }
+
+        /// <summary>
+        /// Get the delta distance for this instruction.
+        /// </summary>
+        /// <remarks>
+        /// The delta distance is the resulting difference of items 
+        /// left on the stack after calling this instruction.
+        /// </remarks>
+        /// <returns>An integer value representing the delta distance.</returns>
+        internal override int GetDeltaDistance()
+        {
+            return 0;
+        }
+
+        internal override void Write(CILWriter output)
+        {
+            output.WriteLine("Label" + num + ":");
+        }
+
+
+    }
+
+    /**************************************************************************/
+
+    /// <summary>
+    /// Abstract model for debug instructions.
+    /// </summary>
+    public abstract class DebugInst : CILInstruction { }
+
+    /**************************************************************************/
+
+    /// <summary>
+    /// Defines a line instruction.
+    /// </summary>
+    public class Line : DebugInst
+    {
+        private static uint MaxCol = 100;
+        uint startLine, startCol, endLine, endCol;
+        bool hasEnd = false;
+        internal SourceFile sourceFile;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        /// <summary>
+        /// Create a new line instruction.
+        /// </summary>
+        /// <param name="sLine">Start of the line in the source file.</param>
+        /// <param name="sCol">Starting column in the source file.</param>
+        /// <param name="sFile">The filename of the souce file.</param>
+        internal Line(uint sLine, uint sCol, SourceFile sFile)
+        {
+            startLine = sLine;
+            startCol = sCol;
+            sourceFile = sFile;
+            size = 0;
+        }
+
+        /// <summary>
+        /// Create a new line instruction.
+        /// </summary>
+        /// <param name="sLine">Start of the line in the source file.</param>
+        /// <param name="sCol">Starting column in the source file.</param>
+        /// <param name="eLine">Ending line in the source file.</param>
+        /// <param name="eCol">Ending column in the source file.</param>
+        /// <param name="sFile">The filename of the souce file.</param>
+        internal Line(uint sLine, uint sCol, uint eLine, uint eCol, SourceFile sFile)
+        {
+            startLine = sLine;
+            startCol = sCol;
+            endLine = eLine;
+            endCol = eCol;
+            hasEnd = true;
+            sourceFile = sFile;
+            size = 0;
+        }
+
+        public int LineNum
+        {
+            get { return (int)startLine; }
+        }
+
+        internal void CalcEnd(Line next)
+        {
+            if (hasEnd) return;
+            if (sourceFile != next.sourceFile)
+            {
+                endLine = startLine;
+                endCol = MaxCol;
+            }
+            else
+            {
+                endLine = next.startLine;
+                endCol = next.startCol;
+                if (endCol < 0) endCol = MaxCol;
+            }
+            hasEnd = true;
+        }
+
+        internal void Last()
+        {
+            if (hasEnd) return;
+            endLine = startLine;
+            endCol = MaxCol;
+            hasEnd = true;
+        }
+
+        /// <summary>
+        /// Get the name of this instruction.
+        /// </summary>
+        /// <returns>A string with the value ".line".</returns>
+        internal override string GetInstName()
+        {
+            return ".line";
+        }
+
+        /// <summary>
+        /// Write this instruction to a PDB file.
+        /// </summary>
+        /// <param name="output">The PE writer being used to write the PE and PDB files.</param>
+        internal override void Write(PEWriter output)
+        {
+            string sf = "";
+            Guid doclang = Guid.Empty;
+            Guid docvend = Guid.Empty;
+            Guid doctype = Guid.Empty;
+            if (sourceFile != null)
+            {
+                sf = sourceFile.name;
+                doclang = sourceFile.language;
+                docvend = sourceFile.vendor;
+                doctype = sourceFile.document;
+
+            }
+
+            if (output.pdbWriter != null)
+                output.pdbWriter.AddSequencePoint(sf, doclang, docvend, doctype, (int)offset,
+                    (int)startLine, (int)startCol, (int)endLine, (int)endCol);
+        }
+
+        /// <summary>
+        /// Get the delta distance for this instruction.
+        /// </summary>
+        /// <remarks>
+        /// The delta distance is the resulting difference of items 
+        /// left on the stack after calling this instruction.
+        /// </remarks>
+        /// <returns>An integer value representing the delta distance.</returns>
+        internal override int GetDeltaDistance()
+        {
+            return 0;
+        }
+
+        /// <summary>
+        /// Write out a line instruction to the CIL file.
+        /// </summary>
+        /// <param name="output">The CIL instruction writer to use to write this instruction.</param>
+        internal override void Write(CILWriter output)
+        {
+            if (output.Debug)
+            {
+                string lineDetails = startLine + ", " + startCol;
+                if (hasEnd)
+                {
+                    lineDetails += ", " + endLine + ", " + endCol;
+                    if (sourceFile != null)
+                    {
+                        lineDetails += ", " + sourceFile.Name;
+                    }
+                }
+                output.WriteLine(".line " + lineDetails);
+            }
+        }
+
+
+    }
+
+    /**************************************************************************/
+
+    /// <summary>
+    /// A local binding instruction that can be added to a list of CILInstructions.
+    /// </summary>
+    public class LocalBinding : DebugInst
+    {
+        internal int _index;
+        internal string _name;
+        internal DebugLocalSig _debugsig;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        /// <summary>
+        /// Create a new local binding object.
+        /// </summary>
+        /// <param name="index">The index of the local in the locals tables.</param>
+        /// <param name="name">The name of the local.</param>
+        internal LocalBinding(int index, string name)
+        {
+            _index = index;
+            _name = name;
+        }
+
+        /// <summary>
+        /// The index of the local in the locals table.
+        /// </summary>
+        public int Index
+        {
+            get { return _index; }
+        }
+
+        /// <summary>
+        /// The name of the local binding.
+        /// </summary>
+        public string Name
+        {
+            get { return _name; }
+        }
+
+        /// <summary>
+        /// Get the delta distance for this instruction.
+        /// </summary>
+        /// <remarks>
+        /// The delta distance is the resulting difference of items 
+        /// left on the stack after calling this instruction.
+        /// </remarks>
+        /// <returns>An integer value representing the delta distance.</returns>
+        internal override int GetDeltaDistance()
+        {
+            return 0;
+        }
+
+        /// <summary>
+        /// Get the name of this instruction.
+        /// </summary>
+        /// <returns>A string with the name of this instruction.</returns>
+        internal override string GetInstName()
+        {
+            return "debug - local binding";
+        }
+
+    }
+    /**************************************************************************/
+
+    /// <summary>
+    /// Used to delcare constants that exist in a given scope.
+    /// </summary>
+    public class ConstantBinding : DebugInst
+    {
+        private string _name;
+        private object _value;
+        private Type _type;
+        private uint _token;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        /// <summary>
+        /// Create a new constant binding.
+        /// </summary>
+        /// <param name="name">The name of the constant.</param>
+        /// <param name="value">The value of the constant.</param>
+        /// <param name="type">The data type of the constant.</param>
+        internal ConstantBinding(string name, object value, Type type, uint token)
+        {
+            _value = value;
+            _name = name;
+            _type = type;
+            _token = token;
+        }
+
+        /// <summary>
+        /// Value of the constant.
+        /// </summary>
+        public object Value
+        {
+            get { return _value; }
+        }
+
+        /// <summary>
+        /// The name of the constant.
+        /// </summary>
+        public string Name
+        {
+            get { return _name; }
+        }
+
+        /// <summary>
+        /// The data type of the constant.
+        /// </summary>
+        public Type Type
+        {
+            get { return _type; }
+        }
+
+        /// <summary>
+        /// The token for this constant.
+        /// </summary>
+        public uint Token
+        {
+            get { return _token; }
+        }
+
+        /// <summary>
+        /// Get the type signature for this constant.
+        /// </summary>
+        /// <returns>A byte array of the type signature.</returns>
+        public byte[] GetSig()
+        {
+            MemoryStream str = new MemoryStream();
+            _type.TypeSig(str);
+            return str.ToArray();
+        }
+
+        /// <summary>
+        /// Get the name of this instruction.
+        /// </summary>
+        /// <returns>A string with the name of this instruction.</returns>
+        internal override string GetInstName()
+        {
+            return "debug - constant binding";
+        }
+
+        /// <summary>
+        /// Get the delta distance for this instruction.
+        /// </summary>
+        /// <remarks>
+        /// The delta distance is the resulting difference of items 
+        /// left on the stack after calling this instruction.
+        /// </remarks>
+        /// <returns>An integer value representing the delta distance.</returns>
+        internal override int GetDeltaDistance()
+        {
+            return 0;
+        }
+
+
+
+        }
+
+        /**************************************************************************/
+        public class SwitchInstr : Instr
+        {
+            CILLabel[] cases;
+            uint numCases = 0;
+            int[] targets;
+
+            /*-------------------- Constructors ---------------------------------*/
+
+            public SwitchInstr(CILLabel[] dsts)
+                : base(0x45)
+            {
+                cases = dsts;
+                if (cases != null) numCases = (uint)cases.Length;
+                size += 4 + (numCases * 4);
+            }
+
+            internal SwitchInstr(int[] offsets)
+                : base(0x45)
+            {
+                numCases = (uint)offsets.Length;
+                targets = offsets;
+                size += 4 + (numCases * 4);
+            }
+
+            public CILLabel[] GetDests() { return cases; }
+            public void SetDests(CILLabel[] dests) { cases = dests; }
+
+            internal override string GetInstName()
+            {
+                return "switch";
+            }
+
+            internal void MakeTargetLabels(ArrayList labs)
+            {
+                cases = new CILLabel[numCases];
+                for (int i = 0; i < numCases; i++)
+                {
+                    cases[i] = CILInstructions.GetLabel(labs, (uint)(offset + size + targets[i]));
+                }
+            }
+
+            internal sealed override void Write(PEWriter output)
+            {
+                base.Write(output);
+                output.Write(numCases);
+                for (int i = 0; i < numCases; i++)
+                {
+                    int target = (int)cases[i].GetLabelOffset() - (int)(offset + size);
+                    output.Write(target);
+                }
+            }
+
+            internal override void Write(CILWriter output)
+            {
+                throw new NotImplementedException("Switch instruction for CIL");
+            }
+
+
+        }
+
+
+    public class Scope {
+     private ArrayList _localBindings = new ArrayList();
+     private ArrayList _constantBindings = new ArrayList();
+     internal Scope _parent;
+     internal MethodDef _thisMeth;
+
+     internal Scope(MethodDef thisMeth) : this(null, thisMeth) {
+     }
+
+     internal Scope(Scope parent, MethodDef thisMeth) {
+       _thisMeth = thisMeth;
+       _parent = parent;
+     }
+
+       /// <summary>
+       /// Add a constant to this scope.
+       /// </summary>
+       /// <param name="name">The name of the constant.</param>
+       /// <param name="value">The value of the constant.</param>
+       /// <param name="type">The type of the constant.</param>
+       /// <returns>The ConstantBinding object for the new constant.</returns>
+       internal ConstantBinding AddConstantBinding(string name, object value, Type type) {
+           ConstantBinding binding;
+           if ((binding = FindConstantBinding(name)) != null)
+               return binding;
+
+           binding = new ConstantBinding(name, value, type, _thisMeth.locToken);
+           _constantBindings.Add(binding);
+           return binding;
+       }
+
+       /// <summary>
+       /// Find a constant in this scope.
+       /// </summary>
+       /// <param name="name">The name of the constant.</param>
+       /// <returns>The ConstantBinding object of this constant.</returns>
+       internal ConstantBinding FindConstantBinding(string name) {
+           foreach (ConstantBinding binding in _constantBindings)
+               if (binding.Name == name)
+                   return binding;
+           return null;
+       }
+
+       /// <summary>
+       /// Provide a complete list of all constants bound in this scope.
+       /// </summary>
+       public ConstantBinding[] ConstantBindings {
+           get { return (ConstantBinding[])_constantBindings.ToArray(typeof(ConstantBinding)); }
+       }
+
+     internal LocalBinding AddLocalBinding(string name, int index) {
+       LocalBinding binding;
+       if ((binding = FindLocalBinding(name)) != null)
+         return binding;
+
+       binding = new LocalBinding(index, name);
+       _localBindings.Add(binding);
+       return binding;
+     }
+
+     internal LocalBinding FindLocalBinding(string name) {
+       foreach (LocalBinding binding in _localBindings)
+         if (binding._name == name)
+           return binding;
+       return null;
+     }
+
+     internal LocalBinding FindLocalBinding(int index) {
+       foreach (LocalBinding binding in _localBindings)
+         if (binding._index == index)
+           return binding;
+       return null;
+     }
+
+     public LocalBinding[] LocalBindings {
+       get { return (LocalBinding[]) _localBindings.ToArray(typeof(LocalBinding)); }
+     }
+
+     internal void BuildSignatures(MetaDataOut md) {	
+       if (!md.Debug) return;
+         
+     try {
+       Local[] locals = _thisMeth.GetLocals();
+       foreach (LocalBinding binding in _localBindings) {
+         if (binding._debugsig == null) {
+            locals[binding._index].BuildTables(md);
+            binding._debugsig = md.GetDebugSig(locals[binding._index]);
+         }
+         binding._debugsig.BuildMDTables(md);
+       }
+     } catch (Exception e) {
+       throw new Exception("Exception while writing debug info for: " +
+                            this._thisMeth.NameString()+"\r\n"+e.ToString());
+     }
+        
+     }
+
+       internal void WriteLocals(PDBWriter writer) {
+
+         try {
+
+             Local[] locals = _thisMeth.GetLocals();
+
+             foreach (LocalBinding binding in _localBindings) {
+                 writer.BindLocal(binding._name, binding._index, _thisMeth.locToken,0,0);
+             }
+         } catch (Exception e) {
+             throw new Exception("Exception while writing debug info for: " +
+                 this._thisMeth.NameString()+"\r\n"+e.ToString(),e);
+         }
+
+     }
+       /* Constants does not work. AKB 2007-02-03
+       internal void WriteConstants(PDBWriter writer) {
+
+           try {
+
+               // Add each constant to the current scope
+               foreach (ConstantBinding binding in _constantBindings)
+                   writer.BindConstant(binding);
+
+           } catch (Exception e) {
+               throw new Exception("Exception while writing debug info for: " +
+                   this._thisMeth.NameString() + "\r\n" + e.ToString(), e);
+           }
+
+       }
+       */
+   }
+   
+    /*************************************************************************/ 
+   
+    /// <summary>
+    /// A marker instruction for when a scope should be opened in the sequence of instructions.
+    /// </summary>
+   public class OpenScope : DebugInst {
+     internal Scope _scope;
+   
+       /// <summary>
+       /// Create a new OpenScope instruction.
+       /// </summary>
+       /// <param name="scope">The scope that is being opened.</param>
+     public OpenScope(Scope scope) {
+       size = 0;
+       _scope = scope;
+     }
+
+       /// <summary>
+       /// Get the name for this instruction.
+       /// </summary>
+       /// <returns>A string with the name of the instruction.</returns>
+     internal override string GetInstName() {
+       return "debug - open scope";
+     }
+   
+       /// <summary>
+       /// Build the signatures for this instruction.
+       /// </summary>
+       /// <param name="md">The meta data table to write the instructions to.</param>
+     internal void BuildSignatures(MetaDataOut md) {
+       _scope.BuildSignatures(md);
+     }
+
+       /// <summary>
+       /// Get the delta distance for this instruction.
+       /// </summary>
+       /// <remarks>
+       /// The delta distance is the resulting difference of items 
+       /// left on the stack after calling this instruction.
+       /// </remarks>
+       /// <returns>An integer value representing the delta distance.</returns>
+       /// 
+       internal override int GetDeltaDistance() {
+           return 0;
+       }
+
+     /// <summary>
+     /// Write this instruction to the PDB file.
+     /// </summary>
+     /// <param name="output">The PEWriter being used to write the PE and PDB files.</param>
+     internal override void Write(PEWriter output) {
+       if (output.pdbWriter != null) {
+         output.pdbWriter.OpenScope((int) offset);
+         _scope.WriteLocals(output.pdbWriter);
+         /* Constants do not work. AKB 2007-02-03
+          * _scope.WriteConstants(output.pdbWriter);
+          */
+
+     }
+     }
+   
+   }
+    /************************************************************************/  
+   
+    /// <summary>
+    /// A marker instruction for when a scope should be closed.
+    /// </summary>
+   public class CloseScope : DebugInst {
+     internal Scope _scope;
+   
+       /// <summary>
+       /// The constructor to build a new CloseScope instruction.
+       /// </summary>
+       /// <param name="scope">The scope to close.</param>
+     public CloseScope(Scope scope) {
+       size = 0;
+       _scope = scope;
+     }
+   
+       /// <summary>
+       /// Provide access to the name of this instruction.
+       /// </summary>
+       /// <returns>A string containing the name of this instruction.</returns>
+     internal override string GetInstName() {
+       return "debug - close scope";
+     }
+
+     /// <summary>
+     /// Get the delta distance for this instruction.
+     /// </summary>
+     /// <remarks>
+     /// The delta distance is the resulting difference of items 
+     /// left on the stack after calling this instruction.
+     /// </remarks>
+     /// <returns>An integer value representing the delta distance.</returns>
+     internal override int GetDeltaDistance() {
+         return 0;
+     }
+
+       /// <summary>
+       /// Write this instruction.  This instruction does not get written
+       /// to the PE file.  It only applys to the PDB file.
+       /// </summary>
+       /// <param name="output">The PEWriter that is writing the PE file.</param>
+     internal override void Write(PEWriter output) {
+       if (output.pdbWriter != null)
+         output.pdbWriter.CloseScope((int) offset);
+     }
+   
+   }  
+    /**************************************************************************/  
+
+    public class FieldInstr : Instr {
+        Field field;
+
+        /*-------------------- Constructors ---------------------------------*/
+  
+        public FieldInstr(FieldOp inst, Field f) : base((uint)inst) {
+            field = f;
+            size += 4;
+        }
+
+        public Field GetField() { return field; }
+
+        public void SetField(Field fld) { field = fld; }
+
+        internal override string GetInstName() {
+            return "" + (FieldOp)instr;
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md) {
+            if (field == null) throw new InstructionException(IType.fieldOp,instr);
+            if (field is FieldRef) field.BuildMDTables(md);
+        }
+
+        internal override void  BuildCILInfo(CILWriter output) {
+            if (field == null) throw new InstructionException(IType.fieldOp,instr);
+            if (field is FieldRef) field.BuildCILInfo(output);
+        }
+
+        internal sealed override void Write(PEWriter output) {
+            base.Write(output);
+            output.Write(field.Token());
+        }
+
+        internal override void Write(CILWriter output) {
+            output.Write(GetInstrString());
+            field.WriteType(output);
+            output.WriteLine();
+        }
+
+
+    }
+
+    /**************************************************************************/  
+    public class MethInstr : Instr {
+        Method meth;
+
+        /*-------------------- Constructors ---------------------------------*/
+  
+        public MethInstr(MethodOp inst, Method m) : base((uint)inst) {
+            meth = m;
+            size += 4;
+        }
+
+        public Method GetMethod() { return meth; }
+
+        public void SetMethod(Method mth) { meth = mth; }
+
+        internal override string GetInstName() {
+            return "" + (MethodOp)instr;
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md) {
+            if (meth == null) 
+                throw new InstructionException(IType.methOp,instr);
+            if ((meth is MethodRef) || (meth is MethodSpec)) meth.BuildMDTables(md);
+        }
+
+        internal override void BuildCILInfo(CILWriter output) {
+            if (meth == null) throw new InstructionException(IType.methOp,instr);
+            if ((meth is MethodRef) || (meth is MethodSpec)) meth.BuildCILInfo(output);
+         }
+
+        /// <summary>
+        /// Get the MethodOp this instruction represents.
+        /// </summary>
+        /// <returns>The method operator from the MethodOp enum.</returns>
+        public MethodOp GetMethodOp() {
+            return (MethodOp)instr;
+        }
+
+        /// <summary>
+        /// Get the delta distance for this instruction.
+        /// </summary>
+        /// <remarks>
+        /// The delta distance is the resulting difference of items 
+        /// left on the stack after calling this instruction.
+        /// </remarks>
+        /// <returns>An integer value representing the delta distance.</returns>
+        internal override int GetDeltaDistance() {
+            switch ((MethodOp)instr) {
+                case MethodOp.callvirt:
+                case MethodOp.call: {
+
+                        // Add the parameter count to the depth
+                        int depth = (int)meth.GetSig().numPars * -1;
+
+                        // Check to see if this is an instance method
+                        if (meth.GetSig().HasCallConv(CallConv.Instance)) depth--;
+
+                        // Check to see if this method uses the optional parameters
+                        if (meth.GetSig().HasCallConv(CallConv.Vararg)) depth += (int)meth.GetSig().numOptPars * -1;
+
+                        // Check to see if this method uses the generic parameters
+                        if (meth.GetSig().HasCallConv(CallConv.Generic)) depth += (int)meth.GetSig().numGenPars * -1;
+
+                        // Check if a return value will be placed on the stack.
+                        if (!meth.GetRetType().SameType(PrimitiveType.Void)) depth++;
+
+                        return depth;
+                    }
+                case MethodOp.newobj: {
+
+                        // Add the parameter count to the depth
+                        int depth = (int)meth.GetSig().numPars * -1;
+
+                        // Check to see if this method uses the optional parameters
+                        if (meth.GetSig().HasCallConv(CallConv.Vararg)) depth += (int)meth.GetSig().numOptPars * -1;
+
+                        // Check to see if this method uses the generic parameters
+                        if (meth.GetSig().HasCallConv(CallConv.Generic)) depth += (int)meth.GetSig().numGenPars * -1;
+
+                        // Add the object reference that is loaded onto the stack
+                        depth++;
+
+                        return depth;
+                    }
+                case MethodOp.ldtoken:
+                case MethodOp.ldftn:
+                    return 1;
+                case MethodOp.jmp:
+                case MethodOp.ldvirtfn:
+                    return 0;
+                default:
+                    // Someone has added a new MethodOp and not added a case for it here.
+                    throw new Exception("The MethodOp for this MethoInstr is not supported.");
+            }
+        }
+
+         internal sealed override void Write(PEWriter output) {
+            base.Write(output);
+            output.Write(meth.Token());
+        }
+
+        internal override void Write(CILWriter output) {
+            output.Write(GetInstrString());
+            meth.WriteType(output);
+            output.WriteLine();
+        }
+
+    }
+
+    /**************************************************************************/  
+    public class SigInstr : Instr {
+        CalliSig signature;
+
+        /*-------------------- Constructors ---------------------------------*/
+  
+        public SigInstr(SpecialOp inst, CalliSig sig) : base((uint)inst) {
+            signature = sig;
+            size += 4;
+        }
+
+        public CalliSig GetSig() { return signature; }
+
+        public void SetSig(CalliSig sig) { signature = sig; }
+
+        internal override string GetInstName() {
+            return "" + (SpecialOp)instr;
+        }
+
+        /// <summary>
+        /// Get the delta distance for this instruction.
+        /// </summary>
+        /// <remarks>
+        /// The delta distance is the resulting difference of items 
+        /// left on the stack after calling this instruction.
+        /// </remarks>
+        /// <returns>An integer value representing the delta distance.</returns>
+        internal override int GetDeltaDistance() {
+
+            // Add the parameter count to the depth
+            int depth = (int)signature.NumPars * -1;
+
+            // Check to see if this is an instance method
+            if (signature.HasCallConv(CallConv.Instance)) depth--;
+
+            // Check to see if this method uses the optional parameters
+            if (signature.HasCallConv(CallConv.Vararg)) depth += (int)signature.NumOptPars * -1;
+
+            // Check if a return value will be placed on the stack.
+            if (signature.ReturnType.SameType(PrimitiveType.Void)) depth++;
+
+            return depth;
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md) {
+            if (signature == null) throw new InstructionException(IType.specialOp,instr);
+            signature.BuildMDTables(md);
+        }
+
+        internal override void  BuildCILInfo(CILWriter output) {
+            if (signature == null) throw new InstructionException(IType.specialOp,instr);
+            signature.BuildCILInfo(output);
+        }
+
+        internal sealed override void Write(PEWriter output) {
+            base.Write(output);
+            output.Write(signature.Token());
+        }
+
+        internal override void Write(CILWriter output) {
+            output.Write(GetInstrString());
+            signature.Write(output);
+            output.WriteLine();
+        }
+
+    }
+
+    /**************************************************************************/  
+    public class TypeInstr : Instr {
+        Type theType;
+
+        /*-------------------- Constructors ---------------------------------*/
+  
+        public TypeInstr(TypeOp inst, Type aType) : base((uint)inst) {
+            theType = aType;
+            size += 4;
+        }
+
+        public Type GetTypeArg() { return theType; }
+
+        public void SetTypeArg(Type ty) { theType = ty; }
+
+        internal override string GetInstName() {
+            return "" + (TypeOp)instr;
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md) {
+            if (theType == null) throw new InstructionException(IType.typeOp,instr);
+            theType = theType.AddTypeSpec(md);
+        }
+
+        internal override void  BuildCILInfo(CILWriter output) {
+            if (theType == null) throw new InstructionException(IType.typeOp,instr);
+            if (!theType.isDef()) {
+                theType.BuildCILInfo(output);
+            }
+       }
+
+        internal sealed override void Write(PEWriter output) {
+            base.Write(output);
+            output.Write(theType.Token());
+        }
+
+        internal override void Write(CILWriter output) {
+            output.Write(GetInstrString());
+            theType.WriteName(output);
+            output.WriteLine();
+        }
+
+    }
+
+    /**************************************************************************/  
+    public class BranchInstr : Instr {
+        CILLabel dest;
+        private bool shortVer = true;
+        private static readonly byte longInstrOffset = 13;
+        private int target = 0;
+
+        /*-------------------- Constructors ---------------------------------*/
+  
+        public BranchInstr(BranchOp inst, CILLabel dst) : base((uint)inst) {
+            dest = dst;
+            shortVer = (inst < BranchOp.br) || (inst == BranchOp.leave_s);
+            if (shortVer)
+                size++;
+            else
+                size += 4;
+        }
+
+        internal BranchInstr(uint inst, int dst) : base(inst) {
+            target = dst;
+            shortVer = (inst < (uint)BranchOp.br) || (inst == (uint)BranchOp.leave_s);
+            if (shortVer) 
+                size++;
+            else
+                size += 4;
+        }
+
+        public CILLabel GetDest() { return dest; }
+
+        public void SetDest(CILLabel lab) { dest = lab; }
+
+        /// <summary>
+        /// Provide access to the branch operator
+        /// </summary>
+        /// <returns>The branch operator from the BranchOp enum that this instruction represents.</returns>
+        public BranchOp GetBranchOp() {
+            return (BranchOp)instr;
+        }
+
+        internal override string GetInstName() {
+            return "" + (BranchOp)instr;
+        }
+
+        internal void MakeTargetLabel(ArrayList labs) {
+            uint targetOffset = (uint)(offset + size + target);
+            dest = CILInstructions.GetLabel(labs,targetOffset);
+        }
+
+        internal sealed override bool Check(MetaDataOut md) {
+            target = (int)dest.GetLabelOffset() - (int)(offset + size);
+            if ((target < minByteVal) || (target > maxByteVal)) { // check for longver
+                if (shortVer) {
+                    if (instr == (uint)BranchOp.leave_s)
+                        instr = (uint)BranchOp.leave;
+                    else
+                        instr = instr += longInstrOffset;
+                    size += 3;
+                    shortVer = false;
+                    return true;
+                }
+            } else if (!shortVer) { // check for short ver
+                if (instr == (uint)BranchOp.leave)
+                    instr = (uint)BranchOp.leave_s;
+                else
+                    instr = instr -= longInstrOffset;
+                size -= 3;
+                shortVer = true;
+                return true;
+            }
+            /*
+            if (shortVer && ((target < minByteVal) || (target > maxByteVal))) {
+              if (instr < (int)BranchOp.leave) instr += longInstrOffset;
+              else instr--;
+              shortVer = false;
+              size += 3;
+              return true;
+            }
+            */
+            return false;
+        }
+
+        internal sealed override void Write(PEWriter output) {
+            base.Write(output);
+            if (shortVer)
+                output.Write((sbyte)target);
+            else
+                output.Write(target);
+        }
+
+        internal override void Write(CILWriter output) {
+            output.WriteLine(GetInstrString() + dest.GetInstName());
+        }
+
+    }
+    /*************************************************************************/
+
+}

PERWAPI/Local.cs

@@ -0,0 +1,118 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+
+namespace QUT.PERWAPI
+{
+
+    /**************************************************************************/
+    // Class to describe procedure locals
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a local of a method
+    /// </summary>
+    public class Local
+    {
+        private static readonly byte PINNED = 0x45;
+        string name;
+        public Type type;
+        bool pinned = false;
+        int index = 0;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        /// <summary>
+        /// Create a new local variable 
+        /// </summary>
+        /// <param name="lName">name of the local variable</param>
+        /// <param name="lType">type of the local variable</param>
+        public Local(string lName, Type lType)
+        {
+            name = lName;
+            type = lType;
+        }
+
+        /// <summary>
+        /// Create a new local variable that is byref and/or pinned
+        /// </summary>
+        /// <param name="lName">local name</param>
+        /// <param name="lType">local type</param>
+        /// <param name="isPinned">has pinned attribute</param>
+        public Local(string lName, Type lType, bool isPinned)
+        {
+            name = lName;
+            type = lType;
+            pinned = isPinned;
+        }
+
+        public int GetIndex() { return index; }
+
+        /// <summary>
+        /// The name of the local variable.
+        /// </summary>
+        public string Name { get { return name; } }
+
+        public bool Pinned
+        {
+            get { return pinned; }
+            set { pinned = value; }
+        }
+
+        /// <summary>
+        /// Gets the signature for this local variable.
+        /// </summary>
+        /// <returns>A byte array of the signature.</returns>
+        public byte[] GetSig()
+        {
+            MemoryStream str = new MemoryStream();
+            type.TypeSig(str);
+            return str.ToArray();
+        }
+
+        internal void SetIndex(int ix)
+        {
+            index = ix;
+        }
+
+        internal void TypeSig(MemoryStream str)
+        {
+            if (pinned) str.WriteByte(PINNED);
+            type.TypeSig(str);
+        }
+
+        internal void BuildTables(MetaDataOut md)
+        {
+            if (!(type is ClassDef))
+                type.BuildMDTables(md);
+        }
+
+        internal void BuildCILInfo(CILWriter output)
+        {
+            if (!(type is ClassDef))
+                type.BuildCILInfo(output);
+        }
+
+        internal void Write(CILWriter output)
+        {
+            type.WriteType(output);
+            output.Write("\t" + name);
+        }
+
+    }
+}

PERWAPI/MDClassDefElems.cs

@@ -0,0 +1,1381 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Security.Cryptography;
+
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    // This Class produces entries in the TypeDef table of the MetaData 
+    // in the PE meta data.
+
+    // NOTE:  Entry 0 in TypeDef table is always the pseudo class <module> 
+    // which is the parent for functions and variables declared a module level
+
+    /// <summary>
+    /// The descriptor for a class defined in the IL (.class) in the current assembly/module
+    /// </summary>
+    /// 
+    public class ClassDef : ClassDesc
+    {
+        private static readonly uint HasSecurity = 0x00040000;
+        private static readonly uint NoSecurity = 0xFFFBFFFF;
+        private static readonly uint VisibilityMask = 0x07;
+        private static readonly uint LayoutMask = 0x18;
+        private static readonly uint StringFormatMask = 0x030000;
+        //private static readonly uint fieldListIx = 0, methListIx = 1, eventListIx = 2, propListIx = 3; 
+        //private static readonly uint	numListIx = 4;
+
+        protected PEFile scope;
+        uint flags;
+        Class superType;
+        ArrayList security;
+        ClassLayout layout;
+        uint extendsIx;
+        internal ClassRef refOf;
+        internal uint eventIx = 0, propIx = 0;
+        ArrayList events = new ArrayList();
+        ArrayList properties = new ArrayList();
+        ArrayList interfaces = new ArrayList();
+        ArrayList methodImpls = new ArrayList();
+        //uint[] interfaceIndexes;
+        //private string[] eventNames, propertyNames, nestedNames;
+        //internal string[][] names = new string[numListIx][];
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal ClassDef(PEFile scope, TypeAttr attrSet, string nsName, string name)
+            : base(nsName, name)
+        {
+            this.scope = scope;
+            superType = MSCorLib.mscorlib.ObjectClass;
+            flags = (uint)attrSet;
+            tabIx = MDTable.TypeDef;
+        }
+
+        internal ClassDef(PEReader buff, uint row, bool isMSCorLib)
+        {
+            flags = buff.ReadUInt32();
+            name = buff.GetString();
+            nameSpace = buff.GetString();
+            extendsIx = buff.GetCodedIndex(CIx.TypeDefOrRef);
+            fieldIx = buff.GetIndex(MDTable.Field);
+            methodIx = buff.GetIndex(MDTable.Method);
+            this.Row = row;
+            tabIx = MDTable.TypeDef;
+            if (isMSCorLib && (name == "ValueType"))
+                typeIndex = (byte)ElementType.ValueType;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] typeDefs, bool isMSCorLib)
+        {
+            ClassDef prevDef = null;
+            prevDef = new ClassDef(buff, 1, isMSCorLib);
+            typeDefs[0] = prevDef;
+            for (int i = 1; i < typeDefs.Length; i++)
+            {
+                ClassDef typeDef = new ClassDef(buff, (uint)i + 1, isMSCorLib);
+                prevDef.fieldEndIx = typeDef.fieldIx;
+                prevDef.methodEndIx = typeDef.methodIx;
+                prevDef = typeDef;
+                typeDefs[i] = typeDef;
+            }
+            prevDef.fieldEndIx = buff.GetTableSize(MDTable.Field) + 1;
+            prevDef.methodEndIx = buff.GetTableSize(MDTable.Method) + 1;
+        }
+
+        private static uint GetParentClassIx(uint[] enclClasses, uint[] nestClasses, uint classIx)
+        {
+            if (enclClasses == null) return 0;
+            for (uint i = 0; i < enclClasses.Length; i++)
+            {
+                if (nestClasses[i] == classIx)
+                    return enclClasses[i];
+            }
+            return 0;
+        }
+
+        internal static void GetClassRefs(PEReader buff, TableRow[] typeRefs, ReferenceScope paren, uint[] parIxs)
+        {
+            int num = typeRefs.Length;
+            uint[] fieldStart = new uint[num + 1], methStart = new uint[num + 1], extends = new uint[num + 1];
+            for (int i = 0; i < num; i++)
+            {
+                uint flags = buff.ReadUInt32();
+                string name = buff.GetString();
+                string nameSpace = buff.GetString();
+                extends[i] = buff.GetCodedIndex(CIx.TypeDefOrRef);
+                fieldStart[i] = buff.GetIndex(MDTable.Field);
+                methStart[i] = buff.GetIndex(MDTable.Method);
+                //Console.WriteLine("flags = " + Hex.Int(flags));
+                if (i == 0) // ASSERT first entry is always <Module>
+                    typeRefs[i] = paren.GetDefaultClass();
+                else if (isPublic(flags))
+                {
+                    if (parIxs[i] != 0)
+                    {
+                        typeRefs[i] = new NestedClassRef(paren, nameSpace, name);
+                    }
+                    else
+                    {
+                        typeRefs[i] = paren.GetExistingClass(nameSpace, name);
+                        if (typeRefs[i] == null)
+                        {
+                            typeRefs[i] = new ClassRef(paren, nameSpace, name);
+                            paren.AddToClassList((ClassRef)typeRefs[i]);
+                        }
+                    }
+                }
+            }
+            fieldStart[num] = buff.GetTableSize(MDTable.Field) + 1;
+            methStart[num] = buff.GetTableSize(MDTable.Method) + 1;
+            // Find Nested Classes
+            for (int i = 0; i < typeRefs.Length; i++)
+            {
+                if ((typeRefs[i] != null) && (typeRefs[i] is NestedClassRef))
+                {
+                    NestedClassRef nRef = (NestedClassRef)typeRefs[i];
+                    ClassRef nPar = (ClassRef)typeRefs[parIxs[i] - 1];
+                    if (nPar == null)
+                    {  // parent is private, so ignore
+                        typeRefs[i] = null;
+                    }
+                    else
+                    {
+                        nRef.SetParent(nPar);
+                        nPar.AddToClassList(nRef);
+                    }
+                }
+                if (typeRefs[i] != null)
+                {
+                    if (buff.GetCodedElement(CIx.TypeDefOrRef, extends[i]) == MSCorLib.mscorlib.ValueType())
+                        ((ClassRef)typeRefs[i]).MakeValueClass();
+                    buff.SetElementPosition(MDTable.Field, fieldStart[i]);
+                    FieldDef.GetFieldRefs(buff, fieldStart[i + 1] - fieldStart[i], (ClassRef)typeRefs[i]);
+                    buff.SetElementPosition(MDTable.Method, methStart[i]);
+                    MethodDef.GetMethodRefs(buff, methStart[i + 1] - methStart[i], (ClassRef)typeRefs[i]);
+                }
+            }
+        }
+
+        internal override void Resolve(PEReader buff)
+        {
+            buff.currentClassScope = this;
+            superType = (Class)buff.GetCodedElement(CIx.TypeDefOrRef, extendsIx);
+            if ((superType != null) && superType.isValueType())
+                typeIndex = (byte)ElementType.ValueType;
+            for (int i = 0; fieldIx < fieldEndIx; i++, fieldIx++)
+            {
+                FieldDef field = (FieldDef)buff.GetElement(MDTable.Field, fieldIx);
+                field.SetParent(this);
+                fields.Add(field);
+            }
+            for (int i = 0; methodIx < methodEndIx; i++, methodIx++)
+            {
+                MethodDef meth = (MethodDef)buff.GetElement(MDTable.Method, methodIx);
+                if (Diag.DiagOn) Console.WriteLine("Adding method " + meth.Name() + " to class " + name);
+                meth.SetParent(this);
+                methods.Add(meth);
+            }
+            buff.currentClassScope = null;
+        }
+
+        internal void ChangeRefsToDefs(ClassDef newType, ClassDef[] oldTypes)
+        {
+            for (int i = 0; i < oldTypes.Length; i++)
+            {
+                for (int j = 0; j < oldTypes[i].fields.Count; j++)
+                    ((FieldDef)oldTypes[i].fields[j]).ChangeRefsToDefs(this, oldTypes);
+                for (int j = 0; j < oldTypes[i].methods.Count; j++)
+                    ((MethodDef)oldTypes[i].methods[j]).ChangeRefsToDefs(this, oldTypes);
+                for (int j = 0; j < oldTypes[i].events.Count; j++)
+                    ((Event)oldTypes[i].events[j]).ChangeRefsToDefs(this, oldTypes);
+                for (int j = 0; j < oldTypes[i].properties.Count; j++)
+                    ((Property)oldTypes[i].properties[j]).ChangeRefsToDefs(this, oldTypes);
+                for (int j = 0; j < oldTypes[i].interfaces.Count; j++)
+                    ((ClassDef)oldTypes[i].interfaces[j]).ChangeRefsToDefs(this, oldTypes);
+                for (int j = 0; j < oldTypes[i].methodImpls.Count; j++)
+                    ((MethodImpl)oldTypes[i].methodImpls[j]).ChangeRefsToDefs(this, oldTypes);
+                for (int j = 0; j < oldTypes[i].nestedClasses.Count; j++)
+                    ((ClassDef)oldTypes[i].nestedClasses[j]).ChangeRefsToDefs(this, oldTypes);
+            }
+        }
+
+        public void MergeClasses(ClassDef[] classes)
+        {
+            ChangeRefsToDefs(this, classes);
+            for (int i = 0; i < classes.Length; i++)
+            {
+                fields.AddRange(classes[i].fields);
+                methods.AddRange(classes[i].methods);
+                events.AddRange(classes[i].events);
+                properties.AddRange(classes[i].properties);
+                interfaces.AddRange(classes[i].interfaces);
+                methodImpls.AddRange(classes[i].methodImpls);
+                nestedClasses.AddRange(classes[i].nestedClasses);
+            }
+        }
+
+        /*------------------------- public set and get methods --------------------------*/
+
+        /// <summary>
+        /// Fetch the PEFile which contains this class
+        /// </summary>
+        /// <returns>PEFile containing this class</returns>
+        public virtual PEFile GetScope() { return scope; }
+
+        public override MetaDataElement GetParent() { return scope; }
+
+        /// <summary>
+        /// Fetch or Get the superType for this class
+        /// </summary>
+        public Class SuperType
+        {
+            get { return superType; }
+            set
+            {
+                superType = value;
+                if (value == MSCorLib.mscorlib.ValueType())
+                    typeIndex = (byte)ElementType.ValueType;
+                else
+                    typeIndex = (byte)ElementType.Class;
+            }
+        }
+
+        /*    /// <summary>
+            /// Make this class inherit from ValueType
+            /// </summary>
+            public override void MakeValueClass() {
+              superType = MSCorLib.mscorlib.ValueType();
+              typeIndex = (byte)ElementType.ValueType;
+            }
+            */
+
+        /// <summary>
+        /// Add an attribute to the attributes of this class
+        /// </summary>
+        /// <param name="ta">the attribute to be added</param>
+        public void AddAttribute(TypeAttr ta)
+        {
+            flags |= (uint)ta;
+        }
+
+        /// <summary>
+        /// Set the attributes of this class
+        /// </summary>
+        /// <param name="ta">class attributes</param>
+        public void SetAttribute(TypeAttr ta)
+        {
+            flags = (uint)ta;
+        }
+
+        /// <summary>
+        /// Get the attributes for this class
+        /// </summary>
+        /// <returns></returns>
+        public TypeAttr GetAttributes() { return (TypeAttr)flags; }
+
+        public GenericParam AddGenericParam(string name)
+        {
+            GenericParam gp = new GenericParam(name, this, genericParams.Count);
+            genericParams.Add(gp);
+            return gp;
+        }
+
+        public int GetGenericParamCount()
+        {
+            return genericParams.Count;
+        }
+
+        public GenericParam GetGenericParam(string name)
+        {
+            int pos = FindGenericParam(name);
+            if (pos == -1) return null;
+            return (GenericParam)genericParams[pos];
+        }
+
+        public void RemoveGenericParam(string name)
+        {
+            int pos = FindGenericParam(name);
+            if (pos == -1) return;
+            DeleteGenericParam(pos);
+        }
+
+        public void RemoveGenericParam(int ix)
+        {
+            if (ix >= genericParams.Count) return;
+            DeleteGenericParam(ix);
+        }
+
+        public override ClassSpec Instantiate(Type[] genTypes)
+        {
+            if (genTypes == null) return null;
+            if (genericParams.Count == 0)
+                throw new Exception("Cannot instantiate non-generic class");
+            if (genTypes.Length != genericParams.Count)
+                throw new Exception("Wrong number of type parameters for instantiation\nNeeded "
+                    + genericParams.Count + " but got " + genTypes.Length);
+            return new ClassSpec(this, genTypes);
+        }
+
+        /// <summary>
+        /// Add an interface that is implemented by this class
+        /// </summary>
+        /// <param name="iFace">the interface that is implemented</param>
+        public void AddImplementedInterface(Class iFace)
+        {
+            interfaces.Add(new InterfaceImpl(this, iFace));
+            //metaData.AddToTable(MDTable.InterfaceImpl,new InterfaceImpl(this,iFace));
+        }
+
+        /// <summary>
+        /// Get the interfaces implemented by this class
+        /// </summary>
+        /// <returns>List of implemented interfaces</returns>
+        public Class[] GetInterfaces()
+        {
+            Class[] iFaces = new Class[interfaces.Count];
+            for (int i = 0; i < iFaces.Length; i++)
+            {
+                iFaces[i] = ((InterfaceImpl)interfaces[i]).TheInterface();
+            }
+            return iFaces;
+        }
+
+        //  FIXME: need a Setter for interfaces too!
+        public void SetInterfaces(Class[] iFaces)
+        {
+            interfaces = new ArrayList(iFaces.Length);
+            for (int i = 0; i < iFaces.Length; i++)
+                interfaces.Add(iFaces[i]);
+        }
+
+        /// <summary>
+        /// Add a field to this class
+        /// </summary>
+        /// <param name="name">field name</param>
+        /// <param name="fType">field type</param>
+        /// <returns>a descriptor for this new field</returns>
+        public FieldDef AddField(string name, Type fType)
+        {
+            FieldDef field = (FieldDef)FindField(name);
+            if (field != null)
+                throw new DescriptorException("Field " + field.NameString());
+            field = new FieldDef(name, fType, this);
+            fields.Add(field);
+            return field;
+        }
+
+        /// <summary>
+        /// Add a field to this class
+        /// </summary>
+        /// <param name="fAtts">attributes for this field</param>
+        /// <param name="name">field name</param>
+        /// <param name="fType">field type</param>
+        /// <returns>a descriptor for this new field</returns>
+        public FieldDef AddField(FieldAttr fAtts, string name, Type fType)
+        {
+            FieldDef field = AddField(name, fType);
+            field.SetFieldAttr(fAtts);
+            return field;
+        }
+
+        /// <summary>
+        /// Add a field to this class
+        /// </summary>
+        /// <param name="f">Descriptor for the field to be added</param>
+        public void AddField(FieldDef f)
+        {
+            FieldDef field = (FieldDef)FindField(f.Name());
+            if (field != null)
+                throw new DescriptorException("Field " + field.NameString());
+            f.SetParent(this);
+            fields.Add(f);
+        }
+
+        /// <summary>
+        /// Get the descriptor for the field of this class named "name"
+        /// </summary>
+        /// <param name="name">The field name</param>
+        /// <returns>The descriptor for field "name"</returns>
+        public FieldDef GetField(string name)
+        {
+            return (FieldDef)FindField(name);
+        }
+
+        /// <summary>
+        /// Get the fields for this class
+        /// </summary>
+        /// <returns>List of fields of this class</returns>
+        public FieldDef[] GetFields()
+        {
+            return (FieldDef[])fields.ToArray(typeof(FieldDef));
+        }
+
+        /// <summary>
+        /// Add a method to this class
+        /// </summary>
+        /// <param name="name">method name</param>
+        /// <param name="retType">return type</param>
+        /// <param name="pars">parameters</param>
+        /// <returns>a descriptor for this new method</returns>
+        public MethodDef AddMethod(string name, Type retType, Param[] pars)
+        {
+            System.Diagnostics.Debug.Assert(retType != null);
+            MethSig mSig = new MethSig(name);
+            mSig.SetParTypes(pars);
+            MethodDef meth = (MethodDef)GetMethod(mSig);
+            if (meth != null)
+                throw new DescriptorException("Method " + meth.NameString());
+            mSig.retType = retType;
+            meth = new MethodDef(this, mSig, pars);
+            methods.Add(meth);
+            return meth;
+        }
+
+        /// <summary>
+        /// Add a method to this class
+        /// </summary>
+        /// <param name="name">method name</param>
+        /// <param name="genPars">generic parameters</param>
+        /// <param name="retType">return type</param>
+        /// <param name="pars">parameters</param>
+        /// <returns>a descriptor for this new method</returns>
+        public MethodDef AddMethod(string name, GenericParam[] genPars, Type retType, Param[] pars)
+        {
+            MethodDef meth = AddMethod(name, retType, pars);
+            if ((genPars != null) && (genPars.Length > 0))
+            {
+                for (int i = 0; i < genPars.Length; i++)
+                {
+                    genPars[i].SetMethParam(meth, i);
+                }
+                meth.SetGenericParams(genPars);
+            }
+            return meth;
+        }
+
+        /// <summary>
+        /// Add a method to this class
+        /// </summary>
+        /// <param name="mAtts">attributes for this method</param>
+        /// <param name="iAtts">implementation attributes for this method</param>
+        /// <param name="name">method name</param>
+        /// <param name="retType">return type</param>
+        /// <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)
+        {
+            MethodDef meth = AddMethod(name, retType, pars);
+            meth.AddMethAttribute(mAtts);
+            meth.AddImplAttribute(iAtts);
+            return meth;
+        }
+        /// <summary>
+        /// Add a method to this class
+        /// </summary>
+        /// <param name="mAtts">attributes for this method</param>
+        /// <param name="iAtts">implementation attributes for this method</param>
+        /// <param name="name">method name</param>
+        /// <param name="genPars">generic parameters</param>
+        /// <param name="retType">return type</param>
+        /// <param name="pars">parameters</param>
+        /// <returns>a descriptor for this new method</returns>
+        public MethodDef AddMethod(MethAttr mAtts, ImplAttr iAtts, string name,
+            GenericParam[] genPars, Type retType, Param[] pars)
+        {
+            MethodDef meth = AddMethod(name, genPars, retType, pars);
+            meth.AddMethAttribute(mAtts);
+            meth.AddImplAttribute(iAtts);
+            return meth;
+        }
+
+        /// <summary>
+        /// Add a method to this class
+        /// </summary>
+        /// <param name="meth">Descriptor for the method to be added</param>
+        public void AddMethod(MethodDef meth)
+        {
+            MethodDef m = (MethodDef)GetMethodDesc(meth.Name(), meth.GetParTypes());
+            if (m != null)
+                throw new DescriptorException("Method " + m.NameString());
+            methods.Add(meth);
+            meth.SetParent(this);
+        }
+
+        /// <summary>
+        /// Get the descriptor for the method "name" of this class
+        /// </summary>
+        /// <param name="name">The name of the method to be retrieved</param>
+        /// <returns>The method descriptor for "name"</returns>
+        public MethodDef GetMethod(string name)
+        {
+            return (MethodDef)GetMethodDesc(name);
+        }
+
+        /// <summary>
+        /// Get the descriptor for the method called "name" with the signature "parTypes"
+        /// </summary>
+        /// <param name="name">The name of the method</param>
+        /// <param name="parTypes">The signature of the method</param>
+        /// <returns>The method descriptor for name(parTypes)</returns>
+        public MethodDef GetMethod(string name, Type[] parTypes)
+        {
+            return (MethodDef)GetMethodDesc(name, parTypes);
+        }
+
+        /// <summary>
+        /// Get all the methods of this class called "name"
+        /// </summary>
+        /// <param name="name">The method name</param>
+        /// <returns>List of methods called "name"</returns>
+        public MethodDef[] GetMethods(string name)
+        {
+            ArrayList meths = GetMeths(name);
+            return (MethodDef[])meths.ToArray(typeof(MethodDef));
+        }
+
+        /// <summary>
+        /// Get all the methods for this class
+        /// </summary>
+        /// <returns>List of methods for this class</returns>
+        public MethodDef[] GetMethods()
+        {
+            return (MethodDef[])methods.ToArray(typeof(MethodDef));
+        }
+
+        /// <summary>
+        /// Add an event to this class
+        /// </summary>
+        /// <param name="name">event name</param>
+        /// <param name="eType">event type</param>
+        /// <returns>a descriptor for this new event</returns>
+        public Event AddEvent(string name, Type eType)
+        {
+            Event e = (Event)FindFeature(name, events);
+            if (e != null)
+                throw new DescriptorException("Event " + e.NameString());
+            e = new Event(name, eType, this);
+            events.Add(e);
+            return e;
+        }
+
+        /// <summary>
+        /// Get the event "name" of this class
+        /// </summary>
+        /// <param name="name">The event name</param>
+        /// <returns>The event desctiptor for "name"</returns>
+        public Event GetEvent(string name)
+        {
+            return (Event)FindFeature(name, events);
+        }
+
+        /// <summary>
+        /// Get all the events of this class
+        /// </summary>
+        /// <returns>List of events for this class</returns>
+        public Event[] GetEvents()
+        {
+            return (Event[])events.ToArray(typeof(Event));
+        }
+
+        /// <summary>
+        /// Remove the event "name" from this class
+        /// </summary>
+        /// <param name="name">The name of the event to be removed</param>
+        public void RemoveEvent(string name)
+        {
+            Feature ev = FindFeature(name, events);
+            if (ev != null) events.Remove(ev);
+        }
+
+
+        /// <summary>
+        /// Add a property to this class
+        /// </summary>
+        /// <param name="name">property name</param>
+        /// <param name="pars">parameters</param>
+        /// <param name="retType">return type</param>
+        /// <returns>a descriptor for this new property</returns>
+        public Property AddProperty(string name, Type retType, Type[] pars)
+        {
+            Property p = (Property)FindFeature(name, properties);
+            if (p != null)
+                throw new DescriptorException("Property " + p.NameString());
+            p = new Property(name, retType, pars, this);
+            properties.Add(p);
+            return p;
+        }
+
+
+        /// <summary>
+        /// Get the property "name" for this class
+        /// </summary>
+        /// <param name="name">Descriptor for the property "name"</param>
+        /// <returns></returns>
+        public Property GetProperty(string name)
+        {
+            return (Property)FindFeature(name, properties);
+        }
+
+        /// <summary>
+        /// Get all the properties for this class
+        /// </summary>
+        /// <returns>List of properties for this class</returns>
+        public Property[] GetProperties()
+        {
+            return (Property[])properties.ToArray(typeof(Property));
+        }
+
+        /// <summary>
+        /// Remove the property "name" from this class
+        /// </summary>
+        /// <param name="name">Name of the property to be removed</param>
+        public void RemoveProperty(string name)
+        {
+            Feature prop = FindFeature(name, properties);
+            if (prop != null) properties.Remove(prop);
+        }
+
+        /// <summary>
+        /// Add a nested class to this class
+        /// </summary>
+        /// <param name="attrSet">attributes for this nested class</param>
+        /// <param name="name">nested class name</param>
+        /// <returns>a descriptor for this new nested class</returns>
+        public NestedClassDef AddNestedClass(TypeAttr attrSet, string name)
+        {
+            NestedClassDef nClass = GetNestedClass(name);
+            if (nClass != null)
+                throw new DescriptorException("Nested Class " + nClass.NameString());
+            nClass = new NestedClassDef(this, attrSet, name);
+            nestedClasses.Add(nClass);
+            return (nClass);
+        }
+
+        /// <summary>
+        /// Add a nested class to this class
+        /// </summary>
+        /// <param name="attrSet">attributes for this nested class</param>
+        /// <param name="name">nested class name</param>
+        /// <param name="sType">super type of this nested class</param>
+        /// <returns>a descriptor for this new nested class</returns>
+        public NestedClassDef AddNestedClass(TypeAttr attrSet, string name, Class sType)
+        {
+            NestedClassDef nClass = AddNestedClass(attrSet, name);
+            nClass.superType = sType;
+            return (nClass);
+        }
+
+        /// <summary>
+        /// Get the nested class called "name"
+        /// </summary>
+        /// <param name="name">The name of the nested class</param>
+        /// <returns>Descriptor for the nested class</returns>
+        public NestedClassDef GetNestedClass(string name)
+        {
+            //CheckNestedClassNames(MDTable.TypeDef);
+            return (NestedClassDef)GetNested(name);
+        }
+
+        /// <summary>
+        /// Add layout information for this class.  This class must have the
+        /// sequential or explicit attribute.
+        /// </summary>
+        /// <param name="packSize">packing size (.pack)</param>
+        /// <param name="classSize">class size (.size)</param>
+        public void AddLayoutInfo(int packSize, int classSize)
+        {
+            layout = new ClassLayout(packSize, classSize, this);
+        }
+
+        /// <summary>
+        /// Get the pack size for this class (only valid for ExplicitLayout or SequentialLayout
+        /// </summary>
+        /// <returns>Class pack size</returns>
+        public int GetPackSize()
+        {
+            if ((layout == null) && (((flags & (uint)TypeAttr.ExplicitLayout) != 0) ||
+                ((flags & (uint)TypeAttr.SequentialLayout) != 0)) && (buffer != null))
+            {
+                buffer.SetElementPosition(MDTable.ClassLayout, 0);
+                //layout = buffer.FindParent(MDTable.ClassLayout,this);
+            }
+            if (layout != null) return layout.GetPack();
+            return 0;
+        }
+
+        /// <summary>
+        /// Get the size of this class (only valid for ExplicitLayout or SequentialLayout
+        /// </summary>
+        /// <returns>The size of this class</returns>
+        public int GetClassSize()
+        {
+            if (layout == null) return 0;
+            return layout.GetSize();
+        }
+
+        /// <summary>
+        /// Get the ClassRef for this ClassDef, if there is one
+        /// </summary>
+        public ClassRef RefOf
+        {
+            get
+            {
+                if (refOf == null)
+                {
+                    ModuleRef modRef = scope.refOf;
+                    if (modRef != null)
+                        refOf = modRef.GetClass(name);
+                }
+                return refOf;
+            }
+        }
+
+        /// <summary>
+        /// Make a ClassRef for this ClassDef
+        /// </summary>
+        /// <returns>ClassRef equivalent to this ClassDef</returns>
+        public virtual ClassRef MakeRefOf()
+        {
+            if (refOf == null)
+            {
+                Assembly assem = scope.GetThisAssembly();
+                ReferenceScope scopeRef;
+                if (assem != null)
+                    scopeRef = assem.MakeRefOf();
+                else
+                    scopeRef = scope.MakeRefOf();
+
+                refOf = scopeRef.GetClass(name);
+                if (refOf == null)
+                {
+                    refOf = new ClassRef(scopeRef, nameSpace, name);
+                    scopeRef.AddToClassList(refOf);
+                }
+                refOf.defOf = this;
+            }
+            return refOf;
+        }
+
+        /// <summary>
+        /// Use a method as the implementation for another method (.override)
+        /// </summary>
+        /// <param name="decl">the method to be overridden</param>
+        /// <param name="body">the implementation to be used</param>
+        public void AddMethodOverride(Method decl, Method body)
+        {
+            methodImpls.Add(new MethodImpl(this, decl, body));
+        }
+
+        public void AddMethodOverride(MethodImpl mImpl)
+        {
+            methodImpls.Add(mImpl);
+            mImpl.SetOwner(this);
+        }
+
+        public MethodImpl[] GetMethodOverrides()
+        {
+            return (MethodImpl[])methodImpls.ToArray(typeof(MethodImpl));
+        }
+
+        public void RemoveMethodOverride(MethodImpl mImpl)
+        {
+            if (methodImpls != null)
+                methodImpls.Remove(mImpl);
+        }
+
+
+        /// <summary>
+        /// Add security to this class
+        /// </summary>
+        /// <param name="act">The security action</param>
+        /// <param name="permissionSet">Permission set</param>
+        public void AddSecurity(SecurityAction act, byte[] permissionSet)
+        {
+            AddSecurity(new DeclSecurity(this, act, permissionSet));
+            // securityActions = permissionSet;
+        }
+
+        /// <summary>
+        /// Add security to this class
+        /// </summary>
+        /// <param name="sec">The descriptor for the security to add to this class</param>
+        internal void AddSecurity(DeclSecurity sec)
+        {
+            flags |= HasSecurity;
+            if (security == null) security = new ArrayList();
+            security.Add(sec);
+        }
+
+        /// <summary>
+        /// Get the security descriptor associated with this class
+        /// </summary>
+        /// <returns></returns>
+        public DeclSecurity[] GetSecurity()
+        {
+            if (security == null) return null;
+            return (DeclSecurity[])security.ToArray(typeof(DeclSecurity));
+        }
+
+        /// <summary>
+        /// Remove the security associated with this class
+        /// </summary>
+        public void DeleteSecurity()
+        {
+            flags &= NoSecurity;
+            security = null;
+        }
+
+        //public void AddLineInfo(int row, int col) { }
+
+        /*----------------------------- internal functions ------------------------------*/
+
+        internal bool isPublic()
+        {
+            uint vis = flags & VisibilityMask;
+            return (vis > 0) && (vis != 3) && (vis != 5);
+        }
+
+        internal static bool isPublic(uint flags)
+        {
+            uint vis = flags & VisibilityMask;
+            return (vis > 0) && (vis != 3) && (vis != 5);
+        }
+
+        internal static bool isNested(uint flags)
+        {
+            uint vis = flags & VisibilityMask;
+            return vis > 1;
+        }
+
+        internal override bool isDef() { return true; }
+
+        private Feature FindFeature(string name, ArrayList featureList)
+        {
+            if (featureList == null) return null;
+            for (int i = 0; i < featureList.Count; i++)
+            {
+                if (((Feature)featureList[i]).Name() == name)
+                {
+                    return (Feature)featureList[i];
+                }
+            }
+            return null;
+        }
+
+        private int FindGenericParam(string name)
+        {
+            for (int i = 0; i < genericParams.Count; i++)
+            {
+                GenericParam gp = (GenericParam)genericParams[i];
+                if (gp.GetName() == name) return i;
+            }
+            return -1;
+        }
+
+        internal ClassLayout Layout
+        {
+            set { layout = value; }
+            get { return layout; }
+        }
+
+        internal void SetScope(PEFile mod) { scope = mod; }
+
+        internal void AddImplementedInterface(InterfaceImpl iImpl)
+        {
+            interfaces.Add(iImpl);
+        }
+
+        internal NestedClassDef MakeNestedClass(ClassDef parent)
+        {
+            NestedClassDef nClass = new NestedClassDef(parent, (TypeAttr)flags, name);
+            ClassDef tmp = nClass;
+            tmp.fieldIx = fieldIx;
+            tmp.fieldEndIx = fieldEndIx;
+            tmp.methodIx = methodIx;
+            tmp.methodEndIx = methodEndIx;
+            tmp.extendsIx = extendsIx;
+            tmp.Row = Row;
+            parent.nestedClasses.Add(nClass);
+            return nClass;
+        }
+
+        private void ReadSecurity()
+        {
+            //if ((security == null) && ((flags & HasSecurity) != 0) && (buffer != null)) 
+            //security = buffer.FindParent(MDTable.DeclSecurity,this);
+        }
+
+        public override void MakeSpecial()
+        {
+            special = true;
+            superType = null;
+            flags = (uint)TypeAttr.Private;
+        }
+
+        internal void AddMethodImpl(MethodImpl impl)
+        {
+            methodImpls.Add(impl);
+        }
+
+        internal void AddEvent(Event ev)
+        {
+            if (ev == null) return;
+            ev.SetParent(this);
+            events.Add(ev);
+        }
+
+        internal void AddProperty(Property prop)
+        {
+            if (prop == null) return;
+            prop.SetParent(this);
+            properties.Add(prop);
+        }
+
+        internal void AddToFeatureList(ArrayList list, MDTable tabIx)
+        {
+            if (tabIx == MDTable.Event)
+            {
+                events.AddRange(list);
+            }
+            else
+            {
+                properties.AddRange(list);
+            }
+        }
+
+        // fix for Whidbey bug
+        internal void AddGenericsToTable(MetaDataOut md)
+        {
+            //for (int i=0; i < methods.Count; i++) {
+            //  ((MethodDef)methods[i]).AddGenericsToTable(md);
+            //}
+            for (int i = 0; i < genericParams.Count; i++)
+            {
+                md.AddToTable(MDTable.GenericParam, (GenericParam)genericParams[i]);
+            }
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.TypeDef, this);
+            //if ((flags & (uint)TypeAttr.Interface) != 0) { superType = null; }
+            if (superType != null)
+            {
+                superType.BuildMDTables(md);
+                if (superType is ClassSpec) md.AddToTable(MDTable.TypeSpec, superType);
+            }
+            for (int i = 0; i < genericParams.Count; i++)
+            {
+                ((GenericParam)genericParams[i]).BuildMDTables(md);
+            }
+            nameIx = md.AddToStringsHeap(name);
+            nameSpaceIx = md.AddToStringsHeap(nameSpace);
+            if (security != null)
+            {
+                for (int i = 0; i < security.Count; i++)
+                {
+                    ((DeclSecurity)security[i]).BuildMDTables(md);
+                }
+            }
+            // Console.WriteLine("Building tables for " + name);
+            if (layout != null) layout.BuildMDTables(md);
+            // Console.WriteLine("adding methods " + methods.Count);
+            methodIx = md.TableIndex(MDTable.Method);
+            for (int i = 0; i < methods.Count; i++)
+            {
+                ((MethodDef)methods[i]).BuildMDTables(md);
+            }
+            // Console.WriteLine("adding fields");
+            fieldIx = md.TableIndex(MDTable.Field);
+            for (int i = 0; i < fields.Count; i++)
+            {
+                ((FieldDef)fields[i]).BuildMDTables(md);
+            }
+            // Console.WriteLine("adding interfaceimpls and methodimpls");
+            if (interfaces.Count > 0)
+            {
+                for (int i = 0; i < interfaces.Count; i++)
+                {
+                    ((InterfaceImpl)interfaces[i]).BuildMDTables(md);
+                }
+            }
+            if (methodImpls.Count > 0)
+            {
+                for (int i = 0; i < methodImpls.Count; i++)
+                {
+                    ((MethodImpl)methodImpls[i]).BuildMDTables(md);
+                }
+            }
+            // Console.WriteLine("adding events and properties");
+            if (events.Count > 0)
+            {
+                new MapElem(this, md.TableIndex(MDTable.Event), MDTable.EventMap).BuildMDTables(md);
+                for (int i = 0; i < events.Count; i++)
+                {
+                    ((Event)events[i]).BuildMDTables(md);
+                }
+            }
+            if (properties.Count > 0)
+            {
+                new MapElem(this, md.TableIndex(MDTable.Property), MDTable.PropertyMap).BuildMDTables(md);
+                for (int i = 0; i < properties.Count; i++)
+                {
+                    ((Property)properties[i]).BuildMDTables(md);
+                }
+            }
+            // Console.WriteLine("Adding nested classes");
+            if (nestedClasses.Count > 0)
+            {
+                for (int i = 0; i < nestedClasses.Count; i++)
+                {
+                    ClassDef nClass = (ClassDef)nestedClasses[i];
+                    nClass.BuildMDTables(md);
+                    new MapElem(nClass, this, MDTable.NestedClass).BuildTables(md);
+                }
+            }
+            // Console.WriteLine("End of building tables");
+        }
+
+        internal override void BuildCILInfo(CILWriter output)
+        {
+            if ((superType != null) && !(superType is ClassDef))
+            {
+                superType.BuildCILInfo(output);
+            }
+            for (int i = 0; i < genericParams.Count; i++)
+            {
+                ((GenericParam)genericParams[i]).BuildCILInfo(output);
+            }
+            if (security != null)
+            {
+                for (int i = 0; i < security.Count; i++)
+                {
+                    ((DeclSecurity)security[i]).BuildCILInfo(output);
+                }
+            }
+            // Console.WriteLine("Building CIL info for " + name);
+            // Console.WriteLine("adding methods " + methods.Count);
+            for (int i = 0; i < methods.Count; i++)
+            {
+                ((MethodDef)methods[i]).BuildCILInfo(output);
+            }
+            // Console.WriteLine("adding fields");
+            for (int i = 0; i < fields.Count; i++)
+            {
+                ((FieldDef)fields[i]).BuildCILInfo(output);
+            }
+            // Console.WriteLine("adding interfaceimpls and methodimpls");
+            if (interfaces.Count > 0)
+            {
+                for (int i = 0; i < interfaces.Count; i++)
+                {
+                    ((InterfaceImpl)interfaces[i]).BuildCILInfo(output);
+                }
+            }
+            if (methodImpls.Count > 0)
+            {
+                for (int i = 0; i < methodImpls.Count; i++)
+                {
+                    ((MethodImpl)methodImpls[i]).BuildCILInfo(output);
+                }
+            }
+            for (int i = 0; i < events.Count; i++)
+            {
+                ((Event)events[i]).BuildCILInfo(output);
+            }
+            for (int i = 0; i < properties.Count; i++)
+            {
+                ((Property)properties[i]).BuildCILInfo(output);
+            }
+            // Console.WriteLine("Adding nested classes");
+            for (int i = 0; i < nestedClasses.Count; i++)
+            {
+                ((ClassDef)nestedClasses[i]).BuildCILInfo(output);
+            }
+            // Console.WriteLine("End of building tables");      
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return 4 + 2 * md.StringsIndexSize() +
+                md.CodedIndexSize(CIx.TypeDefOrRef) +
+                md.TableIndexSize(MDTable.Field) +
+                md.TableIndexSize(MDTable.Method);
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.Write(flags);
+            output.StringsIndex(nameIx);
+            output.StringsIndex(nameSpaceIx);
+            //if (superType != null) 
+            // Console.WriteLine("getting coded index for superType of " + name + " = " + superType.GetCodedIx(CIx.TypeDefOrRef));
+            output.WriteCodedIndex(CIx.TypeDefOrRef, superType);
+            output.WriteIndex(MDTable.Field, fieldIx);
+            output.WriteIndex(MDTable.Method, methodIx);
+        }
+
+        internal override void WriteType(CILWriter output)
+        {
+            output.Write("class ");
+            WriteName(output);
+        }
+
+        internal override void WriteName(CILWriter output)
+        {
+            if ((nameSpace == null) || (nameSpace == ""))
+            {
+                output.Write(name);
+            }
+            else
+            {
+                output.Write(nameSpace + "." + name);
+            }
+        }
+
+
+        private void WriteFlags(CILWriter output)
+        {
+            uint vis = flags & VisibilityMask;
+            switch (vis)
+            {
+                case 0: output.Write("private "); break;
+                case 1: output.Write("public "); break;
+                case 2: output.Write("nested public "); break;
+                case 3: output.Write("nested private "); break;
+                case 4: output.Write("nested family "); break;
+                case 5: output.Write("nested assembly "); break;
+                case 6: output.Write("nested famandassem "); break;
+                case 7: output.Write("nested famorassem "); break;
+            }
+            uint layout = flags & LayoutMask;
+            if (layout == 0)
+            {
+                output.Write("auto ");
+            }
+            else if (layout == (uint)TypeAttr.ExplicitLayout)
+            {
+                output.Write("explicit ");
+            }
+            else
+            {
+                output.Write("sequential ");
+            }
+            if ((flags & (uint)TypeAttr.Interface) != 0)
+            {
+                output.Write("interface ");
+            }
+            if ((flags & (uint)TypeAttr.Abstract) != 0)
+            {
+                output.Write("abstract ");
+            }
+            else if ((flags & (uint)TypeAttr.Sealed) != 0)
+            {
+                output.Write("sealed ");
+            }
+            uint strForm = flags & StringFormatMask;
+            if (strForm == 0)
+            {
+                output.Write("ansi ");
+            }
+            else if (strForm == (uint)TypeAttr.UnicodeClass)
+            {
+                output.Write("unicode ");
+            }
+            else
+            {
+                output.Write("autochar ");
+            }
+            if ((flags & (uint)TypeAttr.BeforeFieldInit) != 0)
+            {
+                output.Write("beforefieldinit ");
+            }
+            if ((flags & (uint)TypeAttr.Serializable) != 0)
+            {
+                output.Write("serializable ");
+            }
+            if ((flags & (uint)TypeAttr.SpecialName) != 0)
+            {
+                output.Write("specialname ");
+            }
+            if ((flags & (uint)TypeAttr.RTSpecialName) != 0)
+            {
+                output.Write("rtsspecialname ");
+            }
+        }
+
+        internal override void Write(CILWriter output)
+        {
+            output.Write(".class ");
+            WriteFlags(output);
+            if ((nameSpace != null) && (nameSpace != ""))
+            {
+                output.Write(nameSpace + ".");
+            }
+            output.WriteLine(name);
+            if (superType != null)
+            {
+                output.Write("    extends ");
+                superType.WriteName(output);
+            }
+            if (interfaces.Count > 0)
+            {
+                output.Write("  implements ");
+                for (int i = 0; i < interfaces.Count; i++)
+                {
+                    InterfaceImpl impl = (InterfaceImpl)interfaces[i];
+                    if (i > 0) output.Write(", ");
+                    impl.TheInterface().WriteName(output);
+                }
+            }
+            output.WriteLine();
+            output.WriteLine("{");
+            for (int i = 0; i < fields.Count; i++)
+            {
+                ((Field)fields[i]).Write(output);
+                output.WriteLine();
+            }
+            for (int i = 0; i < methods.Count; i++)
+            {
+                ((MethodDef)methods[i]).Write(output);
+                output.WriteLine();
+            }
+            for (int i = 0; i < methodImpls.Count; i++)
+            {
+                ((MethodImpl)methodImpls[i]).Write(output);
+                output.WriteLine();
+            }
+            for (int i = 0; i < events.Count; i++)
+            {
+                ((Event)events[i]).Write(output);
+                output.WriteLine();
+            }
+            for (int i = 0; i < properties.Count; i++)
+            {
+                ((Property)properties[i]).Write(output);
+                output.WriteLine();
+            }
+
+            output.WriteLine("}");
+            output.WriteLine();
+        }
+
+
+        internal sealed override uint TypeDefOrRefToken()
+        {
+            uint cIx = Row;
+            cIx = cIx << 2;
+            return cIx;
+        }
+
+        internal sealed override uint GetCodedIx(CIx code)
+        {
+            switch (code)
+            {
+                case (CIx.TypeDefOrRef): return 0;
+                case (CIx.HasCustomAttr): return 3;
+                case (CIx.HasDeclSecurity): return 0;
+                case (CIx.TypeOrMethodDef): return 0;
+            }
+            return 0;
+        }
+
+        internal override string ClassName()
+        {
+            return (nameSpace + "." + name);
+        }
+
+        internal override string NameString()
+        {
+            string nameString = "";
+            if (scope != null) nameString = "[" + scope.NameString() + "]";
+            if ((nameSpace != null) && (nameSpace.Length > 0)) nameString += nameSpace + ".";
+            nameString += name;
+            return nameString;
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a Nested Class defined in an assembly
+    /// </summary>
+    public class NestedClassDef : ClassDef
+    {
+        ClassDef parent;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal NestedClassDef(ClassDef parent, TypeAttr attrSet, string name)
+            : base(parent.GetScope(), attrSet, "", name)
+        {
+            this.parent = parent;
+        }
+
+        /// <summary>
+        /// Fetch the PEFile which contains this class
+        /// </summary>
+        /// <returns>PEFile containing this class</returns>
+        public override PEFile GetScope()
+        {
+            if (scope == null)
+                scope = parent.GetScope();
+            return scope;
+        }
+
+        /// <summary>
+        /// Get the enclosing class for this nested class
+        /// </summary>
+        /// <returns>ClassDef of the enclosing class</returns>
+        public ClassDef GetParentClass() { return parent; }
+
+        internal void SetParent(ClassDef par) { parent = par; }
+
+        internal override string ClassName()
+        {
+            string nameString = name;
+            if (parent != null) nameString = parent.TypeName() + "+" + name;
+            return nameString;
+        }
+
+        /// <returns>ClassRef equivalent to this ClassDef</returns>
+        public override ClassRef MakeRefOf()
+        {
+            if (refOf == null)
+            {
+                ClassRef parentRef = parent.MakeRefOf();
+                refOf = parentRef.GetNestedClass(name);
+                if (refOf == null)
+                {
+                    refOf = parentRef.AddNestedClass(name);
+                }
+                refOf.defOf = this;
+            }
+            return refOf;
+        }
+
+    }
+
+
+}

PERWAPI/MDClassElems.cs

@@ -0,0 +1,635 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Security.Cryptography;
+
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    /// <summary>
+    /// The base descriptor for a class 
+    /// </summary>
+    public abstract class Class : Type
+    {
+        //protected int row = 0;
+        protected string name, nameSpace;
+        protected uint nameIx, nameSpaceIx;
+        protected ArrayList nestedClasses = new ArrayList();
+        protected bool special = false;
+        protected ArrayList fields = new ArrayList();
+        protected ArrayList methods = new ArrayList();
+        internal uint fieldIx = 0, methodIx = 0, fieldEndIx = 0, methodEndIx = 0;
+        protected string[] fieldNames, methodNames;
+        protected ArrayList genericParams = new ArrayList();
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal Class() : base((byte)ElementType.Class) { }
+
+        /*------------------------- public set and get methods --------------------------*/
+
+        public virtual void MakeValueClass()
+        {
+            typeIndex = (byte)ElementType.ValueType;
+        }
+
+        /// <summary>
+        /// Get the name of this class
+        /// </summary>
+        /// <returns>class name</returns>
+        public string Name() { return name; }
+
+        /// <summary>
+        /// Get the namespace that includes this class
+        /// </summary>
+        /// <returns>namespace name</returns>
+        public string NameSpace() { return nameSpace; }
+
+        /// <summary>
+        /// Get the string representation of the qualified name
+        /// of this class
+        /// </summary>
+        /// <returns>class qualified name</returns>
+        public override string TypeName()
+        {
+            if ((nameSpace == null) || (nameSpace == "")) return name;
+            return nameSpace + "." + name;
+        }
+
+        /// <summary>
+        /// Get the descriptor for the method "name" of this class
+        /// </summary>
+        /// <param name="name">The name of the method to be retrieved</param>
+        /// <returns>The method descriptor for "name"</returns>
+        public Method GetMethodDesc(string name)
+        {
+            for (int i = 0; i < methods.Count; i++)
+            {
+                if (((Method)methods[i]).HasName(name))
+                    return (Method)methods[i];
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Get the descriptor for the method called "name" with the signature "parTypes"
+        /// </summary>
+        /// <param name="name">The name of the method</param>
+        /// <param name="parTypes">The signature of the method</param>
+        /// <returns>The method descriptor for name(parTypes)</returns>
+        public Method GetMethodDesc(string name, Type[] parTypes)
+        {
+            for (int i = 0; i < methods.Count; i++)
+            {
+                if (((Method)methods[i]).HasNameAndSig(name, parTypes))
+                    return (Method)methods[i];
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Get the vararg method "name(parTypes,optTypes)" for this class
+        /// </summary>
+        /// <param name="name">Method name</param>
+        /// <param name="parTypes">Method parameter types</param>
+        /// <param name="optParTypes">Optional parameter types</param>
+        /// <returns>Descriptor for "name(parTypes,optTypes)"</returns>
+        public Method GetMethodDesc(string name, Type[] parTypes, Type[] optParTypes)
+        {
+            for (int i = 0; i < methods.Count; i++)
+            {
+                if (((Method)methods[i]).HasNameAndSig(name, parTypes, optParTypes))
+                    return (Method)methods[i];
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Get all the methods of this class called "name"
+        /// </summary>
+        /// <param name="name">The method name</param>
+        /// <returns>List of methods called "name"</returns>
+        public Method[] GetMethodDescs(string name)
+        {
+            ArrayList meths = GetMeths(name);
+            return (Method[])meths.ToArray(typeof(Method));
+        }
+
+        /// <summary>
+        /// Get all the methods for this class
+        /// </summary>
+        /// <returns>List of methods for this class</returns>
+        public Method[] GetMethodDescs()
+        {
+            return (Method[])methods.ToArray(typeof(Method));
+        }
+
+        /// <summary>
+        /// Remove the specified method from this class
+        /// </summary>
+        /// <param name="name">method name</param>
+        public void RemoveMethod(string name)
+        {
+            Method meth = GetMethodDesc(name);
+            if (meth != null) methods.Remove(meth);
+        }
+
+        /// <summary>
+        /// Remove the specified method from this class
+        /// </summary>
+        /// <param name="name">method name</param>
+        /// <param name="parTypes">method parameter types</param>
+        public void RemoveMethod(string name, Type[] parTypes)
+        {
+            Method meth = GetMethodDesc(name, parTypes);
+            if (meth != null) methods.Remove(meth);
+        }
+
+        /// <summary>
+        /// Remove the specified method from this class
+        /// </summary>
+        /// <param name="name">method name</param>
+        /// <param name="parTypes">method parameter types</param>
+        /// <param name="optTypes">optional method parameter types</param>
+        public void RemoveMethod(string name, Type[] parTypes, Type[] optTypes)
+        {
+            Method meth = GetMethodDesc(name, parTypes, optTypes);
+            if (meth != null) methods.Remove(meth);
+        }
+
+        /// <summary>
+        /// Remove the specified method from this class
+        /// </summary>
+        /// <param name="meth">method descriptor</param>
+        public void RemoveMethod(Method meth)
+        {
+            methods.Remove(meth);
+        }
+
+        /// <summary>
+        /// Remove the specified method from this class
+        /// </summary>
+        /// <param name="ix">index into list of methods for specified method</param>
+        public void RemoveMethod(int ix)
+        {
+            methods.RemoveAt(ix);
+        }
+
+        /// <summary>
+        /// Get the descriptor for the field "name" for this class
+        /// </summary>
+        /// <param name="name">Field name</param>
+        /// <returns>Descriptor for field "name"</returns>
+        public Field GetFieldDesc(string name)
+        {
+            return FindField(name);
+        }
+
+        /// <summary>
+        /// Get all the fields for this class
+        /// </summary>
+        /// <returns>List of fields for this class</returns>
+        public Field[] GetFieldDescs()
+        {
+            return (Field[])fields.ToArray(typeof(Field));
+        }
+
+        /// <summary>
+        /// Remove the specified field from this class
+        /// </summary>
+        /// <param name="name">field name</param>
+        public void RemoveField(string name)
+        {
+            Field f = FindField(name);
+            if (f != null) fields.Remove(f);
+        }
+
+        /// <summary>
+        /// Instantiate this generic type with the supplied types
+        /// </summary>
+        /// <param name="genTypes">types to instantiate with</param>
+        /// <returns>descriptor for instantiated generic type</returns>
+        public virtual ClassSpec Instantiate(Type[] genTypes)
+        {
+            return new ClassSpec(this, genTypes);
+        }
+
+        /// <summary>
+        /// Denote this class as "special" such as a default module class
+        /// </summary>
+        public virtual void MakeSpecial()
+        {
+            special = true;
+        }
+
+        /// <summary>
+        /// Get the owing scope of this class
+        /// </summary>
+        /// <returns>owner of this class</returns>
+        public abstract MetaDataElement GetParent();
+
+        /// <summary>
+        /// Get any nested classes of this class
+        /// </summary>
+        /// <returns>list of nested classes</returns>
+        public Class[] GetNestedClasses()
+        {
+            return (Class[])nestedClasses.ToArray(typeof(Class));
+        }
+
+        /// <summary>
+        /// How many nested classes does this class have?
+        /// </summary>
+        /// <returns>number of nested classes</returns>
+        public int GetNestedClassCount()
+        {
+            return nestedClasses.Count;
+        }
+
+        /*------------------------- internal functions --------------------------*/
+
+        internal virtual Type GetGenPar(uint ix) { return null; }
+
+        protected ArrayList GetMeths(string name)
+        {
+            ArrayList meths = new ArrayList();
+            for (int i = 0; i < methods.Count; i++)
+            {
+                if (((Method)methods[i]).HasName(name))
+                    meths.Add(methods[i]);
+            }
+            return meths;
+        }
+
+        internal ArrayList GetFieldList() { return fields; }
+
+        internal ArrayList GetMethodList() { return methods; }
+
+        internal bool isValueType()
+        {
+            return typeIndex == (byte)ElementType.ValueType;
+        }
+
+        internal bool isSpecial() { return special; }
+
+        internal void AddToFieldList(Field f)
+        {
+            f.SetParent(this);
+            fields.Add(f);
+        }
+
+        internal void AddToList(ArrayList list, MDTable tabIx)
+        {
+            switch (tabIx)
+            {
+                case (MDTable.Field): fields.AddRange(list); break;
+                case (MDTable.Method): methods.AddRange(list); break;
+                case (MDTable.TypeDef): nestedClasses.AddRange(list); break;
+                default: throw new Exception("Unknown list type");
+            }
+        }
+
+        internal void AddToMethodList(Method m)
+        {
+            m.SetParent(this);
+            methods.Add(m);
+        }
+
+        internal void AddToClassList(Class nClass)
+        {
+            nestedClasses.Add(nClass);
+        }
+
+        internal Class GetNested(string name)
+        {
+            for (int i = 0; i < nestedClasses.Count; i++)
+            {
+                if (((Class)nestedClasses[i]).Name() == name)
+                    return (Class)nestedClasses[i];
+            }
+            return null;
+        }
+
+        internal Method GetMethod(MethSig mSig)
+        {
+            return GetMethodDesc(mSig.name, mSig.parTypes, mSig.optParTypes);
+        }
+
+        protected Field FindField(string name)
+        {
+            for (int i = 0; i < fields.Count; i++)
+            {
+                if (((Field)fields[i]).Name() == name)
+                    return (Field)fields[i];
+            }
+            return null;
+        }
+
+        internal void SetBuffer(PEReader buff) { buffer = buff; }
+
+        internal override void TypeSig(MemoryStream sig)
+        {
+            sig.WriteByte(typeIndex);
+            MetaDataOut.CompressNum(BlobUtil.CompressUInt(TypeDefOrRefToken()), sig);
+        }
+
+        internal abstract string ClassName();
+
+        internal virtual uint TypeDefOrRefToken() { return 0; }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// 
+    /// </summary> 
+    public class ClassSpec : Class
+    {
+        Class genClass;
+        uint sigIx;
+        private static byte GENERICINST = 0x15;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal ClassSpec(Class clType, Type[] gPars)
+        {
+            this.typeIndex = GENERICINST;
+            genClass = clType;
+            genericParams = new ArrayList(gPars);
+            tabIx = MDTable.TypeSpec;
+            typeIndex = GENERICINST;
+            ArrayList classMethods = clType.GetMethodList();
+            ArrayList classFields = clType.GetFieldList();
+            for (int i = 0; i < classMethods.Count; i++)
+            {
+                MethSig mSig = ((Method)classMethods[i]).GetSig(); //.InstantiateGenTypes(this,gPars);
+                if (mSig != null)
+                {
+                    MethodRef newMeth = new MethodRef(mSig);
+                    newMeth.SetParent(this);
+                    newMeth.GenericParams = ((Method)classMethods[i]).GenericParams;
+                    methods.Add(newMeth);
+                }
+            }
+            for (int i = 0; i < classFields.Count; i++)
+            {
+                Type fType = ((Field)classFields[i]).GetFieldType();
+                //if ((fType is GenericParam) && (((GenericParam)fType).GetParent() == genClass)) {
+                //  fType = gPars[((GenericParam)fType).Index];
+                //}
+                fields.Add(new FieldRef(this, ((Field)classFields[i]).Name(), fType));
+            }
+        }
+
+        /*------------------------- public set and get methods --------------------------*/
+
+        /// <summary>
+        /// Get the generic class that this is an instantiation of
+        /// </summary>
+        /// <returns>generic class</returns>
+        public override MetaDataElement GetParent()
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Get the specified generic parameter number 
+        /// </summary>
+        /// <param name="ix">generic parameter number</param>
+        /// <returns>generic parameter number ix</returns>
+        public Type GetGenericParamType(int ix)
+        {
+            if (ix >= genericParams.Count) return null;
+            return (Type)genericParams[ix];
+        }
+
+        /// <summary>
+        /// Get the generic parameters of this class
+        /// </summary>
+        /// <returns>list of generic parameters</returns>
+        public Type[] GetGenericParamTypes()
+        {
+            return (Type[])genericParams.ToArray(typeof(Type));
+        }
+
+        /// <summary>
+        /// Get the generic class that this class instantiates
+        /// </summary>
+        /// <returns>generic class</returns>
+        public Class GetGenericClass()
+        {
+            return genClass;
+        }
+
+        /// <summary>
+        /// Count how many generic parameters this class has
+        /// </summary>
+        /// <returns>number of generic parameters</returns>
+        public int GetGenericParCount()
+        {
+            return genericParams.Count;
+        }
+
+        /*----------------------------- internal functions ------------------------------*/
+
+        internal void AddMethod(Method meth)
+        {
+            methods.Add(meth);
+            meth.SetParent(this);
+        }
+
+        internal override string ClassName()
+        {
+            // need to return something here??
+            return null;
+        }
+
+        internal override sealed uint TypeDefOrRefToken()
+        {
+            uint cIx = Row;
+            cIx = (cIx << 2) | 0x2;
+            return cIx;
+        }
+
+        internal override Type GetGenPar(uint ix)
+        {
+            if (genClass == null) return new GenericParam(null, this, (int)ix);
+            return genClass.GetGenPar(ix);
+            //if (ix >= genericParams.Count) return null;
+            //return (Type)genericParams[(int)ix];
+        }
+
+        internal override sealed Type AddTypeSpec(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.TypeSpec, this);
+            BuildMDTables(md);
+            return this;
+        }
+
+        internal override void BuildTables(MetaDataOut md)
+        {
+            //md.AddToTable(MDTable.TypeSpec,this);
+            if (!genClass.isDef())
+                genClass.BuildMDTables(md);
+            for (int i = 0; i < genericParams.Count; i++)
+            {
+                if (!((Type)genericParams[i]).isDef() &&
+                    (!(genericParams[i] is GenericParam)))
+                    ((Type)genericParams[i]).BuildMDTables(md);
+            }
+        }
+
+        internal override void BuildSignatures(MetaDataOut md)
+        {
+            MemoryStream outSig = new MemoryStream();
+            TypeSig(outSig);
+            sigIx = md.AddToBlobHeap(outSig.ToArray());
+        }
+
+        internal sealed override void TypeSig(MemoryStream sig)
+        {
+            sig.WriteByte(typeIndex);
+            genClass.TypeSig(sig);
+            //MetaDataOut.CompressNum((uint)genericParams.Count, sig);
+            MetaDataOut.CompressNum(BlobUtil.CompressUInt((uint)genericParams.Count), sig);
+            for (int i = 0; i < genericParams.Count; i++)
+            {
+                ((Type)genericParams[i]).TypeSig(sig);
+            }
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            //Console.WriteLine("Writing the blob index for a TypeSpec");
+            output.BlobIndex(sigIx);
+        }
+
+        internal sealed override uint GetCodedIx(CIx code)
+        {
+            switch (code)
+            {
+                case (CIx.TypeDefOrRef): return 2;
+                case (CIx.HasCustomAttr): return 13;
+                case (CIx.MemberRefParent): return 4;
+            }
+            return 0;
+        }
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// wrapper for TypeSpec parent of MethodRef or FieldRef
+    /// </summary>
+    public class ConstructedTypeSpec : Class
+    {
+        TypeSpec constrType;
+
+        public ConstructedTypeSpec(TypeSpec tySpec)
+            : base()
+        {
+            constrType = tySpec;
+            this.typeIndex = constrType.GetTypeIndex();
+        }
+
+        public TypeSpec Spec { get { return constrType; } }
+
+        public override MetaDataElement GetParent()
+        {
+            return null;
+        }
+
+        internal override string ClassName()
+        {
+            return constrType.NameString();
+        }
+
+
+
+    }
+
+    /**************************************************************************/
+    public abstract class ClassDesc : Class
+    {
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal ClassDesc(string nameSpaceName, string className)
+        {
+            nameSpace = nameSpaceName;
+            name = className;
+        }
+
+        internal ClassDesc()
+        {
+        }
+
+        /*------------------------- public set and get methods --------------------------*/
+
+        public GenericParam GetGenericParam(int ix)
+        {
+            if (ix >= genericParams.Count) return null;
+            return (GenericParam)genericParams[ix];
+        }
+
+        public GenericParam[] GetGenericParams()
+        {
+            return (GenericParam[])genericParams.ToArray(typeof(GenericParam));
+        }
+
+        public virtual void SetGenericParams(GenericParam[] genPars)
+        {
+            for (int i = 0; i < genPars.Length; i++)
+            {
+                genPars[i].SetClassParam(this, i);
+            }
+            genericParams = new ArrayList(genPars);
+        }
+
+        /*----------------------------- internal functions ------------------------------*/
+
+        protected void DeleteGenericParam(int pos)
+        {
+            genericParams.RemoveAt(pos);
+            for (int i = pos; i < genericParams.Count; i++)
+            {
+                GenericParam gp = (GenericParam)genericParams[i];
+                gp.Index = (uint)i;
+            }
+        }
+
+        internal void AddGenericParam(GenericParam par)
+        {
+            genericParams.Add(par);
+            //par.SetClassParam(this,genericParams.Count-1);
+        }
+
+        internal override Type GetGenPar(uint ix)
+        {
+            // create generic param descriptor if one does not exist
+            // - used when reading exported interface
+            // The next two lines are *required* for v2.0 beta release! (kjg)
+            for (int i = genericParams.Count; i <= ix; i++)
+                genericParams.Add(new GenericParam("gp" + i, this, i));
+            return (GenericParam)genericParams[(int)ix];
+        }
+
+    }
+}

PERWAPI/MDClassRefElems.cs

@@ -0,0 +1,617 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Security.Cryptography;
+
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a class/interface declared in another module of THIS 
+    /// assembly, or in another assembly.
+    /// </summary>
+    public class ClassRef : ClassDesc
+    {
+        protected ReferenceScope scope;
+        protected uint resScopeIx = 0;
+        internal ExternClass externClass;
+        internal ClassDef defOf;
+        internal bool readAsDef = false;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal ClassRef(ReferenceScope scope, string nsName, string name)
+            : base(nsName, name)
+        {
+            this.scope = scope;
+            tabIx = MDTable.TypeRef;
+        }
+
+        internal ClassRef(uint scopeIx, string nsName, string name)
+            : base(nsName, name)
+        {
+            resScopeIx = scopeIx;
+            tabIx = MDTable.TypeRef;
+        }
+
+        internal static ClassRef ReadDef(PEReader buff, ReferenceScope resScope, uint index)
+        {
+            uint junk = buff.ReadUInt32();
+            string cName = buff.GetString();
+            string nsName = buff.GetString();
+            ClassRef newClass = (ClassRef)resScope.GetExistingClass(nsName, cName);
+            if (newClass == null)
+            {
+                newClass = new ClassRef(resScope, nsName, cName);
+                resScope.AddToClassList(newClass);
+            }
+            newClass.readAsDef = true;
+            newClass.Row = index;
+            junk = buff.GetCodedIndex(CIx.TypeDefOrRef);
+            newClass.fieldIx = buff.GetIndex(MDTable.Field);
+            newClass.methodIx = buff.GetIndex(MDTable.Method);
+            return newClass;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] typeRefs, bool resolve)
+        {
+            for (uint i = 0; i < typeRefs.Length; i++)
+            {
+                uint resScopeIx = buff.GetCodedIndex(CIx.ResolutionScope);
+                string name = buff.GetString();
+                string nameSpace = buff.GetString();
+                if (buff.CodedTable(CIx.ResolutionScope, resScopeIx) == MDTable.TypeRef)
+                    typeRefs[i] = new NestedClassRef(resScopeIx, nameSpace, name);
+                else
+                    typeRefs[i] = new ClassRef(resScopeIx, nameSpace, name);
+                typeRefs[i].Row = i + 1;
+            }
+            if (resolve)
+            {
+                for (int i = 0; i < typeRefs.Length; i++)
+                {
+                    ((ClassRef)typeRefs[i]).ResolveParent(buff, false);
+                }
+            }
+        }
+
+        internal static ClassRef ReadClass(PEReader buff, ReferenceScope resScope)
+        {
+            uint resScopeIx = buff.GetCodedIndex(CIx.ResolutionScope);
+            string name = buff.GetString();
+            string nameSpace = buff.GetString();
+            ClassRef newClass = (ClassRef)resScope.GetExistingClass(nameSpace, name);
+            if (newClass == null)
+                newClass = new ClassRef(resScope, nameSpace, name);
+            return newClass;
+        }
+
+        internal virtual void ResolveParent(PEReader buff, bool isExtern)
+        {
+            CIx cIx = CIx.ResolutionScope;
+            if (isExtern) cIx = CIx.Implementation;
+            if (scope != null) return;
+            MetaDataElement parentScope = buff.GetCodedElement(cIx, resScopeIx);
+            if (parentScope is Module)
+            {  // special code for glitch in Everett ilasm
+                ClassDef newDef = new ClassDef((PEFile)parentScope, 0, nameSpace, name);
+                ((Module)parentScope).AddToClassList(newDef);
+                buff.InsertInTable(MDTable.TypeRef, Row, newDef);
+            }
+            else
+            {
+                scope = (ReferenceScope)buff.GetCodedElement(cIx, resScopeIx);
+                ClassRef existing = (ClassRef)scope.GetExistingClass(nameSpace, name);
+                if (existing == null)
+                {
+                    scope.AddToClassList(this);
+                }
+                else
+                {
+                    if (isExtern)
+                        buff.InsertInTable(MDTable.ExportedType, Row, existing);
+                    else
+                        buff.InsertInTable(MDTable.TypeRef, Row, existing);
+                }
+            }
+        }
+
+        /*------------------------- public set and get methods --------------------------*/
+
+        /// <summary>
+        /// Add a method to this class
+        /// </summary>
+        /// <param name="name">method name</param>
+        /// <param name="retType">return type</param>
+        /// <param name="pars">parameter types</param>
+        /// <returns>a descriptor for this method</returns>
+        public MethodRef AddMethod(string name, Type retType, Type[] pars)
+        {
+            System.Diagnostics.Debug.Assert(retType != null);
+            MethodRef meth = (MethodRef)GetMethodDesc(name, pars);
+            if (meth != null) DescriptorError(meth);
+            meth = new MethodRef(this, name, retType, pars);
+            methods.Add(meth);
+            return meth;
+        }
+
+        /// <summary>
+        /// Add a method to this class
+        /// </summary>
+        /// <param name="name">method name</param>
+        /// <param name="genPars">generic parameters</param>
+        /// <param name="retType">return type</param>
+        /// <param name="pars">parameter types</param>
+        /// <returns>a descriptor for this method</returns>
+        public MethodRef AddMethod(string name, GenericParam[] genPars, Type retType, Type[] pars)
+        {
+            MethodRef meth = AddMethod(name, retType, pars);
+            if ((genPars != null) && (genPars.Length > 0))
+            {
+                for (int i = 0; i < genPars.Length; i++)
+                {
+                    genPars[i].SetMethParam(meth, i);
+                }
+                meth.SetGenericParams(genPars);
+            }
+            return meth;
+        }
+
+        /// <summary>
+        /// Add a method to this class
+        /// </summary>
+        /// <param name="name">method name</param>
+        /// <param name="retType">return type</param>
+        /// <param name="pars">parameter types</param>
+        /// <param name="optPars">optional parameter types</param>
+        /// <returns>a descriptor for this method</returns>
+        public MethodRef AddVarArgMethod(string name, Type retType, Type[] pars, Type[] optPars)
+        {
+            MethodRef meth = AddMethod(name, retType, pars);
+            meth.MakeVarArgMethod(null, optPars);
+            return meth;
+        }
+        /// <summary>
+        /// Add a method to this class
+        /// </summary>
+        /// <param name="name">method name</param>
+        /// <param name="genPars">generic parameters</param>
+        /// <param name="retType">return type</param>
+        /// <param name="pars">parameter types</param>
+        /// <param name="optPars">optional parameter types</param>
+        /// <returns>a descriptor for this method</returns>
+        public MethodRef AddVarArgMethod(string name, GenericParam[] genPars, Type retType, Type[] pars, Type[] optPars)
+        {
+            MethodRef meth = AddMethod(name, genPars, retType, pars);
+            meth.MakeVarArgMethod(null, optPars);
+            return meth;
+        }
+
+        /// <summary>
+        /// Get the method "name" for this class
+        /// </summary>
+        /// <param name="name">The method name</param>
+        /// <returns>Descriptor for the method "name" for this class</returns>
+        public MethodRef GetMethod(string name)
+        {
+            return (MethodRef)GetMethodDesc(name);
+        }
+
+        /// <summary>
+        /// Get the method "name(parTypes)" for this class
+        /// </summary>
+        /// <param name="name">Method name</param>
+        /// <param name="parTypes">Method signature</param>
+        /// <returns>Descriptor for "name(parTypes)"</returns>
+        public MethodRef GetMethod(string name, Type[] parTypes)
+        {
+            return (MethodRef)GetMethodDesc(name, parTypes);
+        }
+
+        /// <summary>
+        /// Get the vararg method "name(parTypes,optTypes)" for this class
+        /// </summary>
+        /// <param name="name">Method name</param>
+        /// <param name="parTypes">Method parameter types</param>
+        /// <param name="optTypes">Optional parameter types</param>
+        /// <returns>Descriptor for "name(parTypes,optTypes)"</returns>
+        public MethodRef GetMethod(string name, Type[] parTypes, Type[] optTypes)
+        {
+            return (MethodRef)GetMethodDesc(name, parTypes, optTypes);
+        }
+
+        /// <summary>
+        /// Get the descriptors for the all methods name "name" for this class
+        /// </summary>
+        /// <param name="name">Method name</param>
+        /// <returns>List of methods called "name"</returns>
+        public MethodRef[] GetMethods(string name)
+        {
+            ArrayList meths = GetMeths(name);
+            return (MethodRef[])meths.ToArray(typeof(MethodRef));
+        }
+
+
+        /// <summary>
+        /// Get all the methods for this class
+        /// </summary>
+        /// <returns>List of methods for this class</returns>
+        public MethodRef[] GetMethods()
+        {
+            return (MethodRef[])methods.ToArray(typeof(MethodRef));
+        }
+
+        /// <summary>
+        /// Add a field to this class
+        /// </summary>
+        /// <param name="name">field name</param>
+        /// <param name="fType">field type</param>
+        /// <returns>a descriptor for this field</returns>
+        public FieldRef AddField(string name, Type fType)
+        {
+            FieldRef fld = (FieldRef)FindField(name);
+            if (fld != null) DescriptorError(fld);
+            fld = new FieldRef(this, name, fType);
+            fields.Add(fld);
+            return fld;
+        }
+
+        /// <summary>
+        /// Get the descriptor for the field "name" for this class
+        /// </summary>
+        /// <param name="name">Field name</param>
+        /// <returns>Descriptor for field "name"</returns>
+        public FieldRef GetField(string name)
+        {
+            return (FieldRef)FindField(name);
+        }
+
+        /// <summary>
+        /// Get all the fields for this class
+        /// </summary>
+        /// <returns>List of fields for this class</returns>
+        public FieldRef[] GetFields()
+        {
+            return (FieldRef[])fields.ToArray(typeof(FieldRef));
+        }
+
+        /// <summary>
+        /// Add a nested class to this class
+        /// </summary>
+        /// <param name="name">Nested class name</param>
+        /// <returns>Descriptor for the nested class "name"</returns>
+        public NestedClassRef AddNestedClass(string name)
+        {
+            NestedClassRef nestedClass = (NestedClassRef)GetNested(name);
+            if (nestedClass != null) DescriptorError(nestedClass);
+            nestedClass = new NestedClassRef(this, name);
+            AddToClassList(nestedClass);
+            return nestedClass;
+        }
+
+        /// <summary>
+        /// Get the nested class "name"
+        /// </summary>
+        /// <param name="name">Nestec class name</param>
+        /// <returns>Descriptor for the nested class "name"</returns>
+        public NestedClassRef GetNestedClass(string name)
+        {
+            // check nested names
+            return (NestedClassRef)GetNested(name);
+        }
+
+        /// <summary>
+        /// Make this Class exported from an Assembly (ie. add to ExportedType table)
+        /// </summary>
+        public void MakeExported()
+        {
+            if ((scope == null) || (!(scope is ModuleRef)))
+                throw new Exception("Module not set for class to be exported");
+            ((ModuleRef)scope).AddToExportedClassList(this);
+        }
+
+        /// <summary>
+        /// Get the scope or "parent" of this ClassRef (either ModuleRef or AssemblyRef)
+        /// </summary>
+        /// <returns>Descriptor for the scope containing this class</returns>
+        public virtual ReferenceScope GetScope()
+        {
+            return scope;
+        }
+
+        public override MetaDataElement GetParent() { return scope; }
+
+        /*----------------------------- internal functions ------------------------------*/
+
+        internal void SetExternClass(ExternClass eClass) { externClass = eClass; }
+
+        internal void SetScope(ReferenceScope scope)
+        {
+            this.scope = scope;
+        }
+
+        internal void AddField(FieldRef fld)
+        {
+            fields.Add(fld);
+            fld.SetParent(this);
+        }
+
+        internal void AddMethod(MethodRef meth)
+        {
+            MethodRef m = (MethodRef)GetMethodDesc(meth.Name(), meth.GetParTypes());
+            if (m == null)
+            {
+                methods.Add(meth);
+                meth.SetParent(this);
+            }
+        }
+
+        /*
+        internal FieldRef GetExistingField(string fName, uint tyIx, PEReader buff) {
+          FieldRef existing = (FieldRef)FindField(fName);
+          if (existing != null) {
+            Type fType = buff.GetBlobType(tyIx);
+            if (!fType.SameType(existing.GetFieldType()))
+              throw new DescriptorException("Cannot have two fields (" + fName +
+                ") for class " + name);
+          }
+          return existing;
+        }
+        */
+
+        /*
+        internal MethodRef CheckForMethod(string mName, uint sigIx, PEReader buff) {
+          int exIx = FindMeth(mName,0);
+          if (exIx > -1) {
+            MethSig mType = buff.ReadMethSig(sigIx);
+            mType.name = mName;
+            exIx = FindMeth(mType,0);
+            if (exIx > -1) 
+              return (MethodRef)methods[exIx];
+          }
+          return null;
+        }
+        */
+
+        internal override string ClassName()
+        {
+            string nameString = nameSpace + "." + name;
+            if ((scope != null) && (scope is AssemblyRef))
+                nameString += (", " + ((AssemblyRef)scope).AssemblyString());
+            return nameString;
+        }
+
+        internal bool HasParent(uint tok)
+        {
+            return resScopeIx == tok;
+        }
+
+        internal override void BuildTables(MetaDataOut md)
+        {
+            if (!special)
+            {
+                md.AddToTable(MDTable.TypeRef, this);
+                nameIx = md.AddToStringsHeap(name);
+                nameSpaceIx = md.AddToStringsHeap(nameSpace);
+            }
+            scope.BuildMDTables(md);
+        }
+
+        internal override void BuildCILInfo(CILWriter output)
+        {
+            if (!special && scope != null)
+            {
+                output.AddRef(scope);
+            }
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return md.CodedIndexSize(CIx.ResolutionScope) + 2 * md.StringsIndexSize();
+        }
+
+        internal override void Write(PEWriter output)
+        {
+            output.WriteCodedIndex(CIx.ResolutionScope, scope);
+            output.StringsIndex(nameIx);
+            output.StringsIndex(nameSpaceIx);
+        }
+
+        internal override void WriteType(CILWriter output)
+        {
+            if ((nameSpace == null) || (nameSpace == ""))
+            {
+                output.Write("[" + scope.Name() + "]" + name);
+            }
+            else
+            {
+                output.Write("[" + scope.Name() + "]" + nameSpace + "." + name);
+            }
+        }
+
+        internal override sealed uint TypeDefOrRefToken()
+        {
+            uint cIx = Row;
+            cIx = (cIx << 2) | 0x1;
+            return cIx;
+        }
+
+        internal sealed override uint GetCodedIx(CIx code)
+        {
+            switch (code)
+            {
+                case (CIx.TypeDefOrRef): return 1;
+                case (CIx.HasCustomAttr): return 2;
+                case (CIx.MemberRefParent): return 1;
+                case (CIx.ResolutionScope): return 3;
+            }
+            return 0;
+        }
+
+        internal override string NameString()
+        {
+            string nameString = "";
+            if (scope != null) nameString = "[" + scope.NameString() + "]";
+            if ((nameSpace != null) && (nameSpace.Length > 0)) nameString += nameSpace + ".";
+            nameString += name;
+            return nameString;
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a reference to a Nested Class
+    /// </summary>
+    public class NestedClassRef : ClassRef
+    {
+        ClassRef parent;
+        internal uint parentIx = 0;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal NestedClassRef(ClassRef parent, string name)
+            : base(parent.GetScope(), "", name)
+        {
+            this.parent = parent;
+        }
+
+        internal NestedClassRef(uint scopeIx, string nsName, string name)
+            : base(scopeIx, nsName, name)
+        {
+        }
+
+        internal NestedClassRef(ReferenceScope scope, string nsName, string name)
+            : base(scope, nsName, name)
+        {
+        }
+
+        internal override void ResolveParent(PEReader buff, bool isExtern)
+        {
+            if (parent != null) return;
+            CIx cIx = CIx.ResolutionScope;
+            if (isExtern) cIx = CIx.Implementation;
+            parent = (ClassRef)buff.GetCodedElement(cIx, resScopeIx);
+            parent.ResolveParent(buff, isExtern);
+            parent = (ClassRef)buff.GetCodedElement(cIx, resScopeIx);
+            if (parent == null) return;
+            NestedClassRef existing = parent.GetNestedClass(name);
+            if (existing == null)
+            {
+                scope = parent.GetScope();
+                parent.AddToClassList(this);
+            }
+            else if (isExtern)
+                buff.InsertInTable(MDTable.ExportedType, Row, existing);
+            else
+                buff.InsertInTable(MDTable.TypeRef, Row, existing);
+        }
+
+        /// <summary>
+        /// Get the scope of this ClassRef (either ModuleRef or AssemblyRef)
+        /// </summary>
+        /// <returns>Descriptor for the scope containing this class</returns>
+        public override ReferenceScope GetScope()
+        {
+            if (scope == null)
+                scope = parent.GetScope();
+            return scope;
+        }
+
+        /// <summary>
+        /// Get the parent (enclosing ClassRef) for this nested class
+        /// </summary>
+        /// <returns>Enclosing class descriptor</returns>
+        public ClassRef GetParentClass() { return parent; }
+
+        internal void SetParent(ClassRef paren) { parent = paren; }
+
+        internal override string ClassName()
+        {
+            string nameString = name;
+            if (parent != null) nameString = parent.TypeName() + "+" + name;
+            if ((scope != null) && (scope is AssemblyRef))
+                nameString += (", " + ((AssemblyRef)scope).AssemblyString());
+            return nameString;
+        }
+
+        internal override string NameString()
+        {
+            if (parent == null) return name;
+            return parent.NameString() + "+" + name;
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            if (!special)
+            {
+                md.AddToTable(MDTable.TypeRef, this);
+                nameIx = md.AddToStringsHeap(name);
+                nameSpaceIx = md.AddToStringsHeap(nameSpace);
+            }
+            parent.BuildMDTables(md);
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.WriteCodedIndex(CIx.ResolutionScope, parent);
+            output.StringsIndex(nameIx);
+            output.StringsIndex(nameSpaceIx);
+        }
+
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a class defined in System (mscorlib)
+    /// </summary>
+    internal class SystemClass : ClassRef
+    {
+        PrimitiveType elemType;
+        internal bool added = false;
+
+        internal SystemClass(AssemblyRef paren, PrimitiveType eType)
+            : base(paren, "System", eType.GetName())
+        {
+            elemType = eType;
+        }
+
+        //   internal override sealed void AddTypeSpec(MetaDataOut md) {
+        //     elemType.AddTypeSpec(md);
+        //      if (typeSpec == null) typeSpec = (TypeSpec)elemType.GetTypeSpec(md);
+        //      return typeSpec;
+        //   }
+
+        internal sealed override void TypeSig(MemoryStream str)
+        {
+            str.WriteByte(elemType.GetTypeIndex());
+        }
+
+        internal override bool SameType(Type tstType)
+        {
+            if (tstType is SystemClass)
+                return elemType == ((SystemClass)tstType).elemType;
+            return elemType == tstType;
+        }
+    }
+
+}

PERWAPI/MDDefScopeElems.cs

@@ -0,0 +1,810 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Security.Cryptography;
+
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    /// <summary>
+    /// A scope for definitions
+    /// </summary>
+    public abstract class DefiningScope : ResolutionScope
+    {
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal DefiningScope(string name)
+            : base(name)
+        {
+            readAsDef = true;
+        }
+
+        internal override void AddToClassList(Class aClass)
+        {
+            ((ClassDef)aClass).SetScope((PEFile)this);
+            classes.Add(aClass);
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for an assembly (.assembly)
+    /// </summary>
+    public class Assembly : DefiningScope
+    {
+        //internal static Hashtable Assemblies = new Hashtable();
+        ushort majorVer, minorVer, buildNo, revisionNo;
+        uint flags;
+        HashAlgorithmType hashAlgId = HashAlgorithmType.None;
+        uint keyIx = 0, cultIx = 0;
+        byte[] publicKey;
+        string culture;
+        internal AssemblyRef refOf;
+        ArrayList security;
+        internal PEFile pefile;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal Assembly(string name, PEFile pefile)
+            : base(name)
+        {
+            this.pefile = pefile;
+            tabIx = MDTable.Assembly;
+        }
+
+        internal Assembly(string name, HashAlgorithmType hashAlgId, ushort majVer,
+            ushort minVer, ushort bldNo, ushort revNo, uint flags, byte[] pKey,
+            string cult, PEFile pefile)
+            : base(name)
+        {
+            this.hashAlgId = hashAlgId;
+            this.majorVer = majVer;
+            this.minorVer = minVer;
+            this.buildNo = bldNo;
+            this.revisionNo = revNo;
+            this.flags = flags;
+            this.publicKey = pKey;
+            this.culture = cult;
+            tabIx = MDTable.Assembly;
+        }
+
+        internal static AssemblyRef ReadAssemblyRef(PEReader buff)
+        {
+            buff.SetElementPosition(MDTable.Assembly, 1);
+            HashAlgorithmType hAlg = (HashAlgorithmType)buff.ReadUInt32();
+            ushort majVer = buff.ReadUInt16();
+            ushort minVer = buff.ReadUInt16();
+            ushort bldNo = buff.ReadUInt16();
+            ushort revNo = buff.ReadUInt16();
+            uint flags = buff.ReadUInt32();
+            byte[] pKey = buff.GetBlob();
+            string name = buff.GetString();
+            string cult = buff.GetString();
+            AssemblyRef assemRef = null;
+            if (name.ToLower() == "mscorlib")
+            {
+                assemRef = MSCorLib.mscorlib;
+                assemRef.AddVersionInfo(majVer, minVer, bldNo, revNo);
+                if (pKey.Length > 8) assemRef.AddKey(pKey);
+                else assemRef.AddKeyToken(pKey);
+                assemRef.AddCulture(cult);
+                assemRef.SetFlags(flags);
+            }
+            else
+            {
+                assemRef = new AssemblyRef(name, majVer, minVer, bldNo, revNo, flags, pKey, cult, null);
+            }
+            //AssemblyRef assemRef = new AssemblyRef(name,majVer,minVer,bldNo,revNo,flags,pKey,cult,null);
+            assemRef.ReadAsDef();
+            return assemRef;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] table, PEFile pefile)
+        {
+            for (int i = 0; i < table.Length; i++)
+            {
+                HashAlgorithmType hAlg = (HashAlgorithmType)buff.ReadUInt32();
+                ushort majVer = buff.ReadUInt16();
+                ushort minVer = buff.ReadUInt16();
+                ushort bldNo = buff.ReadUInt16();
+                ushort revNo = buff.ReadUInt16();
+                uint flags = buff.ReadUInt32();
+                byte[] pKey = buff.GetBlob();
+                string name = buff.GetString();
+                string cult = buff.GetString();
+                table[i] = new Assembly(name, hAlg, majVer, minVer, bldNo, revNo, flags, pKey, cult, pefile);
+            }
+        }
+
+        /*------------------------- public set and get methods --------------------------*/
+
+        /// <summary>
+        /// Add details about an assembly
+        /// </summary>
+        /// <param name="majVer">Major Version</param>
+        /// <param name="minVer">Minor Version</param>
+        /// <param name="bldNo">Build Number</param>
+        /// <param name="revNo">Revision Number</param>
+        /// <param name="key">Hash Key</param>
+        /// <param name="hash">Hash Algorithm</param>
+        /// <param name="cult">Culture</param>
+        public void AddAssemblyInfo(int majVer, int minVer, int bldNo, int revNo,
+            byte[] key, HashAlgorithmType hash, string cult)
+        {
+            majorVer = (ushort)majVer;
+            minorVer = (ushort)minVer;
+            buildNo = (ushort)bldNo;
+            revisionNo = (ushort)revNo;
+            hashAlgId = hash;
+            publicKey = key;
+            culture = cult;
+        }
+
+        /// <summary>
+        /// Get the major version number for this Assembly
+        /// </summary>
+        /// <returns>major version number</returns>
+        public int MajorVersion() { return majorVer; }
+        /// <summary>
+        /// Get the minor version number for this Assembly
+        /// </summary>
+        /// <returns>minor version number</returns>
+        public int MinorVersion() { return minorVer; }
+        /// <summary>
+        /// Get the build number for this Assembly
+        /// </summary>
+        /// <returns>build number</returns>
+        public int BuildNumber() { return buildNo; }
+        /// <summary>
+        /// Get the revision number for this Assembly
+        /// </summary>
+        /// <returns>revision number</returns>
+        public int RevisionNumber() { return revisionNo; }
+        /// <summary>
+        /// Get the public key for this Assembly
+        /// </summary>
+        /// <returns>public key bytes</returns>
+        public byte[] Key() { return publicKey; }
+        /// <summary>
+        /// Get the public key token for this assembly
+        /// or null if the assembly is not signed
+        /// </summary>
+        /// <returns>Key token or null</returns>
+        public byte[] KeyTokenBytes()
+        {
+            if (this.publicKey != null &&
+                this.hashAlgId == HashAlgorithmType.SHA1)
+            {
+                int ix, ofst;
+                byte[] token = new byte[8];
+                HashAlgorithm sha = new SHA1CryptoServiceProvider();
+                byte[] hash = sha.ComputeHash(publicKey);
+                for (ix = 0, ofst = hash.Length - 8; ix < 8; ix++)
+                    token[ix] = hash[ix + ofst];
+                return token;
+            }
+            else
+                return null;
+        }
+        /// <summary>
+        /// Returns Public Key Token as Int64
+        /// </summary>
+        /// <returns></returns>
+        public long KeyTokenAsLong()
+        {
+            byte[] token = KeyTokenBytes();
+            return (token == null ? 0 : BitConverter.ToInt64(token, 0));
+        }
+        /// <summary>
+        /// Get the type of the hash algorithm for this Assembly
+        /// </summary>
+        /// <returns>hash algorithm type</returns>
+        public HashAlgorithmType HashAlgorithm() { return hashAlgId; }
+        /// <summary>
+        /// Get the culture information for this Assembly
+        /// </summary>
+        /// <returns>culture string</returns>
+        public string Culture() { return culture; }
+
+        /// <summary>
+        /// Add some security action(s) to this Assembly
+        /// </summary>
+        public void AddSecurity(SecurityAction act, byte[] permissionSet)
+        {
+            AddSecurity(new DeclSecurity(this, act, permissionSet));
+            // securityActions = permissionSet;
+        }
+
+        /// <summary>
+        /// Get the security information for this assembly
+        /// </summary>
+        /// <returns>security information</returns>
+        public DeclSecurity[] GetSecurity()
+        {
+            if (security == null) return null;
+            return (DeclSecurity[])security.ToArray(typeof(DeclSecurity));
+        }
+
+        /// <summary>
+        /// Check if this assembly has security information
+        /// </summary>
+        public bool HasSecurity() { return security != null; }
+
+        /// <summary>
+        /// Set the attributes for this assembly
+        /// </summary>
+        /// <param name="aa">assembly attribute</param>     
+        public void SetAssemblyAttr(AssemAttr aa)
+        {
+            flags = (uint)aa;
+        }
+
+        /// <summary>
+        /// Add an attribute for this assembly
+        /// </summary>
+        /// <param name="aa">assembly attribute</param>     
+        public void AddAssemblyAttr(AssemAttr aa)
+        {
+            flags |= (uint)aa;
+        }
+
+        /// <summary>
+        /// Get the attributes of this assembly
+        /// </summary>
+        /// <returns>assembly attributes</returns>
+        public AssemAttr AssemblyAttributes()
+        {
+            return (AssemAttr)flags;
+        }
+
+        /// <summary>
+        /// Make an AssemblyRef descriptor for this Assembly
+        /// </summary>
+        /// <returns>AssemblyRef descriptor for this Assembly</returns>
+        public AssemblyRef MakeRefOf()
+        {
+            if (refOf == null)
+            {
+                refOf = new AssemblyRef(name, majorVer, minorVer, buildNo, revisionNo,
+                    flags, publicKey, culture, null);
+            }
+            return refOf;
+        }
+
+        /*------------------------ internal functions ----------------------------*/
+
+        internal void AddSecurity(DeclSecurity sec)
+        {
+            if (security == null) security = new ArrayList();
+            security.Add(sec);
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return 16 + md.BlobIndexSize() + 2 * md.StringsIndexSize();
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.Assembly, this);
+            nameIx = md.AddToStringsHeap(name);
+            cultIx = md.AddToStringsHeap(culture);
+            keyIx = md.AddToBlobHeap(publicKey);
+            if (security != null)
+            {
+                for (int i = 0; i < security.Count; i++)
+                {
+                    ((DeclSecurity)security[i]).BuildMDTables(md);
+                }
+            }
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            //Console.WriteLine("Writing assembly element with nameIx of " + nameIx + " at file offset " + output.Seek(0,SeekOrigin.Current));
+            output.Write((uint)hashAlgId);
+            output.Write(majorVer);
+            output.Write(minorVer);
+            output.Write(buildNo);
+            output.Write(revisionNo);
+            output.Write(flags);
+            output.BlobIndex(keyIx);
+            output.StringsIndex(nameIx);
+            output.StringsIndex(cultIx);
+        }
+
+        internal override void Write(CILWriter output)
+        {
+            output.WriteLine(".assembly " + name + " { }");
+        }
+
+
+        internal sealed override uint GetCodedIx(CIx code)
+        {
+            switch (code)
+            {
+                case (CIx.HasCustomAttr): return 14;
+                case (CIx.HasDeclSecurity): return 2;
+            }
+            return 0;
+        }
+
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a module
+    /// </summary>
+    public abstract class Module : DefiningScope
+    {
+        Guid mvid;
+        uint mvidIx = 0;
+        internal ModuleRef refOf;
+        /// <summary>
+        /// The default class "Module" for globals
+        /// </summary>
+        protected ClassDef defaultClass;
+        /// <summary>
+        /// Is this module a .dll or .exe
+        /// </summary>
+        //protected bool isDLL;
+        /// <summary>
+        /// Is this module mscorlib.dll
+        /// </summary>
+        protected bool ismscorlib = false;
+        /// <summary>
+        /// Managed resources for this module
+        /// </summary>
+        protected ArrayList resources = new ArrayList();
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal Module(string mName)
+            : base(GetBaseName(mName))
+        {
+            mvid = Guid.NewGuid();
+            //isDLL = name.EndsWith(".dll") || name.EndsWith(".DLL");
+            defaultClass = new ClassDef((PEFile)this, TypeAttr.Private, "", "<Module>");
+            defaultClass.MakeSpecial();
+            tabIx = MDTable.Module;
+            ismscorlib = name.ToLower() == "mscorlib.dll";
+            if (Diag.DiagOn) Console.WriteLine("Module name = " + name);
+        }
+
+        internal void Read(PEReader buff)
+        {
+            buff.ReadZeros(2);
+            name = buff.GetString();
+            mvid = buff.GetGUID();
+            uint junk = buff.GetGUIDIx();
+            junk = buff.GetGUIDIx();
+            if (Diag.DiagOn) Console.WriteLine("Reading module with name " + name + " and Mvid = " + mvid);
+            ismscorlib = name.ToLower() == "mscorlib.dll";
+        }
+
+        internal static ModuleRef ReadModuleRef(PEReader buff)
+        {
+            buff.ReadZeros(2);
+            string name = buff.GetString();
+            uint junk = buff.GetGUIDIx();
+            junk = buff.GetGUIDIx();
+            junk = buff.GetGUIDIx();
+            ModuleRef mRef = new ModuleRef(new ModuleFile(name, null));
+            mRef.ReadAsDef();
+            return mRef;
+        }
+
+        /*------------------------- public set and get methods --------------------------*/
+
+        /// <summary>
+        /// Add a class to this Module
+        /// If this class already exists, throw an exception
+        /// </summary>
+        /// <param name="attrSet">attributes of this class</param>
+        /// <param name="nsName">name space name</param>
+        /// <param name="name">class name</param>
+        /// <returns>a descriptor for this new class</returns>
+        public ClassDef AddClass(TypeAttr attrSet, string nsName, string name)
+        {
+            ClassDef aClass = GetClass(nsName, name);
+            if (aClass != null)
+                throw new DescriptorException("Class " + aClass.NameString());
+            aClass = new ClassDef((PEFile)this, attrSet, nsName, name);
+            classes.Add(aClass);
+            return aClass;
+        }
+
+        /// <summary>
+        /// Add a class which extends System.ValueType to this Module
+        /// If this class already exists, throw an exception
+        /// </summary>
+        /// <param name="attrSet">attributes of this class</param>
+        /// <param name="nsName">name space name</param>
+        /// <param name="name">class name</param>
+        /// <returns>a descriptor for this new class</returns>
+        public ClassDef AddValueClass(TypeAttr attrSet, string nsName, string name)
+        {
+            ClassDef aClass = AddClass(attrSet, nsName, name);
+            aClass.SuperType = MSCorLib.mscorlib.ValueType();
+            aClass.MakeValueClass();
+            return aClass;
+        }
+
+        /// <summary>
+        /// Add a class to this PE File
+        /// </summary>
+        /// <param name="attrSet">attributes of this class</param>
+        /// <param name="nsName">name space name</param>
+        /// <param name="name">class name</param>
+        /// <param name="superType">super type of this class (extends)</param>
+        /// <returns>a descriptor for this new class</returns>
+        public ClassDef AddClass(TypeAttr attrSet, string nsName, string name, Class superType)
+        {
+            ClassDef aClass = AddClass(attrSet, nsName, name);
+            aClass.SuperType = superType;
+            return aClass;
+        }
+
+        /// <summary>
+        /// Add a class to this module
+        /// If this class already exists, throw an exception
+        /// </summary>
+        /// <param name="aClass">The class to be added</param>
+        public void AddClass(ClassDef aClass)
+        {
+            ClassDef eClass = GetClass(aClass.NameSpace(), aClass.Name());
+            if (eClass != null)
+                throw new DescriptorException("Class " + aClass.NameString());
+            classes.Add(aClass);
+            // MERGE change Refs to Defs here, fix this
+            aClass.SetScope((PEFile)this);
+        }
+
+        /// <summary>
+        /// Get a class of this module, if no class exists, return null
+        /// </summary>
+        /// <param name="name">The name of the class to get</param>
+        /// <returns>ClassDef for name or null</returns>
+        public ClassDef GetClass(string name)
+        {
+            return (ClassDef)GetClass(null, name, false);
+        }
+
+        /// <summary>
+        /// Get a class of this module, if no class exists, return null
+        /// </summary>
+        /// <param name="nsName">The namespace of the class</param>
+        /// <param name="name">The name of the class to get</param>
+        /// <returns>ClassDef for nsName.name or null</returns>
+        public ClassDef GetClass(string nsName, string name)
+        {
+            return (ClassDef)GetClass(nsName, name, true);
+        }
+
+        /// <summary>
+        /// Get all the classes of this module
+        /// </summary>
+        /// <returns>An array containing a ClassDef for each class of this module</returns>
+        public ClassDef[] GetClasses()
+        {
+            return (ClassDef[])classes.ToArray(typeof(ClassDef));
+        }
+
+        /// <summary>
+        /// Add a "global" method to this module
+        /// </summary>
+        /// <param name="name">method name</param>
+        /// <param name="retType">return type</param>
+        /// <param name="pars">method parameters</param>
+        /// <returns>a descriptor for this new "global" method</returns>
+        public MethodDef AddMethod(string name, Type retType, Param[] pars)
+        {
+            MethodDef newMeth = defaultClass.AddMethod(name, retType, pars);
+            return newMeth;
+        }
+
+        /// <summary>
+        /// Add a "global" method to this module
+        /// </summary>
+        /// <param name="name">method name</param>
+        /// <param name="genPars">generic parameters</param>
+        /// <param name="retType">return type</param>
+        /// <param name="pars">method parameters</param>
+        /// <returns>a descriptor for this new "global" method</returns>
+        public MethodDef AddMethod(string name, GenericParam[] genPars, Type retType, Param[] pars)
+        {
+            MethodDef newMeth = defaultClass.AddMethod(name, genPars, retType, pars);
+            return newMeth;
+        }
+
+        /// <summary>
+        /// Add a "global" method to this module
+        /// </summary>
+        /// <param name="mAtts">method attributes</param>
+        /// <param name="iAtts">method implementation attributes</param>
+        /// <param name="name">method name</param>
+        /// <param name="retType">return type</param>
+        /// <param name="pars">method parameters</param>
+        /// <returns>a descriptor for this new "global" method</returns>
+        public MethodDef AddMethod(MethAttr mAtts, ImplAttr iAtts, string name, Type retType, Param[] pars)
+        {
+            MethodDef newMeth = defaultClass.AddMethod(mAtts, iAtts, name, retType, pars);
+            return newMeth;
+        }
+
+        /// <summary>
+        /// Add a "global" method to this module
+        /// </summary>
+        /// <param name="mAtts">method attributes</param>
+        /// <param name="iAtts">method implementation attributes</param>
+        /// <param name="name">method name</param>
+        /// <param name="genPars">generic parameters</param>
+        /// <param name="retType">return type</param>
+        /// <param name="pars">method parameters</param>
+        /// <returns>a descriptor for this new "global" method</returns>
+        public MethodDef AddMethod(MethAttr mAtts, ImplAttr iAtts, string name, GenericParam[] genPars, Type retType, Param[] pars)
+        {
+            MethodDef newMeth = defaultClass.AddMethod(mAtts, iAtts, name, genPars, retType, pars);
+            return newMeth;
+        }
+
+        /// <summary>
+        /// Add a "global" method to this module
+        /// </summary>
+        /// <param name="meth">The method to be added</param>
+        public void AddMethod(MethodDef meth)
+        {
+            defaultClass.AddMethod(meth);
+        }
+
+        /// <summary>
+        /// Get a method of this module, if it exists
+        /// </summary>
+        /// <param name="name">The name of the method to get</param>
+        /// <returns>MethodDef for name, or null if one does not exist</returns>
+        public MethodDef GetMethod(string name)
+        {
+            return defaultClass.GetMethod(name);
+        }
+
+        /// <summary>
+        /// Get all the methods of this module with a specified name
+        /// </summary>
+        /// <param name="name">The name of the method(s)</param>
+        /// <returns>An array of all the methods of this module called "name" </returns>
+        public MethodDef[] GetMethods(string name)
+        {
+            return defaultClass.GetMethods(name);
+        }
+
+        /// <summary>
+        /// Get a method of this module, if it exists
+        /// </summary>
+        /// <param name="name">The name of the method to get</param>
+        /// <param name="parTypes">The signature of the method</param>
+        /// <returns>MethodDef for name(parTypes), or null if one does not exist</returns>
+        public MethodDef GetMethod(string name, Type[] parTypes)
+        {
+            return defaultClass.GetMethod(name, parTypes);
+        }
+
+        /// <summary>
+        /// Get all the methods of this module
+        /// </summary>
+        /// <returns>An array of all the methods of this module</returns>
+        public MethodDef[] GetMethods()
+        {
+            return defaultClass.GetMethods();
+        }
+
+        /// <summary>
+        /// Delete a method from this module
+        /// </summary>
+        /// <param name="meth">The method to be deleted</param>
+        public void RemoveMethod(MethodDef meth)
+        {
+            defaultClass.RemoveMethod(meth);
+        }
+
+        /// <summary>
+        /// Delete a method from this module
+        /// </summary>
+        /// <param name="name">The name of the method to be deleted</param>
+        public void RemoveMethod(string name)
+        {
+            defaultClass.RemoveMethod(name);
+        }
+
+        /// <summary>
+        /// Delete a method from this module
+        /// </summary>
+        /// <param name="name">The name of the method to be deleted</param>
+        /// <param name="parTypes">The signature of the method to be deleted</param>
+        public void RemoveMethod(string name, Type[] parTypes)
+        {
+            defaultClass.RemoveMethod(name, parTypes);
+        }
+
+        /// <summary>
+        /// Delete a method from this module
+        /// </summary>
+        /// <param name="ix">The index of the method (in the method array
+        /// returned by GetMethods()) to be deleted</param>
+        public void RemoveMethod(int ix)
+        {
+            defaultClass.RemoveMethod(ix);
+        }
+
+        /// <summary>
+        /// Add a "global" field to this module
+        /// </summary>
+        /// <param name="name">field name</param>
+        /// <param name="fType">field type</param>
+        /// <returns>a descriptor for this new "global" field</returns>
+        public FieldDef AddField(string name, Type fType)
+        {
+            FieldDef newField = defaultClass.AddField(name, fType);
+            return newField;
+        }
+
+        /// <summary>
+        /// Add a "global" field to this module
+        /// </summary>
+        /// <param name="attrSet">attributes of this field</param>
+        /// <param name="name">field name</param>
+        /// <param name="fType">field type</param>
+        /// <returns>a descriptor for this new "global" field</returns>
+        public FieldDef AddField(FieldAttr attrSet, string name, Type fType)
+        {
+            FieldDef newField = defaultClass.AddField(attrSet, name, fType);
+            return newField;
+        }
+
+        /// <summary>
+        /// Add a "global" field to this module
+        /// </summary>
+        /// <param name="fld">The field to be added</param>
+        public void AddField(FieldDef fld)
+        {
+            defaultClass.AddField(fld);
+        }
+
+        /// <summary>
+        /// Get a field of this module, if it exists
+        /// </summary>
+        /// <param name="name">The name of the field</param>
+        /// <returns>FieldDef for "name", or null if one doesn't exist</returns>
+        public FieldDef GetField(string name)
+        {
+            return defaultClass.GetField(name);
+        }
+
+        /// <summary>
+        /// Get all the fields of this module
+        /// </summary>
+        /// <returns>An array of all the fields of this module</returns>
+        public FieldDef[] GetFields()
+        {
+            return defaultClass.GetFields();
+        }
+
+        /// <summary>
+        /// Make a ModuleRef for this Module.
+        /// </summary>
+        /// <returns>ModuleRef for this Module</returns>
+        public ModuleRef MakeRefOf(/*bool hasEntryPoint, byte[] hashValue*/)
+        {
+            if (refOf == null)
+            {
+                refOf = new ModuleRef(name/*,hasEntryPoint,hashValue*/);
+                refOf.defOf = this;
+            }/* else {  // fix this
+        if (hasEntryPoint)
+          refOf.SetEntryPoint();
+        refOf.SetHash(hashValue);
+      }*/
+            return refOf;
+        }
+
+        /// <summary>
+        /// Set the name for this module
+        /// </summary>
+        /// <param name="newName">New module name</param>
+        public void SetName(string newName)
+        {
+            name = newName;
+            //isDLL = name.EndsWith(".dll") || name.EndsWith(".DLL");
+        }
+
+        public void SetMVid(Guid guid)
+        {
+            mvid = guid;
+        }
+
+        public Guid GetMVid()
+        {
+            return mvid;
+        }
+
+        /*------------------------- internal functions --------------------------*/
+
+        internal bool isMSCorLib() { return ismscorlib; }
+
+        internal bool isDefaultClass(ClassDef aClass) { return aClass == defaultClass; }
+
+        private static string GetBaseName(string name)
+        {
+            // more to this??
+            if (name.IndexOf("\\") != -1)
+                name = name.Substring(name.LastIndexOf("\\") + 1);
+            return name;
+        }
+
+        internal void SetDefaultClass(ClassDef dClass)
+        {
+            defaultClass = dClass;
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.Module, this);
+            nameIx = md.AddToStringsHeap(name);
+            mvidIx = md.AddToGUIDHeap(mvid);
+            defaultClass.BuildTables(md);
+            for (int i = 0; i < classes.Count; i++)
+            {
+                ((Class)classes[i]).BuildMDTables(md);
+            }
+            for (int i = 0; i < resources.Count; i++)
+            {
+                ((ManifestResource)resources[i]).BuildMDTables(md);
+            }
+        }
+
+
+        internal static uint Size(MetaData md)
+        {
+            return 2 + md.StringsIndexSize() + 3 * md.GUIDIndexSize();
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.Write((short)0);
+            output.StringsIndex(nameIx);
+            output.GUIDIndex(mvidIx);
+            output.GUIDIndex(0);
+            output.GUIDIndex(0);
+        }
+
+        internal sealed override uint GetCodedIx(CIx code)
+        {
+            switch (code)
+            {
+                case (CIx.HasCustomAttr): return 7;
+                case (CIx.ResolutionScope): return 0;
+            }
+            return 0;
+        }
+    }
+}

PERWAPI/MDElements.cs

@@ -0,0 +1,1463 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Security.Cryptography;
+
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    /// <summary>
+    /// Abstract class to represent a row of the Meta Data Tables
+    /// </summary>
+    public abstract class TableRow
+    {
+        internal PEReader buffer;
+        private uint row = 0;
+        /// <summary>
+        /// The index of the Meta Data Table containing this element
+        /// </summary>
+        protected MDTable tabIx;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal TableRow() { }
+
+        internal TableRow(PEReader buff, uint ix, MDTable tableIx)
+        {
+            buffer = buff;
+            row = ix;
+            tabIx = tableIx;
+        }
+
+        /// <summary>
+        /// The row number of this element in the Meta Data Table
+        /// </summary>
+        public uint Row
+        {
+            get { return row; }
+            set { row = value; }
+        }
+    }
+
+    /****************************************************/
+    /// <summary>
+    /// Base class for all Meta Data table elements
+    /// </summary>
+    public abstract class MetaDataElement : TableRow, IComparable
+    {
+        /// <summary>
+        /// The list of custom attributes associated with this meta data element
+        /// </summary>
+        protected ArrayList customAttributes;
+        protected bool done = false;
+        protected bool sortTable = false;
+        internal bool unresolved = false;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal MetaDataElement() { }
+
+        /// <summary>
+        /// Get any custom attributes associated with this meta data element
+        /// </summary>
+        /// <returns>Array of custom attribute descriptors</returns>
+        public CustomAttribute[] GetCustomAttributes()
+        {
+            if (customAttributes == null) return new CustomAttribute[0];
+            return (CustomAttribute[])customAttributes.ToArray(typeof(CustomAttribute));
+        }
+
+        /// <summary>
+        /// Associate some custom attribute(s) with this meta data element
+        /// </summary>
+        /// <param name="cas">list of custom attributes</param>
+        public void SetCustomAttributes(CustomAttribute[] cas)
+        {
+            if (cas == null)
+                customAttributes = null;
+            else
+                customAttributes = new ArrayList(cas);
+        }
+
+        // FIXME:   this is temporary
+        public string GetNameString()
+        {
+            return this.NameString();
+        }
+
+        internal virtual bool isDef() { return false; }
+
+        internal virtual void Resolve(PEReader buff) { }
+
+        internal virtual void ResolveDetails(PEReader buff) { }
+
+        internal virtual uint GetCodedIx(CIx code) { return 0; }
+
+        internal bool NeedToSort() { return sortTable; }
+
+        internal virtual uint SortKey()
+        {
+            throw new PEFileException("Trying to sort table of " + this);
+            //return 0; 
+        }
+
+        /// <summary>
+        /// Add a custom attribute to this item
+        /// </summary>
+        /// <param name="ctorMeth">the constructor method for this attribute</param>
+        /// <param name="val">the byte value of the parameters</param>
+        public void AddCustomAttribute(Method ctorMeth, byte[] val)
+        {
+            if (customAttributes == null)
+            {
+                customAttributes = new ArrayList();
+            }
+            customAttributes.Add(new CustomAttribute(this, ctorMeth, val));
+        }
+
+        /// <summary>
+        /// Add a custom attribute to this item
+        /// </summary>
+        /// <param name="ctorMeth">the constructor method for this attribute</param>
+        /// <param name="cVals">the constant values of the parameters</param>
+        public void AddCustomAttribute(Method ctorMeth, Constant[] cVals)
+        {
+            if (customAttributes == null)
+            {
+                customAttributes = new ArrayList();
+            }
+            customAttributes.Add(new CustomAttribute(this, ctorMeth, cVals));
+        }
+
+        /// <summary>
+        /// Associate a custom attribute with this meta data element
+        /// </summary>
+        public void AddCustomAttribute(CustomAttribute ca)
+        {
+            if (customAttributes == null)
+            {
+                customAttributes = new ArrayList();
+            }
+            customAttributes.Add(ca);
+        }
+
+        internal uint Token()
+        {
+            if (Row == 0) throw new Exception("Meta data token is zero!!");
+            return (((uint)tabIx << 24) | Row);
+        }
+
+        internal void BuildMDTables(MetaDataOut md)
+        {
+            if (done) return;
+            done = true;
+            if (Diag.DiagOn) Console.WriteLine("In BuildMDTables");
+            BuildTables(md);
+            if (customAttributes != null)
+            {
+                for (int i = 0; i < customAttributes.Count; i++)
+                {
+                    CustomAttribute ca = (CustomAttribute)customAttributes[i];
+                    ca.BuildTables(md);
+                }
+            }
+        }
+
+        internal virtual void BuildTables(MetaDataOut md) { }
+
+        internal virtual void BuildSignatures(MetaDataOut md)
+        {
+            done = false;
+        }
+
+        internal virtual void BuildCILInfo(CILWriter output) { }
+
+        internal virtual void AddToTable(MetaDataOut md)
+        {
+            md.AddToTable(tabIx, this);
+        }
+
+        internal virtual void Write(PEWriter output) { }
+
+        internal virtual void Write(CILWriter output)
+        {
+            throw new Exception("CIL backend not yet fully implemented - " + GetType().ToString());
+        }
+
+        internal virtual string NameString() { return "NoName"; }
+
+        internal void DescriptorError(MetaDataElement elem)
+        {
+            throw new DescriptorException(elem.NameString());
+        }
+        #region IComparable Members
+
+        public int CompareTo(object obj)
+        {
+            uint otherKey = ((MetaDataElement)obj).SortKey();
+            uint thisKey = SortKey();
+            if (thisKey == otherKey)
+            {
+                if (this is GenericParam)
+                {
+                    if (((GenericParam)this).Index < ((GenericParam)obj).Index)
+                        return -1;
+                    else
+                        return 1;
+                }
+                return 0;
+            }
+            if (thisKey < otherKey) return -1;
+            return 1;
+        }
+
+        #endregion
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for GenericParamConstraint 
+    /// </summary>
+    public class GenericParamConstraint : MetaDataElement
+    {
+        uint parentIx, constraintIx;
+        GenericParam parent;
+        Class constraint;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public GenericParamConstraint(GenericParam parent, Class constraint)
+        {
+            this.parent = parent;
+            this.constraint = constraint;
+            tabIx = MDTable.GenericParamConstraint;
+        }
+
+        internal GenericParamConstraint(PEReader buff)
+        {
+            parentIx = buff.GetIndex(MDTable.GenericParam);
+            constraintIx = buff.GetCodedIndex(CIx.TypeDefOrRef);
+            tabIx = MDTable.GenericParamConstraint;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] gpars)
+        {
+            for (int i = 0; i < gpars.Length; i++)
+                gpars[i] = new GenericParamConstraint(buff);
+        }
+
+        internal override void Resolve(PEReader buff)
+        {
+            parent = (GenericParam)buff.GetElement(MDTable.GenericParam, parentIx);
+            parent.AddConstraint((Class)buff.GetCodedElement(CIx.TypeDefOrRef, constraintIx));
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return md.TableIndexSize(MDTable.GenericParam) + md.CodedIndexSize(CIx.TypeDefOrRef);
+        }
+
+        internal override void Write(PEWriter output)
+        {
+            output.WriteIndex(MDTable.GenericParam, parent.Row);
+            output.WriteCodedIndex(CIx.TypeDefOrRef, constraint);
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for pinvoke information for a method 
+    /// </summary>
+    public class ImplMap : MetaDataElement
+    {
+        private static readonly ushort NoMangle = 0x01;
+        ushort flags;
+        MethodDef meth;
+        string importName;
+        uint iNameIx, scopeIx = 0, memForIndex = 0;
+        ModuleRef importScope;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal ImplMap(ushort flag, MethodDef implMeth, string iName, ModuleRef mScope)
+        {
+            flags = flag;
+            meth = implMeth;
+            importName = iName;
+            importScope = mScope;
+            tabIx = MDTable.ImplMap;
+            if (iName == null) flags |= NoMangle;
+            sortTable = true;
+            //throw(new NotYetImplementedException("PInvoke "));
+        }
+
+        internal ImplMap(PEReader buff)
+        {
+            flags = buff.ReadUInt16();
+            memForIndex = buff.GetCodedIndex(CIx.MemberForwarded);
+            importName = buff.GetString();
+            scopeIx = buff.GetIndex(MDTable.ModuleRef);
+            sortTable = true;
+            tabIx = MDTable.ImplMap;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] impls)
+        {
+            for (int i = 0; i < impls.Length; i++)
+                impls[i] = new ImplMap(buff);
+        }
+
+        internal override void Resolve(PEReader buff)
+        {
+            meth = (MethodDef)buff.GetCodedElement(CIx.MemberForwarded, memForIndex);
+            importScope = (ModuleRef)buff.GetElement(MDTable.ModuleRef, scopeIx);
+            if (meth != null) meth.AddPInvokeInfo(this);
+        }
+
+        internal override uint SortKey()
+        {
+            return (meth.Row << MetaData.CIxShiftMap[(uint)CIx.MemberForwarded])
+                | meth.GetCodedIx(CIx.MemberForwarded);
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.ImplMap, this);
+            iNameIx = md.AddToStringsHeap(importName);
+            importScope.BuildMDTables(md);
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return 2 + md.CodedIndexSize(CIx.MemberForwarded) +
+                md.StringsIndexSize() + md.TableIndexSize(MDTable.ModuleRef);
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.Write(flags);
+            output.WriteCodedIndex(CIx.MemberForwarded, meth);
+            output.StringsIndex(iNameIx);
+            output.WriteIndex(MDTable.ModuleRef, importScope.Row);
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Base class for field/methods (member of a class)
+    /// </summary>
+    public abstract class Member : MetaDataElement
+    {
+        protected string name;
+        protected uint nameIx = 0, sigIx = 0;
+        protected byte[] signature;
+        protected uint parentIx = 0;
+        protected Class parent;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal Member(string memName, Class paren)
+        {
+            name = memName;
+            parent = paren;
+            tabIx = MDTable.MemberRef;
+        }
+
+        internal Member(uint parenIx, string name, uint sIx)
+        {
+            parentIx = parenIx;
+            this.name = name;
+            sigIx = sIx;
+            tabIx = MDTable.MemberRef;
+        }
+
+        internal Member(string name)
+        {
+            this.name = name;
+            tabIx = MDTable.MemberRef;
+        }
+
+        internal static void ReadMember(PEReader buff, TableRow[] members)
+        {
+            for (int i = 0; i < members.Length; i++)
+            {
+                uint parenIx = buff.GetCodedIndex(CIx.MemberRefParent);
+                string memName = buff.GetString();
+                uint sigIx = buff.GetBlobIx();
+                if (buff.FirstBlobByte(sigIx) == Field.FieldTag) // got a field
+                    members[i] = new FieldRef(parenIx, memName, sigIx);
+                else
+                    members[i] = new MethodRef(parenIx, memName, sigIx);
+            }
+        }
+
+        internal virtual Member ResolveParent(PEReader buff) { return null; }
+
+        public MetaDataElement GetParent()
+        {
+            if (parent == null) return null;
+            if (parent.isSpecial())
+                return parent.GetParent();
+            return parent;
+        }
+
+        internal void SetParent(Class paren)
+        {
+            parent = paren;
+        }
+
+        public string Name() { return name; }
+
+        public string QualifiedName() { return parent.TypeName() + "." + name; }
+
+        internal bool HasName(string name)
+        {
+            return (this.name == name);
+        }
+
+        protected void WriteFlags(CILWriter output, uint flags)
+        {
+            uint vis = (flags & 0x07);  // visibility mask
+            switch (vis)
+            {
+                case 0: output.Write("compilercontrolled "); break;
+                case 1: output.Write("private "); break;
+                case 2: output.Write("famandassem "); break;
+                case 3: output.Write("assembly "); break;
+                case 4: output.Write("family "); break;
+                case 5: output.Write("famorassem "); break;
+                case 6: output.Write("public "); break;
+            }
+            if ((flags & (ushort)FieldAttr.Static) != 0)
+            {
+                output.Write("static ");
+            }
+            if ((flags & (ushort)FieldAttr.Initonly) != 0)
+            {
+                if (this is MethodDef)
+                {
+                    output.Write("final ");
+                }
+                else
+                {
+                    output.Write("initonly ");
+                }
+            }
+            if ((flags & (ushort)FieldAttr.Literal) != 0)
+            {
+                if (this is MethodDef)
+                {
+                    output.Write("virtual ");
+                }
+                else
+                {
+                    output.Write("literal ");
+                }
+            }
+            if ((flags & (ushort)FieldAttr.Notserialized) != 0)
+            {
+                if (this is MethodDef)
+                {
+                    output.Write("hidebysig ");
+                }
+                else
+                {
+                    output.Write("notserialized ");
+                }
+            }
+            if (this is MethodDef)
+            {
+                // more flags required here
+                if ((flags & (ushort)MethAttr.Abstract) != 0)
+                {
+                    output.Write("abstract ");
+                }
+                if ((flags & (ushort)MethAttr.SpecialName) != 0)
+                {
+                    output.Write("specialname ");
+                }
+                if ((flags & (ushort)MethAttr.RTSpecialName) != 0)
+                {
+                    output.Write("rtspecialname ");
+                }
+
+            }
+            else
+            {
+                // more flags required here
+                if ((flags & (ushort)FieldAttr.SpecialName) != 0)
+                {
+                    output.Write("specialname ");
+                }
+                if ((flags & (ushort)FieldAttr.RTSpecialName) != 0)
+                {
+                    output.Write("rtsspecialname ");
+                }
+            }
+        }
+
+        internal abstract void WriteType(CILWriter output);
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for interface implemented by a class
+    /// </summary>
+    public class InterfaceImpl : MetaDataElement
+    {
+        ClassDef theClass;
+        Class theInterface;
+        uint classIx = 0, interfacesIndex = 0;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal InterfaceImpl(ClassDef theClass, Class theInterface)
+        {
+            this.theClass = theClass;
+            this.theInterface = theInterface;
+            tabIx = MDTable.InterfaceImpl;
+        }
+
+        internal InterfaceImpl(ClassDef theClass, TableRow theInterface)
+        {
+            this.theClass = theClass;
+            this.theInterface = (Class)theInterface;
+            tabIx = MDTable.InterfaceImpl;
+        }
+
+        internal InterfaceImpl(PEReader buff)
+        {
+            classIx = buff.GetIndex(MDTable.TypeDef);
+            interfacesIndex = buff.GetCodedIndex(CIx.TypeDefOrRef);
+            tabIx = MDTable.InterfaceImpl;
+        }
+
+        internal override void Resolve(PEReader buff)
+        {
+            theClass = (ClassDef)buff.GetElement(MDTable.TypeDef, classIx);
+            theInterface = (Class)buff.GetCodedElement(CIx.TypeDefOrRef, interfacesIndex);
+            theClass.AddImplementedInterface(this);
+        }
+
+        internal static void Read(PEReader buff, TableRow[] impls)
+        {
+            for (int i = 0; i < impls.Length; i++)
+                impls[i] = new InterfaceImpl(buff);
+        }
+
+        internal ClassDef TheClass() { return theClass; }
+        internal Class TheInterface() { return theInterface; }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.InterfaceImpl, this);
+            if (!theInterface.isDef()) theInterface.BuildMDTables(md);
+            if (theInterface is ClassSpec) md.AddToTable(MDTable.TypeSpec, theInterface);
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return md.TableIndexSize(MDTable.TypeDef) +
+                md.CodedIndexSize(CIx.TypeDefOrRef);
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.WriteIndex(MDTable.TypeDef, theClass.Row);
+            output.WriteCodedIndex(CIx.TypeDefOrRef, theInterface);
+        }
+
+        internal sealed override uint GetCodedIx(CIx code) { return 5; }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for resources used in this PE file NOT YET IMPLEMENTED
+    /// </summary>
+    public class ManifestResource : MetaDataElement
+    {
+        private static readonly uint PublicResource = 0x1;
+        private static readonly uint PrivateResource = 0x2;
+
+        string mrName;
+        MetaDataElement impl;  // can be AssemblyRef, ResourceFile or ModuleFile
+        uint fileOffset = 0;
+        uint nameIx = 0, implIx = 0;
+        uint flags = 0;
+        PEFile pefile;
+        byte[] resourceBytes;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal ManifestResource(PEFile pefile, string name, byte[] resBytes, bool isPub)
+        {
+            InitResource(pefile, name, isPub);
+            this.resourceBytes = resBytes;
+        }
+
+        internal ManifestResource(PEFile pefile, string name, MetaDataElement fileRef, uint offset, bool isPub)
+        {
+            InitResource(pefile, name, isPub);
+            impl = fileRef;
+            fileOffset = offset;
+        }
+
+        internal ManifestResource(PEFile pefile, ManifestResource mres, bool isPub)
+        {
+            this.pefile = pefile;
+            mrName = mres.mrName;
+            flags = mres.flags;
+            this.impl = mres.impl;
+            this.fileOffset = mres.fileOffset;
+            this.resourceBytes = mres.resourceBytes;
+        }
+
+        internal ManifestResource(PEReader buff)
+        {
+            fileOffset = buff.ReadUInt32();
+            flags = buff.ReadUInt32();
+            mrName = buff.GetString();
+            implIx = buff.GetCodedIndex(CIx.Implementation);
+            tabIx = MDTable.ManifestResource;
+        }
+
+        private void InitResource(PEFile pefile, string name, bool isPub)
+        {
+            this.pefile = pefile;
+            mrName = name;
+            if (isPub) flags = PublicResource;
+            else flags = PrivateResource;
+            tabIx = MDTable.ManifestResource;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] mrs)
+        {
+            for (int i = 0; i < mrs.Length; i++)
+                mrs[i] = new ManifestResource(buff);
+        }
+
+        internal override void Resolve(PEReader buff)
+        {
+            impl = buff.GetCodedElement(CIx.Implementation, implIx);
+            if (impl == null)
+            {
+                if (!buff.skipBody)
+                    resourceBytes = buff.GetResource(fileOffset);
+            }
+        }
+
+        /*------------------------- public set and get methods --------------------------*/
+
+        public string Name
+        {
+            get { return mrName; }
+            set { mrName = value; }
+        }
+
+        public byte[] ResourceBytes
+        {
+            get { return resourceBytes; }
+            set { resourceBytes = value; }
+        }
+
+        public AssemblyRef ResourceAssembly
+        {
+            get { if (impl is AssemblyRef) return (AssemblyRef)impl; return null; }
+            set { impl = value; }
+        }
+
+        public ResourceFile ResFile
+        {
+            get { if (impl is ResourceFile) return (ResourceFile)impl; return null; }
+            set { impl = value; }
+        }
+
+        public ModuleRef ResourceModule
+        {
+            get { if (impl is ModuleFile) return ((ModuleFile)impl).fileModule; return null; }
+            set { impl = value.modFile; }
+        }
+
+        public uint FileOffset
+        {
+            get { return fileOffset; }
+            set { fileOffset = value; }
+        }
+
+        public bool IsPublic
+        {
+            get
+            {
+                return flags == PublicResource;
+            }
+            set
+            {
+                if (value)
+                    flags = PublicResource;
+                else
+                    flags = PrivateResource;
+            }
+        }
+
+        /*----------------------------- internal functions ------------------------------*/
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.ManifestResource, this);
+            nameIx = md.AddToStringsHeap(mrName);
+            if (resourceBytes != null)
+            {
+                if (impl != null)
+                    throw new Exception("ERROR:  Manifest Resource has byte value and file reference");
+                fileOffset = md.AddResource(resourceBytes);
+            }
+            else
+            {
+                if (impl == null)
+                    throw new Exception("ERROR:  Manifest Resource has no implementation or value");
+                impl.BuildMDTables(md);
+            }
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return 8 + md.StringsIndexSize() +
+                md.CodedIndexSize(CIx.Implementation);
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.Write(fileOffset);
+            output.Write(flags);
+            output.StringsIndex(nameIx);
+            output.WriteCodedIndex(CIx.Implementation, impl);
+        }
+
+        internal sealed override uint GetCodedIx(CIx code) { return 18; }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Base class for elements in the PropertyMap, EventMap and 
+    /// NestedClass MetaData tables
+    /// </summary>
+    public class MapElem : MetaDataElement
+    {
+        ClassDef theClass, parent;
+        uint elemIx, classIx, endIx = 0;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal MapElem(ClassDef classDef, uint elIx, MDTable tableIx)
+        {
+            theClass = classDef;
+            elemIx = elIx;
+            tabIx = tableIx;
+            sortTable = tabIx == MDTable.NestedClass;
+        }
+
+        internal MapElem(ClassDef classDef, ClassDef paren, MDTable tableIx)
+        {
+            theClass = classDef;
+            parent = paren;
+            tabIx = tableIx;
+            sortTable = tabIx == MDTable.NestedClass;
+        }
+
+        internal MapElem(PEReader buff, MDTable tab)
+        {
+            tabIx = tab;
+            classIx = buff.GetIndex(MDTable.TypeDef);
+            elemIx = buff.GetIndex(tab);
+            sortTable = tabIx == MDTable.NestedClass;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] maps, MDTable tab)
+        {
+            if (tab == MDTable.NestedClass)
+            {
+                for (int i = 0; i < maps.Length; i++)
+                {
+                    //maps[i] = new MapElem(buff,tab);
+                    uint nestClassIx = buff.GetIndex(MDTable.TypeDef);
+                    uint enclClassIx = buff.GetIndex(MDTable.TypeDef);
+                    ClassDef parent = (ClassDef)buff.GetElement(MDTable.TypeDef, enclClassIx);
+                    ClassDef nestClass = ((ClassDef)buff.GetElement(MDTable.TypeDef, nestClassIx)).MakeNestedClass(parent);
+                    buff.InsertInTable(MDTable.TypeDef, nestClass.Row, nestClass);
+                }
+            }
+            else
+            { // event or property map
+                MapElem prev = new MapElem(buff, tab);
+                maps[0] = prev;
+                for (int i = 1; i < maps.Length; i++)
+                {
+                    maps[i] = new MapElem(buff, tab);
+                    prev.endIx = ((MapElem)maps[i]).elemIx;
+                    prev = (MapElem)maps[i];
+                }
+                switch (tab)
+                {
+                    case MDTable.PropertyMap:
+                        prev.endIx = buff.GetTableSize(MDTable.Property) + 1;
+                        break;
+                    case MDTable.EventMap:
+                        prev.endIx = buff.GetTableSize(MDTable.Event) + 1;
+                        break;
+                    default:
+                        prev.endIx = buff.GetTableSize(tab) + 1;
+                        break;
+                }
+            }
+        }
+
+        internal static void ReadNestedClassInfo(PEReader buff, uint num, uint[] parIxs)
+        {
+            for (int i = 0; i < parIxs.Length; i++) parIxs[i] = 0;
+            for (int i = 0; i < num; i++)
+            {
+                int ix = (int)buff.GetIndex(MDTable.TypeDef);
+                parIxs[ix - 1] = buff.GetIndex(MDTable.TypeDef);
+            }
+        }
+
+        internal override void Resolve(PEReader buff)
+        {
+            theClass = (ClassDef)buff.GetElement(MDTable.TypeDef, classIx);
+            if (tabIx == MDTable.EventMap)
+            {
+                for (uint i = elemIx; i < endIx; i++)
+                    theClass.AddEvent((Event)buff.GetElement(MDTable.Event, i));
+            }
+            else if (tabIx == MDTable.PropertyMap)
+            {
+                for (uint i = elemIx; i < endIx; i++)
+                    theClass.AddProperty((Property)buff.GetElement(MDTable.Property, i));
+            }
+            else
+            { // must be nested class -- already done
+                //ClassDef parent = (ClassDef)buff.GetElement(MDTable.TypeDef,elemIx);
+                //parent.MakeNested(theClass);
+            }
+        }
+
+        internal static uint Size(MetaData md, MDTable tabIx)
+        {
+            return md.TableIndexSize(MDTable.TypeDef) + md.TableIndexSize(tabIx);
+        }
+
+        internal override uint SortKey()
+        {
+            return theClass.Row;
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(tabIx, this);
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.WriteIndex(MDTable.TypeDef, theClass.Row);
+            if (parent != null)
+                output.WriteIndex(MDTable.TypeDef, parent.Row);
+            else
+                output.WriteIndex(tabIx, elemIx);
+        }
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for an overriding method (.override)
+    /// </summary>
+    public class MethodImpl : MetaDataElement
+    {
+        ClassDef parent;
+        Method header, body;
+        uint classIx = 0, methBodyIx = 0, methDeclIx = 0;
+        bool resolved = true;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal MethodImpl(ClassDef par, Method decl, Method bod)
+        {
+            parent = par;
+            header = decl;
+            body = bod;
+            tabIx = MDTable.MethodImpl;
+        }
+
+        internal MethodImpl(PEReader buff, ClassDef par, uint bIx, uint dIx)
+        {
+            buffer = buff;
+            parent = par;
+            methBodyIx = bIx;
+            methDeclIx = dIx;
+            tabIx = MDTable.MethodImpl;
+            resolved = false;
+        }
+
+        internal MethodImpl(PEReader buff)
+        {
+            classIx = buff.GetIndex(MDTable.TypeDef);
+            methBodyIx = buff.GetCodedIndex(CIx.MethodDefOrRef);
+            methDeclIx = buff.GetCodedIndex(CIx.MethodDefOrRef);
+            tabIx = MDTable.MethodImpl;
+        }
+
+        /*internal static MethodImpl[] GetMethodImpls(PEReader buff, ClassDef paren, uint classIx) {
+          buff.SetElementPosition(MDTable.MethodImpl,0);
+          ArrayList impls = new ArrayList();
+          for (int i=0; i < buff.GetTableSize(MDTable.MethodImpl); i++) {
+            uint cIx = buff.GetIndex(MDTable.TypeDef);
+            uint bIx = buff.GetCodedIndex(CIx.MethodDefOrRef);
+            uint dIx = buff.GetCodedIndex(CIx.MethodDefOrRef);
+            if (cIx == classIx) 
+              paren.AddMethodOverride(new MethodImpl(buff,paren,bIx,dIx));
+          }
+          return (MethodImpl[])impls.ToArray(typeof(MethodImpl));
+        }
+        */
+
+        public Method Body
+        {
+            get
+            {
+                if ((body == null) && (methBodyIx != 0))
+                    body = (Method)buffer.GetCodedElement(CIx.MethodDefOrRef, methBodyIx);
+                return body;
+            }
+            set
+            {
+                body = value;
+                if ((!resolved) && (header != null)) resolved = true;
+            }
+        }
+
+        public Method Header
+        {
+            get
+            {
+                if ((header == null) && (methDeclIx != 0))
+                    header = (Method)buffer.GetCodedElement(CIx.MethodDefOrRef, methDeclIx);
+                return header;
+            }
+            set
+            {
+                header = value;
+                if ((!resolved) && (body != null)) resolved = true;
+            }
+        }
+
+        internal void SetOwner(ClassDef cl)
+        {
+            parent = cl;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] impls)
+        {
+            for (int i = 0; i < impls.Length; i++)
+                impls[i] = new MethodImpl(buff);
+        }
+
+        internal override void Resolve(PEReader buff)
+        {
+            body = (Method)buff.GetCodedElement(CIx.MethodDefOrRef, methBodyIx);
+            header = (Method)buff.GetCodedElement(CIx.MethodDefOrRef, methDeclIx);
+            parent = (ClassDef)buff.GetElement(MDTable.TypeDef, classIx);
+            parent.AddMethodImpl(this);
+            resolved = true;
+        }
+
+        internal void ResolveMethDetails()
+        {
+            body = (Method)buffer.GetCodedElement(CIx.MethodDefOrRef, methBodyIx);
+            header = (Method)buffer.GetCodedElement(CIx.MethodDefOrRef, methDeclIx);
+            resolved = true;
+        }
+
+        internal void ChangeRefsToDefs(ClassDef newType, ClassDef[] oldTypes)
+        {
+            throw new NotYetImplementedException("Merge for MethodImpls");
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.MethodImpl, this);
+            if (!resolved) ResolveMethDetails();
+            if (body is MethodRef) body.BuildMDTables(md);
+            if (header is MethodRef) header.BuildMDTables(md);
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return md.TableIndexSize(MDTable.TypeDef) + 2 * md.CodedIndexSize(CIx.MethodDefOrRef);
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.WriteIndex(MDTable.TypeDef, parent.Row);
+            output.WriteCodedIndex(CIx.MethodDefOrRef, body);
+            output.WriteCodedIndex(CIx.MethodDefOrRef, header);
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for Property and Event methods
+    /// </summary>
+    public class MethodSemantics : MetaDataElement
+    {
+        MethodType type;
+        MethodDef meth;
+        Feature eventOrProp;
+        uint methIx = 0, assocIx = 0;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal MethodSemantics(MethodType mType, MethodDef method, Feature feature)
+        {
+            type = mType;
+            meth = method;
+            eventOrProp = feature;
+            sortTable = true;
+            tabIx = MDTable.MethodSemantics;
+        }
+
+        internal MethodSemantics(PEReader buff)
+        {
+            type = (MethodType)buff.ReadUInt16();
+            methIx = buff.GetIndex(MDTable.Method);
+            assocIx = buff.GetCodedIndex(CIx.HasSemantics);
+            sortTable = true;
+            tabIx = MDTable.MethodSemantics;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] methSems)
+        {
+            for (int i = 0; i < methSems.Length; i++)
+                methSems[i] = new MethodSemantics(buff);
+        }
+
+        internal override void Resolve(PEReader buff)
+        {
+            meth = (MethodDef)buff.GetElement(MDTable.Method, methIx);
+            eventOrProp = (Feature)buff.GetCodedElement(CIx.HasSemantics, assocIx);
+            eventOrProp.AddMethod(this);
+        }
+
+        internal MethodType GetMethodType() { return type; }
+
+        internal MethodDef GetMethod() { return meth; }
+
+        internal override uint SortKey()
+        {
+            return meth.Row;
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.MethodSemantics, this);
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return 2 + md.TableIndexSize(MDTable.Method) + md.CodedIndexSize(CIx.HasSemantics);
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.Write((ushort)type);
+            output.WriteIndex(MDTable.Method, meth.Row);
+            output.WriteCodedIndex(CIx.HasSemantics, eventOrProp);
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a parameter of a method defined in this assembly/module
+    /// </summary>
+    public class Param : MetaDataElement
+    {
+        private static readonly ushort hasDefault = 0x1000;
+        private static readonly ushort noDefault = 0xEFFF;
+        private static readonly ushort hasFieldMarshal = 0x2000;
+        private static readonly ushort noFieldMarshal = 0xDFFF;
+
+        protected string pName;
+        protected uint nameIx = 0;
+        Type pType;
+        internal ushort seqNo = 0;
+        ushort parMode;
+        Constant defaultVal;
+        NativeType marshalType;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        /// <summary>
+        /// Create a new parameter for a method
+        /// </summary>
+        /// <param name="mode">param mode (in, out, opt)</param>
+        /// <param name="parName">parameter name</param>
+        /// <param name="parType">parameter type</param>
+        public Param(ParamAttr mode, string parName, Type parType)
+        {
+            pName = parName;
+            pType = parType;
+            parMode = (ushort)mode;
+            tabIx = MDTable.Param;
+        }
+
+        // EXPERIMENTAL kjg Nov 19 2007
+        public static Param DefaultParam()
+        {
+            return new Param(ParamAttr.Default, "", null);
+        }
+
+        internal Param(PEReader buff)
+        {
+            parMode = buff.ReadUInt16();
+            seqNo = buff.ReadUInt16();
+            pName = buff.GetString();
+            tabIx = MDTable.Param;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] pars)
+        {
+            for (int i = 0; i < pars.Length; i++)
+                pars[i] = new Param(buff);
+        }
+
+        internal void Resolve(PEReader buff, uint fIx, Type type)
+        {
+            this.pType = type;
+        }
+
+        /// <summary>
+        /// Add a default value to this parameter
+        /// </summary>
+        /// <param name="cVal">the default value for the parameter</param>
+        public void AddDefaultValue(Constant cVal)
+        {
+            defaultVal = cVal;
+            parMode |= hasDefault;
+        }
+
+        /// <summary>
+        /// Get the default constant value for this parameter
+        /// </summary>
+        /// <returns></returns>
+        public Constant GetDefaultValue() { return defaultVal; }
+
+        /// <summary>
+        /// Remove the default constant value for this parameter
+        /// </summary>
+        public void RemoveDefaultValue() { defaultVal = null; parMode &= noDefault; }
+
+        /// <summary>
+        /// Add marshalling information about this parameter
+        /// </summary>
+        public void SetMarshalType(NativeType mType)
+        {
+            marshalType = mType;
+            parMode |= hasFieldMarshal;
+        }
+        /// <summary>
+        /// Get the parameter marshalling information
+        /// </summary>
+        /// <returns>The native type to marshall to</returns>
+        public NativeType GetMarshalType() { return marshalType; }
+
+        /// <summary>
+        /// Remove any marshalling information for this parameter
+        /// </summary>
+        public void RemoveMashalType() { marshalType = null; parMode &= noFieldMarshal; }
+
+        /// <summary>
+        /// Get the type of this parameter
+        /// </summary>
+        public Type GetParType() { return pType; }
+
+        /// <summary>
+        /// Set the type of this parameter
+        /// </summary>
+        public void SetParType(Type parType) { pType = parType; }
+
+        public void AddAttribute(ParamAttr att)
+        {
+            this.parMode |= (ushort)att;
+        }
+
+        public ParamAttr GetAttributes() { return (ParamAttr)parMode; }
+
+        public void SetAttributes(ParamAttr att)
+        {
+            this.parMode = (ushort)att;
+        }
+
+        /// <summary>
+        /// Retrieve the name of this parameter
+        /// </summary>
+        /// <returns>parameter name</returns>
+        public string GetName() { return pName; }
+
+        /// <summary>
+        /// Set the name of this parameter
+        /// </summary>
+        /// <param name="nam">parameter name</param>
+        public void SetName(string nam) { pName = nam; }
+
+        /*------------------------ internal functions ----------------------------*/
+
+        internal Param Copy(Type paramType)
+        {
+            return new Param((ParamAttr)parMode, pName, paramType);
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.Param, this);
+            nameIx = md.AddToStringsHeap(pName);
+            if (defaultVal != null)
+            {
+                ConstantElem constElem = new ConstantElem(this, defaultVal);
+                constElem.BuildMDTables(md);
+            }
+            if (marshalType != null)
+            {
+                FieldMarshal marshalInfo = new FieldMarshal(this, marshalType);
+                marshalInfo.BuildMDTables(md);
+            }
+        }
+
+        internal override void BuildCILInfo(CILWriter output)
+        {
+            pType.BuildCILInfo(output);
+        }
+
+        internal void TypeSig(MemoryStream str)
+        {
+            pType.TypeSig(str);
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return 4 + md.StringsIndexSize();
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.Write(parMode);
+            output.Write(seqNo);
+            output.StringsIndex(nameIx);
+        }
+
+        internal override void Write(CILWriter output)
+        {
+            pType.WriteType(output);
+            output.Write(" " + pName);
+        }
+
+
+        internal sealed override uint GetCodedIx(CIx code)
+        {
+            switch (code)
+            {
+                case (CIx.HasCustomAttr): return 4;
+                case (CIx.HasConstant): return 1;
+                case (CIx.HasFieldMarshal): return 1;
+            }
+            return 0;
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Summary description for ConstantElem.
+    /// </summary>
+    internal class ConstantElem : MetaDataElement
+    {
+        MetaDataElement parent;
+        Constant cValue;
+        uint valIx = 0, parentIx = 0;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal ConstantElem(MetaDataElement parent, Constant val)
+        {
+            this.parent = parent;
+            cValue = val;
+            sortTable = true;
+            tabIx = MDTable.Constant;
+        }
+
+        internal ConstantElem(PEReader buff)
+        {
+            byte constType = buff.ReadByte();
+            byte pad = buff.ReadByte();
+            parentIx = buff.GetCodedIndex(CIx.HasConstant);
+            //valIx = buff.GetBlobIx();
+            cValue = buff.GetBlobConst(constType);
+            sortTable = true;
+            tabIx = MDTable.Constant;
+        }
+
+        internal override void Resolve(PEReader buff)
+        {
+            parent = buff.GetCodedElement(CIx.HasConstant, parentIx);
+            if (parent != null)
+            {
+                if (parent is Param) ((Param)parent).AddDefaultValue(cValue);
+                else if (parent is FieldDef) ((FieldDef)parent).AddValue(cValue);
+                else ((Property)parent).AddInitValue(cValue);
+            }
+        }
+
+        internal static void Read(PEReader buff, TableRow[] consts)
+        {
+            for (int i = 0; i < consts.Length; i++)
+                consts[i] = new ConstantElem(buff);
+        }
+
+        /*----------------------------- internal functions ------------------------------*/
+
+        internal override uint SortKey()
+        {
+            return (parent.Row << MetaData.CIxShiftMap[(uint)CIx.HasConstant])
+                | parent.GetCodedIx(CIx.HasConstant);
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.Constant, this);
+            valIx = cValue.GetBlobIndex(md);
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return 2 + md.CodedIndexSize(CIx.HasConstant) + md.BlobIndexSize();
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.Write(cValue.GetTypeIndex());
+            output.Write((byte)0);
+            output.WriteCodedIndex(CIx.HasConstant, parent);
+            output.BlobIndex(valIx);
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for security permissions for a class or a method NOT YET IMPLEMENTED
+    /// </summary>
+    public class DeclSecurity : MetaDataElement
+    {
+        SecurityAction action;
+        MetaDataElement parent;
+        uint parentIx = 0, permissionIx;
+        byte[] permissionSet;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal DeclSecurity(MetaDataElement paren, SecurityAction act, byte[] perSet)
+        {
+            parent = paren;
+            action = act;
+            permissionSet = perSet;
+            sortTable = true;
+            tabIx = MDTable.DeclSecurity;
+        }
+
+        internal DeclSecurity(PEReader buff)
+        {
+            action = (SecurityAction)buff.ReadUInt16();
+            parentIx = buff.GetCodedIndex(CIx.HasDeclSecurity);
+            permissionSet = buff.GetBlob();
+            sortTable = true;
+            tabIx = MDTable.DeclSecurity;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] secs)
+        {
+            for (int i = 0; i < secs.Length; i++)
+                secs[i] = new DeclSecurity(buff);
+        }
+
+        internal static DeclSecurity FindSecurity(PEReader buff, MetaDataElement paren, uint codedParIx)
+        {
+            buff.SetElementPosition(MDTable.DeclSecurity, 0);
+            for (int i = 0; i < buff.GetTableSize(MDTable.DeclSecurity); i++)
+            {
+                uint act = buff.ReadUInt16();
+                if (buff.GetCodedIndex(CIx.HasDeclSecurity) == codedParIx)
+                    return new DeclSecurity(paren, (SecurityAction)act, buff.GetBlob());
+                uint junk = buff.GetBlobIx();
+            }
+            return null;
+        }
+
+        internal override void Resolve(PEReader buff)
+        {
+            parent = buff.GetCodedElement(CIx.HasDeclSecurity, parentIx);
+            if (parent != null)
+            {
+                if (parent is ClassDef) ((ClassDef)parent).AddSecurity(this);
+                if (parent is Assembly) ((Assembly)parent).AddSecurity(this);
+                if (parent is MethodDef) ((MethodDef)parent).AddSecurity(this);
+            }
+        }
+
+        internal override uint SortKey()
+        {
+            return (parent.Row << MetaData.CIxShiftMap[(uint)CIx.HasDeclSecurity])
+                | parent.GetCodedIx(CIx.HasDeclSecurity);
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.DeclSecurity, this);
+            permissionIx = md.AddToBlobHeap(permissionSet);
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return 2 + md.CodedIndexSize(CIx.HasDeclSecurity) + md.BlobIndexSize();
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.Write((UInt16)action);   // or should this be 2 bytes??
+            output.WriteCodedIndex(CIx.HasDeclSecurity, parent);
+            output.BlobIndex(permissionIx);
+        }
+
+    }
+}

PERWAPI/MDExternClassElem.cs

@@ -0,0 +1,130 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Security.Cryptography;
+
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a class defined in another module of THIS assembly 
+    /// and exported (.class extern)
+    /// </summary>
+    internal class ExternClass : MetaDataElement
+    {
+        MetaDataElement implementation;
+        uint flags, typeDefId = 0;
+        uint implIx = 0, nameIx = 0, nameSpaceIx = 0;
+        string nameSpace, name;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal ExternClass(TypeAttr attr, string ns, string name, MetaDataElement paren)
+        {
+            flags = (uint)attr;
+            nameSpace = ns;
+            this.name = name;
+            implementation = paren;
+            tabIx = MDTable.ExportedType;
+        }
+
+        public ExternClass(PEReader buff)
+        {
+            flags = buff.ReadUInt32();
+            typeDefId = buff.ReadUInt32();
+            name = buff.GetString();
+            nameSpace = buff.GetString();
+            implIx = buff.GetCodedIndex(CIx.Implementation);
+            tabIx = MDTable.ExportedType;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] eClasses)
+        {
+            for (int i = 0; i < eClasses.Length; i++)
+                eClasses[i] = new ExternClass(buff);
+        }
+
+        internal static void GetClassRefs(PEReader buff, TableRow[] eClasses)
+        {
+            for (uint i = 0; i < eClasses.Length; i++)
+            {
+                uint junk = buff.ReadUInt32();
+                junk = buff.ReadUInt32();
+                string name = buff.GetString();
+                string nameSpace = buff.GetString();
+                uint implIx = buff.GetCodedIndex(CIx.Implementation);
+                eClasses[i] = new ClassRef(implIx, nameSpace, name);
+                eClasses[i].Row = i + 1;
+            }
+        }
+
+        internal override void Resolve(PEReader buff)
+        {
+            implementation = buff.GetCodedElement(CIx.Implementation, implIx);
+            while (implementation is ExternClass)
+                implementation = ((ExternClass)implementation).implementation;
+            ((ModuleFile)implementation).fileModule.AddExternClass(this);
+        }
+
+        internal string NameSpace() { return nameSpace; }
+        internal string Name() { return name; }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.ExportedType, this);
+            nameSpaceIx = md.AddToStringsHeap(nameSpace);
+            nameIx = md.AddToStringsHeap(name);
+            if (implementation is ModuleRef)
+            {
+                ModuleFile mFile = ((ModuleRef)implementation).modFile;
+                mFile.BuildMDTables(md);
+                implementation = mFile;
+            }
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return 8 + 2 * md.StringsIndexSize() + md.CodedIndexSize(CIx.Implementation);
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.Write(flags);
+            output.Write(0);
+            output.StringsIndex(nameIx);
+            output.StringsIndex(nameSpaceIx);
+            output.WriteCodedIndex(CIx.Implementation, implementation);
+        }
+
+        internal sealed override uint GetCodedIx(CIx code)
+        {
+            switch (code)
+            {
+                case (CIx.HasCustomAttr): return 17;
+                case (CIx.Implementation): return 2;
+            }
+            return 0;
+        }
+
+    }
+
+
+}

PERWAPI/MDFeatureElems.cs

@@ -0,0 +1,418 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Security.Cryptography;
+
+
+namespace QUT.PERWAPI
+{
+
+    /**************************************************************************/
+    /// <summary>
+    /// Base class for Event and Property descriptors
+    /// </summary>
+    public abstract class Feature : MetaDataElement
+    {
+        private static readonly int INITSIZE = 5;
+        private static readonly ushort specialName = 0x200;
+        private static readonly ushort rtsSpecialName = 0x400;
+        private static readonly ushort noSpecialName = 0xFDFF;
+        private static readonly ushort noRTSSpecialName = 0xFBFF;
+
+        protected ClassDef parent;
+        protected ushort flags = 0;
+        protected string name;
+        protected int tide = 0;
+        protected uint nameIx;
+        protected MethodSemantics[] methods = new MethodSemantics[INITSIZE];
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal Feature(string name, ClassDef par)
+        {
+            parent = par;
+            this.name = name;
+        }
+
+        internal Feature() { }
+
+        internal static string[] GetFeatureNames(PEReader buff, MDTable tabIx, MDTable mapTabIx,
+            ClassDef theClass, uint classIx)
+        {
+            buff.SetElementPosition(mapTabIx, 0);
+            uint start = 0, end = 0, i = 0;
+            for (; (i < buff.GetTableSize(tabIx)) && (start == 0); i++)
+            {
+                if (buff.GetIndex(MDTable.TypeDef) == classIx)
+                {
+                    start = buff.GetIndex(tabIx);
+                }
+            }
+            if (start == 0) return null;
+            if (i < buff.GetTableSize(mapTabIx))
+            {
+                uint junk = buff.GetIndex(MDTable.TypeDef);
+                end = buff.GetIndex(tabIx);
+            }
+            else
+                end = buff.GetTableSize(tabIx);
+            if (tabIx == MDTable.Event)
+                theClass.eventIx = start;
+            else
+                theClass.propIx = start;
+            string[] names = new string[end - start];
+            buff.SetElementPosition(tabIx, start);
+            for (i = start; i < end; i++)
+            {
+                uint junk = buff.ReadUInt16();
+                names[i] = buff.GetString();
+                if (tabIx == MDTable.Event)
+                    junk = buff.GetCodedIndex(CIx.TypeDefOrRef);
+                else
+                    junk = buff.GetBlobIx();
+            }
+            return names;
+        }
+
+
+        /*------------------------- public set and get methods --------------------------*/
+
+        /// <summary>
+        /// Set the specialName attribute for this Event or Property
+        /// </summary>
+        public void SetSpecialName() { flags |= specialName; }
+        public bool HasSpecialName() { return (flags & specialName) != 0; }
+        public void ClearSpecialName() { flags &= noSpecialName; }
+
+        /// <summary>
+        /// Set the RTSpecialName attribute for this Event or Property
+        /// </summary>
+        public void SetRTSpecialName() { flags |= rtsSpecialName; }
+        public bool HasRTSSpecialName() { return (flags & rtsSpecialName) != 0; }
+        public void ClearRTSSpecialName() { flags &= noRTSSpecialName; }
+
+        public string Name() { return name; }
+        public void SetName(string nam) { name = nam; }
+
+        internal void AddMethod(MethodSemantics meth)
+        {
+            if (tide == methods.Length)
+            {
+                MethodSemantics[] mTmp = methods;
+                methods = new MethodSemantics[tide * 2];
+                for (int i = 0; i < tide; i++)
+                {
+                    methods[i] = mTmp[i];
+                }
+            }
+            methods[tide++] = meth;
+        }
+
+        public void AddMethod(MethodDef meth, MethodType mType)
+        {
+            AddMethod(new MethodSemantics(mType, meth, this));
+        }
+
+        public MethodDef GetMethod(MethodType mType)
+        {
+            for (int i = 0; i < tide; i++)
+            {
+                if (methods[i].GetMethodType() == mType)
+                    return methods[i].GetMethod();
+            }
+            return null;
+        }
+
+        public void RemoveMethod(MethodDef meth)
+        {
+            bool found = false;
+            for (int i = 0; i < tide; i++)
+            {
+                if (found)
+                    methods[i - 1] = methods[i];
+                else if (methods[i].GetMethod() == meth)
+                    found = true;
+            }
+        }
+
+        public void RemoveMethod(MethodType mType)
+        {
+            bool found = false;
+            for (int i = 0; i < tide; i++)
+            {
+                if (found)
+                    methods[i - 1] = methods[i];
+                else if (methods[i].GetMethodType() == mType)
+                    found = true;
+            }
+        }
+
+        internal void SetParent(ClassDef paren)
+        {
+            parent = paren;
+        }
+
+        internal ClassDef GetParent()
+        {
+            return parent;
+        }
+    }
+
+    /*****************************************************************************/
+    /// <summary>
+    /// Descriptor for an event
+    /// </summary>
+    public class Event : Feature
+    {
+        Type eventType;
+        uint typeIx = 0;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal Event(string name, Type eType, ClassDef parent)
+            : base(name, parent)
+        {
+            eventType = eType;
+            tabIx = MDTable.Event;
+        }
+
+        internal Event(PEReader buff)
+        {
+            flags = buff.ReadUInt16();
+            name = buff.GetString();
+            typeIx = buff.GetCodedIndex(CIx.TypeDefOrRef);
+            tabIx = MDTable.Event;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] events)
+        {
+            for (int i = 0; i < events.Length; i++)
+                events[i] = new Event(buff);
+        }
+
+        internal static string[] ReadNames(PEReader buff, ClassDef theClass, uint classIx)
+        {
+            return Feature.GetFeatureNames(buff, MDTable.Event, MDTable.EventMap, theClass, classIx);
+        }
+
+        internal override void Resolve(PEReader buff)
+        {
+            eventType = (Type)buff.GetCodedElement(CIx.TypeDefOrRef, typeIx);
+        }
+
+        /*------------------------- public set and get methods --------------------------*/
+
+        public Type GetEventType() { return eventType; }
+
+        /*----------------------------- internal functions ------------------------------*/
+
+        internal void ChangeRefsToDefs(ClassDef newType, ClassDef[] oldTypes)
+        {
+            throw new NotYetImplementedException("Merge for Events");
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.Event, this);
+            nameIx = md.AddToStringsHeap(name);
+            eventType.BuildMDTables(md);
+            for (int i = 0; i < tide; i++)
+            {
+                methods[i].BuildMDTables(md);
+            }
+        }
+
+        internal override void BuildCILInfo(CILWriter output)
+        {
+            eventType.BuildCILInfo(output);
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return 2 + md.StringsIndexSize() + md.CodedIndexSize(CIx.TypeDefOrRef);
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.Write(flags);
+            output.StringsIndex(nameIx);
+            output.WriteCodedIndex(CIx.TypeDefOrRef, eventType);
+        }
+
+        internal override void Write(CILWriter output)
+        {
+            throw new NotYetImplementedException("Write CIL for event");
+        }
+
+        internal sealed override uint GetCodedIx(CIx code)
+        {
+            switch (code)
+            {
+                case (CIx.HasCustomAttr): return 10;
+                case (CIx.HasSemantics): return 0;
+            }
+            return 0;
+        }
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for the Property of a class
+    /// </summary>
+    public class Property : Feature
+    {
+        internal static readonly byte PropertyTag = 0x8;
+        Constant constVal;
+        uint typeBlobIx = 0;
+        Type[] parList;
+        Type returnType;
+        uint numPars = 0;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal Property(string name, Type retType, Type[] pars, ClassDef parent)
+            : base(name, parent)
+        {
+            returnType = retType;
+            parList = pars;
+            if (pars != null) numPars = (uint)pars.Length;
+            tabIx = MDTable.Property;
+        }
+
+        internal Property(PEReader buff)
+        {
+            flags = buff.ReadUInt16();
+            name = buff.GetString();
+            typeBlobIx = buff.GetBlobIx();
+            tabIx = MDTable.Property;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] props)
+        {
+            for (int i = 0; i < props.Length; i++)
+                props[i] = new Property(buff);
+        }
+
+        internal static string[] ReadNames(PEReader buff, ClassDef theClass, uint classIx)
+        {
+            return Feature.GetFeatureNames(buff, MDTable.Property, MDTable.PropertyMap, theClass, classIx);
+        }
+
+        internal sealed override void Resolve(PEReader buff)
+        {
+            buff.ReadPropertySig(typeBlobIx, this);
+        }
+
+        /// <summary>
+        /// Add an initial value for this property
+        /// </summary>
+        /// <param name="constVal">the initial value for this property</param>
+        public void AddInitValue(Constant constVal)
+        {
+            this.constVal = constVal;
+        }
+        public Constant GetInitValue() { return constVal; }
+        public void RemoveInitValue() { constVal = null; }
+
+
+        public Type GetPropertyType() { return returnType; }
+        public void SetPropertyType(Type pType) { returnType = pType; }
+        public Type[] GetPropertyParams() { return parList; }
+        public void SetPropertyParams(Type[] parTypes)
+        {
+            parList = parTypes;
+            if (parList != null) numPars = (uint)parList.Length;
+        }
+
+
+        internal void ChangeRefsToDefs(ClassDef newType, ClassDef[] oldTypes)
+        {
+            throw new NotYetImplementedException("Merge for Properties");
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.Property, this);
+            nameIx = md.AddToStringsHeap(name);
+            for (int i = 0; i < numPars; i++)
+                parList[i].BuildMDTables(md);
+            for (int i = 0; i < tide; i++)
+                methods[i].BuildMDTables(md);
+            if (constVal != null)
+            {
+                ConstantElem constElem = new ConstantElem(this, constVal);
+                constElem.BuildMDTables(md);
+            }
+        }
+
+        internal sealed override void BuildSignatures(MetaDataOut md)
+        {
+            MemoryStream sig = new MemoryStream();
+            sig.WriteByte(PropertyTag);
+            MetaDataOut.CompressNum(BlobUtil.CompressUInt(numPars), sig);
+            returnType.TypeSig(sig);
+            for (int i = 0; i < numPars; i++)
+            {
+                parList[i].BuildSignatures(md);
+                parList[i].TypeSig(sig);
+            }
+            typeBlobIx = md.AddToBlobHeap(sig.ToArray());
+            done = false;
+        }
+
+        internal override void BuildCILInfo(CILWriter output)
+        {
+            returnType.BuildCILInfo(output);
+            for (int i = 0; i < numPars; i++)
+            {
+                parList[i].BuildCILInfo(output);
+            }
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return 2 + md.StringsIndexSize() + md.BlobIndexSize();
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.Write(flags);
+            output.StringsIndex(nameIx);
+            output.BlobIndex(typeBlobIx);
+        }
+
+        internal override void Write(CILWriter output)
+        {
+            throw new NotYetImplementedException("Write CIL for property");
+        }
+
+        internal sealed override uint GetCodedIx(CIx code)
+        {
+            switch (code)
+            {
+                case (CIx.HasCustomAttr): return 9;
+                case (CIx.HasConstant): return 2;
+                case (CIx.HasSemantics): return 1;
+            }
+            return 0;
+        }
+
+    }
+}

PERWAPI/MDFieldElems.cs

@@ -0,0 +1,591 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Security.Cryptography;
+
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a field of a class
+    /// </summary>
+    public abstract class Field : Member
+    {
+        internal static readonly byte FieldTag = 0x6;
+
+        protected Type type;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal Field(string pfName, Type pfType, Class paren)
+            : base(pfName, paren)
+        {
+            type = pfType;
+        }
+
+        internal override void Resolve(PEReader buff)
+        {
+            if (type == null)
+            {
+                buff.currentClassScope = parent;
+                type = buff.GetFieldType(sigIx);
+                buff.currentClassScope = null;
+            }
+        }
+
+        /*------------------------- public set and get methods --------------------------*/
+
+        /// <summary>
+        /// Get the type of this field
+        /// </summary>
+        /// <returns>Type descriptor for this field</returns>
+        public Type GetFieldType() { return type; }
+
+        /// <summary>
+        /// Set the type of this field
+        /// </summary>
+        /// <param name="ty">The type of the field</param>
+        public void SetFieldType(Type ty) { type = ty; }
+
+        /*----------------------------- internal functions ------------------------------*/
+
+        internal sealed override void BuildSignatures(MetaDataOut md)
+        {
+            MemoryStream sig = new MemoryStream();
+            sig.WriteByte(FieldTag);
+            type.TypeSig(sig);
+            sigIx = md.AddToBlobHeap(sig.ToArray());
+            done = false;
+        }
+
+        internal override string NameString()
+        {
+            return parent.NameString() + "." + name;
+        }
+
+        internal override void WriteType(CILWriter output)
+        {
+            type.WriteType(output);
+            output.Write(" ");
+            parent.WriteName(output);
+            output.Write("::" + name);
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a field defined in a class of an assembly/module
+    /// </summary>
+    public class FieldDef : Field
+    {
+        //private static readonly uint PInvokeImpl = 0x2000;
+        private static readonly ushort HasFieldMarshal = 0x1000;
+        private static readonly ushort HasFieldRVA = 0x100;
+        private static readonly ushort HasDefault = 0x8000;
+        private static readonly ushort NoFieldMarshal = 0xEFFF;
+        private static readonly ushort NoFieldRVA = 0xFEFF;
+        private static readonly ushort NoDefault = 0x7FFF;
+
+        internal FieldRef refOf;
+        DataConstant initVal;
+        Constant constVal;
+        NativeType marshalType;
+        ushort flags;
+        bool hasOffset = false;
+        uint offset;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal FieldDef(string name, Type fType, ClassDef paren)
+            : base(name, fType, paren)
+        {
+            tabIx = MDTable.Field;
+        }
+
+        internal FieldDef(FieldAttr attrSet, string name, Type fType, ClassDef paren)
+            : base(name, fType, paren)
+        {
+            flags = (ushort)attrSet;
+            tabIx = MDTable.Field;
+        }
+
+        internal FieldDef(FieldAttr attrSet, string name, Type fType, ClassSpec paren)
+            : base(name, fType, paren)
+        {
+            flags = (ushort)attrSet;
+            tabIx = MDTable.Field;
+        }
+
+        internal FieldDef(PEReader buff)
+            : base(null, null, null)
+        {
+            flags = buff.ReadUInt16();
+            name = buff.GetString();
+            sigIx = buff.GetBlobIx();
+            tabIx = MDTable.Field;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] fields)
+        {
+            for (int i = 0; i < fields.Length; i++)
+                fields[i] = new FieldDef(buff);
+        }
+
+        internal static void GetFieldRefs(PEReader buff, uint num, ClassRef parent)
+        {
+            for (int i = 0; i < num; i++)
+            {
+                uint flags = buff.ReadUInt16();
+                string name = buff.GetString();
+                uint sigIx = buff.GetBlobIx();
+                if ((flags & (uint)FieldAttr.Public) == (uint)FieldAttr.Public)
+                {
+                    if (parent.GetField(name) == null)
+                    {
+                        //Console.WriteLine(parent.NameString());
+                        buff.currentClassScope = parent;
+                        FieldRef fRef = new FieldRef(parent, name, buff.GetFieldType(sigIx));
+                        buff.currentClassScope = null;
+                        parent.AddToFieldList(fRef);
+                    }
+                }
+            }
+        }
+
+        internal void Resolve(PEReader buff, uint fIx)
+        {
+            /*
+            if ((flags & HasFieldMarshal) != 0) 
+              marshalType = FieldMarshal.FindMarshalType(buff,this,
+                buff.MakeCodedIndex(CIx.HasFieldMarshal,MDTable.Field,fIx));
+            if ((flags & HasFieldRVA) != 0)
+              initVal = FieldRVA.FindValue(buff,this,fIx);
+            if ((flags & HasDefault) != 0)
+              constVal = ConstantElem.FindConst(buff,this,
+                buff.MakeCodedIndex(CIx.HasConstant,MDTable.Field,fIx));
+            long offs = FieldLayout.FindLayout(buff,this,fIx);
+            if (offs > -1){
+              hasOffset = true;
+              offset = (uint)offs;
+            }
+            */
+            buff.currentClassScope = parent;
+            type = buff.GetFieldType(sigIx);
+            buff.currentClassScope = null;
+        }
+
+        /*------------------------- public set and get methods --------------------------*/
+
+        /// <summary>
+        /// Add an attribute(s) to this field
+        /// </summary>
+        /// <param name="fa">the attribute(s) to be added</param>
+        public void AddFieldAttr(FieldAttr fa)
+        {
+            flags |= (ushort)fa;
+        }
+        public void SetFieldAttr(FieldAttr fa)
+        {
+            flags = (ushort)fa;
+        }
+        public FieldAttr GetFieldAttr()
+        {
+            return (FieldAttr)flags;
+        }
+
+        /// <summary>
+        /// Add a value for this field
+        /// </summary>
+        /// <param name="val">the value for the field</param>
+        public void AddValue(Constant val)
+        {
+            flags |= HasDefault;
+            constVal = val;
+        }
+
+        /// <summary>
+        /// Retrieve the initial value for this field
+        /// </summary>
+        /// <returns>initial value</returns>
+        public Constant GetValue() { return constVal; }
+
+        /// <summary>
+        /// Remove the initial value from this field
+        /// </summary>
+        public void RemoveValue()
+        {
+            constVal = null;
+            flags &= NoDefault;
+        }
+
+        /// <summary>
+        /// Add an initial value for this field (at dataLabel) (.data)
+        /// </summary>
+        /// <param name="val">the value for the field</param>
+        public void AddDataValue(DataConstant val)
+        {
+            flags |= HasFieldRVA;
+            initVal = val;
+        }
+
+        /// <summary>
+        /// Get the value for this data constant
+        /// </summary>
+        /// <returns></returns>
+        public DataConstant GetDataValue()
+        {
+            return initVal;
+        }
+
+        /// <summary>
+        /// Delete the value of this data constant
+        /// </summary>
+        public void RemoveDataValue()
+        {
+            initVal = null;
+            flags &= NoFieldRVA;
+        }
+
+        /// <summary>
+        /// Set the offset of the field.  Used for sequential or explicit classes.
+        /// (.field [offs])
+        /// </summary>
+        /// <param name="offs">field offset</param>
+        public void SetOffset(uint offs)
+        {
+            offset = offs;
+            hasOffset = true;
+        }
+
+        /// <summary>
+        /// Return the offset for this data constant
+        /// </summary>
+        /// <returns></returns>
+        public uint GetOffset() { return offset; }
+
+        /// <summary>
+        /// Delete the offset of this data constant
+        /// </summary>
+        public void RemoveOffset() { hasOffset = false; }
+
+        /// <summary>
+        /// Does this data constant have an offset?
+        /// </summary>
+        public bool HasOffset() { return hasOffset; }
+
+        /// <summary>
+        /// Set the marshalling info for a field
+        /// </summary>
+        /// <param name="mType"></param>
+        public void SetMarshalType(NativeType mType)
+        {
+            flags |= HasFieldMarshal;
+            marshalType = mType;
+        }
+        public NativeType GetMarshalType() { return marshalType; }
+        public void RemoveMarshalType() { marshalType = null; flags &= NoFieldMarshal; }
+
+
+        /// <summary>
+        /// Get the FieldRef equivalent to this FieldDef.  Assumes that
+        /// one already exists.
+        /// </summary>
+        /// <returns>FieldRef for this FieldDef</returns>
+        public FieldRef RefOf() { return refOf; }
+
+        /// <summary>
+        /// Create the FieldRef equivalent to this FieldDef.  If one does not
+        /// exist then create it.
+        /// </summary>
+        /// <returns>FieldRef for this FieldDef</returns>
+        public FieldRef MakeRefOf()
+        {
+            if (refOf != null) return refOf;
+            ClassRef parRef = ((ClassDef)parent).MakeRefOf();
+            refOf = parRef.GetField(name);
+            if (refOf == null)
+            {
+                Type refType;
+                if (type is ClassDef)
+                {
+                    refType = ((ClassDef)type).MakeRefOf();
+                }
+                else
+                {
+                    refType = type;
+                }
+                refOf = new FieldRef(parRef, name, refType);
+                refOf.defOf = this;
+            }
+            return refOf;
+        }
+
+        /*------------------------- internal functions --------------------------*/
+
+        internal PEFile GetScope()
+        {
+            return ((ClassDef)parent).GetScope();
+        }
+
+        internal void ChangeRefsToDefs(ClassDef newPar, ClassDef[] oldTypes)
+        {
+            parent = newPar;
+            bool changeType = false;
+            for (int i = 0; i < oldTypes.Length && !changeType; i++)
+            {
+                if (type == oldTypes[i])
+                    type = newPar;
+            }
+        }
+
+        internal override bool isDef() { return true; }
+
+        internal void SetParent(ClassDef paren) { parent = paren; }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.Field, this);
+            nameIx = md.AddToStringsHeap(name);
+            if (!type.isDef()) type.BuildMDTables(md);
+            if (initVal != null)
+            {
+                FieldRVA rva = new FieldRVA(this, initVal);
+                rva.BuildMDTables(md);
+            }
+            if (constVal != null)
+            {
+                ConstantElem constElem = new ConstantElem(this, constVal);
+                constElem.BuildMDTables(md);
+            }
+            if (hasOffset)
+            {
+                FieldLayout layout = new FieldLayout(this, offset);
+                layout.BuildMDTables(md);
+            }
+            if (marshalType != null)
+            {
+                FieldMarshal marshalInfo = new FieldMarshal(this, marshalType);
+                marshalInfo.BuildMDTables(md);
+            }
+        }
+
+        internal sealed override void BuildCILInfo(CILWriter output)
+        {
+            if (!type.isDef()) type.BuildCILInfo(output);
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return 2 + md.StringsIndexSize() + md.BlobIndexSize();
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.Write(flags);
+            output.StringsIndex(nameIx);
+            output.BlobIndex(sigIx);
+        }
+
+        internal override void Write(CILWriter output)
+        {
+            output.Write("  .field ");
+            if (hasOffset)
+            {
+                output.Write("[ {0} ] ", offset);
+            }
+            WriteFlags(output, flags);
+            if (marshalType != null)
+            {
+                output.Write("marshal ");
+                marshalType.Write(output);
+            }
+            type.WriteType(output);
+            output.Write(" " + name);
+            if (initVal != null)
+            {
+                initVal.Write(output);
+            }
+            else if (constVal != null)
+            {
+                constVal.Write(output);
+            }
+            output.WriteLine();
+        }
+
+        internal sealed override uint GetCodedIx(CIx code)
+        {
+            switch (code)
+            {
+                case (CIx.HasConstant): return 0;
+                case (CIx.HasCustomAttr): return 1;
+                case (CIx.HasFieldMarshal): return 0;
+                case (CIx.MemberForwarded): return 0;
+            }
+            return 0;
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a field of a class defined in another assembly/module
+    /// </summary>
+    public class FieldRef : Field
+    {
+        internal FieldDef defOf;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal FieldRef(Class paren, string name, Type fType)
+            : base(name, fType, paren)
+        {
+            parent = paren;
+        }
+
+        internal FieldRef(uint parenIx, string name, uint sigIx)
+            : base(name, null, null)
+        {
+            parentIx = parenIx;
+            this.name = name;
+            this.sigIx = sigIx;
+        }
+
+        internal override Member ResolveParent(PEReader buff)
+        {
+            if (parent != null) return this;
+            MetaDataElement paren = buff.GetCodedElement(CIx.MemberRefParent, parentIx);
+            //Console.WriteLine("parentIx = " + parentIx);
+            //Console.WriteLine("paren = " + paren);
+            if (paren is ClassDef)
+                return ((ClassDef)paren).GetField(this.name);
+            //if (paren is ClassSpec)
+            // paren = ((ClassSpec)paren).GetParent();
+            if (paren is ReferenceScope)
+                parent = ((ReferenceScope)paren).GetDefaultClass();
+            if (paren is TypeSpec)
+                parent = new ConstructedTypeSpec((TypeSpec)paren);
+            else
+                parent = (Class)paren;
+            if (parent != null)
+            {
+                Field existing = (Field)((Class)parent).GetFieldDesc(name);
+                if (existing != null)
+                {
+                    return existing;
+                }
+            }
+            parent.AddToFieldList(this);
+            return this;
+        }
+
+        /*------------------------- internal functions --------------------------*/
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(tabIx, this);
+            nameIx = md.AddToStringsHeap(name);
+            if (type is ClassSpec) md.AddToTable(MDTable.TypeSpec, type);
+            if (!type.isDef())
+                type.BuildMDTables(md);
+            if (parent != null)
+            {
+                if (parent is ClassSpec) md.AddToTable(MDTable.TypeSpec, parent);
+                parent.BuildMDTables(md);
+            }
+        }
+
+        internal override void BuildCILInfo(CILWriter output)
+        {
+            parent.BuildCILInfo(output);
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return md.CodedIndexSize(CIx.MemberRefParent) + md.StringsIndexSize() + md.BlobIndexSize();
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.WriteCodedIndex(CIx.MemberRefParent, parent);
+            output.StringsIndex(nameIx);
+            output.BlobIndex(sigIx);
+        }
+
+        internal sealed override uint GetCodedIx(CIx code) { return 6; }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for layout information for a field
+    /// </summary>
+    public class FieldLayout : MetaDataElement
+    {
+        FieldDef field;
+        uint offset, fieldIx = 0;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal FieldLayout(FieldDef field, uint offset)
+        {
+            this.field = field;
+            this.offset = offset;
+            tabIx = MDTable.FieldLayout;
+        }
+
+        internal FieldLayout(PEReader buff)
+        {
+            offset = buff.ReadUInt32();
+            fieldIx = buff.GetIndex(MDTable.Field);
+            tabIx = MDTable.FieldLayout;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] layouts)
+        {
+            for (int i = 0; i < layouts.Length; i++)
+                layouts[i] = new FieldLayout(buff);
+        }
+
+        internal sealed override void Resolve(PEReader buff)
+        {
+            field = (FieldDef)buff.GetElement(MDTable.Field, fieldIx);
+            field.SetOffset(offset);
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.FieldLayout, this);
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return 4 + md.TableIndexSize(MDTable.Field);
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.Write(offset);
+            output.WriteIndex(MDTable.Field, field.Row);
+        }
+
+    }
+}

PERWAPI/MDFileRefElems.cs

@@ -0,0 +1,157 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Security.Cryptography;
+
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    public abstract class FileRef : MetaDataElement
+    {
+        protected static readonly uint HasMetaData = 0x0;
+        protected static readonly uint HasNoMetaData = 0x1;
+        protected uint nameIx = 0, hashIx = 0;
+        protected byte[] hashBytes;
+        protected string name;
+        protected bool entryPoint = false;
+        protected uint flags;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal FileRef(string name, byte[] hashBytes)
+        {
+            this.hashBytes = hashBytes;
+            this.name = name;
+            tabIx = MDTable.File;
+        }
+
+        internal FileRef(PEReader buff)
+        {
+            flags = buff.ReadUInt32();
+            name = buff.GetString();
+            hashBytes = buff.GetBlob();
+            tabIx = MDTable.File;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] files)
+        {
+            for (int i = 0; i < files.Length; i++)
+            {
+                uint flags = buff.ReadUInt32();
+                if (flags == HasMetaData)
+                    files[i] = new ModuleFile(buff.GetString(), buff.GetBlob());
+                else
+                    files[i] = new ResourceFile(buff.GetString(), buff.GetBlob());
+            }
+        }
+
+        public string Name() { return name; }
+        public byte[] GetHash() { return hashBytes; }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.File, this);
+            nameIx = md.AddToStringsHeap(name);
+            hashIx = md.AddToBlobHeap(hashBytes);
+            if (entryPoint) md.SetEntryPoint(this);
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return 4 + md.StringsIndexSize() + md.BlobIndexSize();
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.Write(flags);
+            output.StringsIndex(nameIx);
+            output.BlobIndex(hashIx);
+        }
+
+        internal sealed override uint GetCodedIx(CIx code)
+        {
+            switch (code)
+            {
+                case (CIx.HasCustomAttr): return 16;
+                case (CIx.Implementation): return 0;
+            }
+            return 0;
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a file referenced in THIS assembly/module (.file)
+    /// </summary>
+    internal class ModuleFile : FileRef
+    {
+        internal ModuleRef fileModule;
+
+        internal ModuleFile(string name, byte[] hashBytes, bool entryPoint)
+            : base(name, hashBytes)
+        {
+            flags = HasMetaData;
+            this.entryPoint = entryPoint;
+        }
+
+        internal ModuleFile(string name, byte[] hashBytes)
+            : base(name, hashBytes)
+        {
+            flags = HasMetaData;
+        }
+
+        internal void SetEntryPoint() { entryPoint = true; }
+
+        internal void SetHash(byte[] hashVal) { hashBytes = hashVal; }
+
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a file containing a managed resource
+    /// </summary>
+    public class ResourceFile : FileRef
+    {
+        static ArrayList files = new ArrayList();
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public ResourceFile(string name, byte[] hashValue)
+            : base(name, hashValue)
+        {
+            flags = HasNoMetaData;
+            files.Add(this);
+        }
+
+        public static ResourceFile GetFile(string name)
+        {
+            for (int i = 0; i < files.Count; i++)
+            {
+                if (((ResourceFile)files[i]).name.Equals(name))
+                    return (ResourceFile)files[i];
+            }
+            return null;
+        }
+
+    }
+}

PERWAPI/MDMethodElems.cs

@@ -0,0 +1,1261 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Security.Cryptography;
+
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    /// <summary>
+    /// Base class for Method Descriptors
+    /// </summary>
+    public abstract class Method : Member
+    {
+        protected MethSig sig;
+        protected ArrayList genericParams;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal Method(string methName, Type rType, Class paren)
+            : base(methName, paren)
+        {
+            sig = new MethSig(methName);
+            sig.retType = rType;
+        }
+
+        internal Method(string name) : base(name) { }
+
+        /// <summary>
+        /// Add calling conventions to this method descriptor
+        /// </summary>
+        /// <param name="cconv"></param>
+        public void AddCallConv(CallConv cconv)
+        {
+            sig.callConv |= cconv;
+        }
+
+        /// <summary>
+        /// Get the calling conventions for this method
+        /// </summary>
+        /// <returns></returns>
+        public CallConv GetCallConv()
+        {
+            return sig.callConv;
+        }
+
+        /// <summary>
+        /// Set the return type
+        /// </summary>
+        /// <param name="retT">type returned</param>
+        internal void AddRetType(Type retT)
+        {
+            System.Diagnostics.Debug.Assert(retT != null);
+            sig.retType = retT;
+        }
+
+        /// <summary>
+        /// Get the method return type
+        /// </summary>
+        /// <returns>method return type</returns>
+        public Type GetRetType()
+        {
+            return sig.retType;
+        }
+
+        /// <summary>
+        /// Get the types of the method parameters
+        /// </summary>
+        /// <returns>list of parameter types</returns>
+        public Type[] GetParTypes()
+        {
+            return sig.parTypes;
+        }
+
+        /// <summary>
+        /// Get the optional parameter types (for varargs)
+        /// </summary>
+        /// <returns>list of vararg types</returns>
+        public Type[] GetOptParTypes()
+        {
+            return sig.optParTypes;
+        }
+
+        public int GetGenericParamCount()
+        {
+            return genericParams == null ? 0 : genericParams.Count;
+        }
+
+        /// <summary>
+        /// Add a generic type to this method
+        /// </summary>
+        /// <param name="name">the name of the generic type</param>
+        /// <returns>the descriptor for the generic type</returns>
+        public GenericParam AddGenericParam(string name)
+        {
+            if (genericParams == null) genericParams = new ArrayList();
+            GenericParam gp = new GenericParam(name, this, genericParams.Count);
+            sig.callConv |= CallConv.Generic;
+            genericParams.Add(gp);
+            sig.numGenPars = (uint)genericParams.Count;
+            return gp;
+        }
+
+        /// <summary>
+        /// Get the descriptor for a generic type 
+        /// </summary>
+        /// <param name="name">the name of the generic type</param>
+        /// <returns>descriptor for generic type "name"</returns>
+        public GenericParam GetGenericParam(string name)
+        {
+            int pos = FindGenericParam(name);
+            if (pos == -1) return null;
+            return (GenericParam)genericParams[pos];
+        }
+
+        public GenericParam GetGenericParam(int ix)
+        {
+            if ((genericParams == null) || (ix >= genericParams.Count)) return null;
+            return (GenericParam)genericParams[ix];
+        }
+
+        public void RemoveGenericParam(string name)
+        {
+            int pos = FindGenericParam(name);
+            if (pos == -1) return;
+            DeleteGenericParam(pos);
+        }
+
+        public void RemoveGenericParam(int ix)
+        {
+            if (genericParams == null) return;
+            if (ix >= genericParams.Count) return;
+            DeleteGenericParam(ix);
+        }
+
+        public MethodSpec Instantiate(Type[] genTypes)
+        {
+            if (genTypes == null) return null;
+            if ((genericParams == null) || (genericParams.Count == 0))
+                throw new Exception("Cannot instantiate non-generic method");
+            if (genTypes.Length != genericParams.Count)
+                throw new Exception("Wrong number of type parameters for instantiation\nNeeded "
+                    + genericParams.Count + " but got " + genTypes.Length);
+            return new MethodSpec(this, genTypes);
+        }
+
+        public GenericParam[] GetGenericParams()
+        {    // KJG June 2005
+            if (genericParams == null) return null;
+            return (GenericParam[])genericParams.ToArray(typeof(GenericParam));
+        }
+
+        /*------------------------- internal functions --------------------------*/
+
+        internal abstract void TypeSig(MemoryStream sig);
+
+        internal bool HasNameAndSig(string name, Type[] sigTypes)
+        {
+            if (this.name != name) return false;
+            return sig.HasSig(sigTypes);
+        }
+
+        internal bool HasNameAndSig(string name, Type[] sigTypes, Type[] optPars)
+        {
+            if (this.name != name) return false;
+            return sig.HasSig(sigTypes, optPars);
+        }
+
+        internal MethSig GetSig() { return sig; }
+
+        internal void SetSig(MethSig sig)
+        {
+            this.sig = sig;
+            this.sig.name = name;
+        }
+
+        internal override string NameString()
+        {
+            return parent.NameString() + sig.NameString();
+        }
+
+        private int FindGenericParam(string name)
+        {
+            if (genericParams == null) return -1;
+            for (int i = 0; i < genericParams.Count; i++)
+            {
+                GenericParam gp = (GenericParam)genericParams[i];
+                if (gp.GetName() == name) return i;
+            }
+            return -1;
+        }
+
+        private void DeleteGenericParam(int pos)
+        {
+            genericParams.RemoveAt(pos);
+            for (int i = pos; i < genericParams.Count; i++)
+            {
+                GenericParam gp = (GenericParam)genericParams[i];
+                gp.Index = (uint)i;
+            }
+        }
+
+        internal void AddGenericParam(GenericParam par)
+        {
+            if (genericParams == null) genericParams = new ArrayList();
+            genericParams.Add(par);
+            //sig.callConv |= CallConv.Generic;
+            //sig.numGenPars = (uint)genericParams.Count;
+        }
+
+        internal ArrayList GenericParams
+        {
+            get { return genericParams; }
+            set { genericParams = value; }
+        }
+
+        internal void SetGenericParams(GenericParam[] pars)
+        {
+            genericParams = new ArrayList(pars);
+            sig.callConv |= CallConv.Generic;
+            sig.numGenPars = (uint)genericParams.Count;
+        }
+
+        internal override void WriteType(CILWriter output)
+        {
+            sig.WriteCallConv(output);
+            sig.retType.WriteType(output);
+            output.Write(" ");
+            parent.WriteName(output);
+            output.Write("::" + name);
+            sig.WriteParTypes(output);
+        }
+
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for an Instantiation of a generic method 
+    /// </summary>
+    public class MethodSpec : Method
+    {
+        Method methParent;
+        uint instIx;
+        Type[] instTypes;
+        internal static byte GENERICINST = 0x0A;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public MethodSpec(Method mParent, Type[] instTypes)
+            : base(null)
+        {
+            this.methParent = mParent;
+            this.instTypes = instTypes;
+            tabIx = MDTable.MethodSpec;
+        }
+
+        internal MethodSpec(PEReader buff)
+            : base(null)
+        {
+            parentIx = buff.GetCodedIndex(CIx.MethodDefOrRef);
+            instIx = buff.GetBlobIx();
+            tabIx = MDTable.MethodSpec;
+            this.unresolved = true;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] specs)
+        {
+            for (int i = 0; i < specs.Length; i++)
+                specs[i] = new MethodSpec(buff);
+        }
+
+        internal override void Resolve(PEReader buff)
+        {
+            methParent = (Method)buff.GetCodedElement(CIx.MethodDefOrRef, parentIx);
+            buff.currentMethodScope = methParent;  // set scopes - Fix by CK
+            buff.currentClassScope = (Class)methParent.GetParent();
+            instTypes = buff.ReadMethSpecSig(instIx);
+            this.unresolved = false;
+            buff.currentMethodScope = null;
+            buff.currentClassScope = null;
+        }
+
+        internal override void TypeSig(MemoryStream str)
+        {
+            str.WriteByte(GENERICINST);
+            MetaDataOut.CompressNum(BlobUtil.CompressUInt((uint)instTypes.Length), str);
+            for (int i = 0; i < instTypes.Length; i++)
+            {
+                instTypes[i].TypeSig(str);
+            }
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return md.CodedIndexSize(CIx.MethodDefOrRef) + md.BlobIndexSize();
+        }
+
+        internal override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.MethodSpec, this);
+            if (!(methParent is MethodDef)) // Never build a method def
+                methParent.BuildMDTables(md);
+            for (int i = 0; i < instTypes.Length; i++)
+            {
+                instTypes[i].BuildMDTables(md);
+            }
+        }
+
+        internal override void BuildSignatures(MetaDataOut md)
+        {
+            MemoryStream outSig = new MemoryStream();
+            TypeSig(outSig);
+            instIx = md.AddToBlobHeap(outSig.ToArray());
+        }
+
+        internal override void Write(PEWriter output)
+        {
+            output.WriteCodedIndex(CIx.MethodDefOrRef, methParent);
+            output.BlobIndex(instIx);
+        }
+
+        /*-------------------- Public Methods ------------------------------*/
+
+        public Type[] GetGenericParamTypes()
+        {  // KJG 15 July 2005
+            return instTypes;
+        }
+
+        public Method GetMethParent()
+        {         // KJG 15 July 2005
+            return methParent;
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a method defined in another assembly/module
+    /// </summary>
+    public class MethodRef : Method
+    {
+        internal MethodDef defOf;
+        MethodDef varArgParent = null;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal MethodRef(Class paren, string name, Type retType, Type[] pars)
+            : base(name, retType, paren)
+        {
+            sig.parTypes = pars;
+            if (pars != null) sig.numPars = (uint)pars.Length;
+
+        }
+
+        internal MethodRef(uint parIx, string name, uint sigIx)
+            : base(name)
+        {
+            this.parentIx = parIx;
+            this.sigIx = sigIx;
+        }
+
+        internal MethodRef(MethSig sig)
+            : base(sig.name)
+        {
+            this.sig = sig;
+        }
+
+        internal override void Resolve(PEReader buff)
+        {
+            if (sig == null)
+            {
+                buff.currentMethodScope = this;
+                buff.currentClassScope = parent;
+                sig = buff.ReadMethSig(this, name, sigIx);
+                buff.currentMethodScope = null;
+                buff.currentClassScope = null;
+            }
+        }
+
+        internal override Member ResolveParent(PEReader buff)
+        {
+            if (parent != null) return this;
+            buff.currentMethodScope = this;
+            MetaDataElement paren = buff.GetCodedElement(CIx.MemberRefParent, parentIx);
+            buff.currentMethodScope = null;
+            if (paren is MethodDef)
+            {
+                parent = null;
+                varArgParent = (MethodDef)paren;
+                //this.sig = buff.ReadMethSig(this,name,sigIx);
+                ((MethodDef)paren).AddVarArgSig(this);
+                return this;
+            }
+            else if (paren is ClassSpec)
+            {
+                ((ClassSpec)paren).AddMethod(this);
+                return this;
+            }
+            else if (paren is PrimitiveType)
+            {
+                paren = MSCorLib.mscorlib.GetDefaultClass();
+            }
+            else if (paren is ClassDef)
+            {
+                this.sig = buff.ReadMethSig(this, name, sigIx);
+                return ((ClassDef)paren).GetMethod(this.sig);
+            }
+            else if (paren is TypeSpec)
+            {
+                paren = new ConstructedTypeSpec((TypeSpec)paren);
+                //Console.WriteLine("Got TypeSpec as parent of Member");
+                //return this;
+                //throw new Exception("Got TypeSpec as parent of Member");
+                //((TypeSpec)paren).AddMethod(buff,this);
+            }
+            if (paren is ReferenceScope)
+                parent = ((ReferenceScope)paren).GetDefaultClass();
+            parent = (Class)paren;
+            //if ((MethodRef)parent.GetMethodDesc(name) != null) throw new PEFileException("Existing method!!");
+            //sig = buff.ReadMethSig(this,name,sigIx);
+            //MethodRef existing = (MethodRef)parent.GetMethod(sig);
+            //if (existing != null) 
+            //  return existing;
+            parent.AddToMethodList(this);
+            return this;
+        }
+
+        public void MakeVarArgMethod(MethodDef paren, Type[] optPars)
+        {
+            if (paren != null)
+            {
+                parent = null;
+                varArgParent = paren;
+            }
+            sig.optParTypes = optPars;
+            if (sig.optParTypes != null) sig.numOptPars = (uint)sig.optParTypes.Length;
+            sig.callConv = CallConv.Vararg;
+        }
+
+        internal void MakeGenericPars(uint num)
+        {
+            // Experimental (kjg) 2007-09-03
+            // It appears that for some system dll the MethodRef may not
+            // have any generic params defined, but the methodSig does.
+            if (genericParams == null)
+                if (genericParams == null) genericParams = new ArrayList();
+            for (int i = genericParams.Count; i < num; i++)
+            {
+                genericParams.Add(new GenericParam("GPar" + i, this, i));
+            }
+            // Previous code ...
+            //if (genericParams != null) {
+            //    for (int i=genericParams.Count; i < num; i++) {
+            //        genericParams.Add(new GenericParam("GPar"+i,this,i));
+            //    }
+            //}
+            //sig.numGenPars = (uint)genericParams.Count;      
+        }
+
+        /*------------------------- public set and get methods --------------------------*/
+
+        /// <summary>
+        /// Set the parameter types for this method
+        /// </summary>
+        /// <param name="pars">List of types of method parameters</param>
+        public void SetParTypes(Type[] pars)
+        {
+            if (pars == null)
+            {
+                sig.numPars = 0;
+                return;
+            }
+            sig.parTypes = pars;
+            sig.numPars = (uint)pars.Length;
+        }
+
+        /// <summary>
+        /// Set the list of optional parameter types for this method
+        /// </summary>
+        /// <param name="pars">list of optional parameter types</param>
+        public void SetOptParTypes(Type[] pars)
+        {
+            if (pars == null)
+            {
+                sig.numOptPars = 0;
+                return;
+            }
+            sig.optParTypes = pars;
+            sig.numOptPars = (uint)sig.optParTypes.Length;
+        }
+
+        /*------------------------- internal functions --------------------------*/
+
+        internal sealed override void TypeSig(MemoryStream sigStream)
+        {
+            sig.TypeSig(sigStream);
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.MemberRef, this);
+            nameIx = md.AddToStringsHeap(name);
+            if (parent != null)
+            {
+                if (parent is ClassSpec) md.AddToTable(MDTable.TypeSpec, parent);
+                if (parent is ConstructedTypeSpec) 
+                    md.AddToTable(MDTable.TypeSpec, ((ConstructedTypeSpec)parent).Spec);
+                parent.BuildMDTables(md);
+            }
+            sig.BuildTables(md);
+        }
+
+        internal sealed override void BuildSignatures(MetaDataOut md)
+        {
+            sig.BuildSignatures(md);
+            MemoryStream sigStream = new MemoryStream();
+            TypeSig(sigStream);
+            sigIx = md.AddToBlobHeap(sigStream.ToArray());
+            done = false;
+        }
+
+        internal override void BuildCILInfo(CILWriter output)
+        {
+            parent.BuildCILInfo(output);
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return md.CodedIndexSize(CIx.MemberRefParent) + md.StringsIndexSize() + md.BlobIndexSize();
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            if (varArgParent != null)
+                output.WriteCodedIndex(CIx.MemberRefParent, varArgParent);
+            else if (parent is ConstructedTypeSpec)
+                output.WriteCodedIndex(CIx.MemberRefParent, ((ConstructedTypeSpec)parent).Spec);
+            else
+                output.WriteCodedIndex(CIx.MemberRefParent, parent);
+            output.StringsIndex(nameIx);
+            output.BlobIndex(sigIx);
+        }
+
+        internal sealed override uint GetCodedIx(CIx code)
+        {
+            switch (code)
+            {
+                case (CIx.HasCustomAttr): return 6;
+                case (CIx.MethodDefOrRef): return 1;
+                case (CIx.CustomAttributeType): return 3;
+            }
+            return 0;
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a method defined in THIS assembly/module
+    /// IL     .method
+    /// </summary>
+    public class MethodDef : Method
+    {
+        private static readonly ushort PInvokeImpl = 0x2000;
+        private static readonly ushort NotPInvoke = 0xDFFF;
+        private static readonly ushort HasSecurity = 0x4000;
+        private static readonly ushort NoSecurity = 0xBFFF;
+        //private static readonly uint UnmanagedExport = 0x0008;
+        uint parIx = 0, textOffset = 0;
+        internal MethodRef refOf;
+
+        // The default max stack depth to be assigned when the depth can not be calculated.
+        private static readonly int DefaultMaxStackDepth = 8;
+
+        CILInstructions code;
+        uint rva;
+        Param[] parList;
+        Local[] locals;
+        bool initLocals;
+        ushort methFlags = 0, implFlags = 0;
+        int maxStack = 0, numLocals = 0;
+        uint numPars = 0;
+        bool entryPoint = false;
+        internal LocalSig localSig;
+        MethodRef varArgSig;
+        ImplMap pinvokeImpl;
+        ArrayList security = null;
+        internal uint locToken = 0;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal MethodDef(string name, Type retType, Param[] pars, ClassDef paren)
+            : base(name, retType, paren)
+        {
+            sig.SetParTypes(pars);
+            parList = pars;
+            parent = paren;
+            tabIx = MDTable.Method;
+        }
+
+        internal MethodDef(ClassDef paren, MethSig mSig, Param[] pars)
+            : base(mSig.name)
+        {
+            sig = mSig;
+            parList = pars;
+            parent = paren;
+            tabIx = MDTable.Method;
+        }
+
+        internal MethodDef(ClassSpec paren, MethSig mSig, Param[] pars)
+            : base(mSig.name)
+        {
+            parent = paren;
+            parList = pars;
+            sig = mSig;
+            tabIx = MDTable.Method;
+        }
+
+        internal MethodDef(PEReader buff)
+            : base(null)
+        {
+            rva = buff.ReadUInt32();
+            implFlags = buff.ReadUInt16();
+            methFlags = buff.ReadUInt16();
+            name = buff.GetString();
+            sigIx = buff.GetBlobIx();
+            parIx = buff.GetIndex(MDTable.Param);
+            tabIx = MDTable.Method;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] methDefs)
+        {
+            MethodDef prevDef = null;
+            prevDef = new MethodDef(buff);
+            methDefs[0] = prevDef;
+            for (int i = 1; i < methDefs.Length; i++)
+            {
+                prevDef.Row = (uint)i;
+                MethodDef methDef = new MethodDef(buff);
+                prevDef.numPars = methDef.parIx - prevDef.parIx;
+                prevDef = methDef;
+                methDefs[i] = methDef;
+            }
+            prevDef.Row = (uint)methDefs.Length;
+            prevDef.numPars = (buff.GetTableSize(MDTable.Param) + 1) - prevDef.parIx;
+        }
+
+        internal static void GetMethodRefs(PEReader buff, uint num, ClassRef parent)
+        {
+            for (int i = 0; i < num; i++)
+            {
+                uint rva = buff.ReadUInt32();
+                ushort implFlags = buff.ReadUInt16();
+                ushort methFlags = buff.ReadUInt16();
+                string name = buff.GetString();
+                uint sigIx = buff.GetBlobIx();
+                uint parIx = buff.GetIndex(MDTable.Param);
+                if (IsPublicOrProtected(methFlags))
+                {
+                    MethodRef mRef = new MethodRef(parIx, name, sigIx);  // changed
+                    mRef.SetParent(parent);
+                    //Console.WriteLine(parent.NameString());
+                    MethSig mSig = buff.ReadMethSig(mRef, name, sigIx);
+                    //mSig.name = name;
+                    mRef.SetSig(mSig); // changed
+                    parent.AddToMethodList(mRef);
+                }
+            }
+        }
+
+        private void DoPars(PEReader buff, bool resolvePars)
+        {
+            if (sig == null) sig = buff.ReadMethSig(this, sigIx);
+            sig.name = name;
+            parList = new Param[sig.numPars];
+            if (parIx >= buff.GetTableSize(MDTable.Param))
+            {
+                // EXPERIMENTAL kjg 19 November 2007
+                //  It is actually allowed that a method def does not
+                //  have corresponding Param metadata, provided the
+                //  parameter types may be constructed from the sig.
+                for (uint i = 0; i < sig.numPars; i++)
+                {
+                    parList[i] = Param.DefaultParam();
+                    parList[i].SetParType(sig.parTypes[i]);
+                }
+            }
+            else
+            {
+                for (uint i = 0; i < sig.numPars; i++)
+                {
+                    parList[i] = (Param)buff.GetElement(MDTable.Param, i + parIx);
+                    if (resolvePars) parList[i].Resolve(buff, i + parIx, sig.parTypes[i]);
+                    else parList[i].SetParType(sig.parTypes[i]);
+                }
+            }
+        }
+
+        private void DoCode(PEReader buff)
+        {
+            if (rva != 0)
+            {
+                if (Diag.DiagOn) Console.WriteLine("Reading byte codes for method " + name);
+                buff.ReadByteCodes(this, rva);
+            }
+        }
+
+        internal sealed override void Resolve(PEReader buff)
+        {
+            buff.currentMethodScope = this;
+            buff.currentClassScope = parent;
+            DoPars(buff, true);
+            if (!buff.skipBody)
+            {
+                DoCode(buff);
+            }
+            buff.currentMethodScope = null;
+            buff.currentClassScope = null;
+        }
+
+        /*------------------------- public set and get methods --------------------------*/
+
+        /// <summary>
+        /// Get the parameters of this method
+        /// </summary>
+        /// <returns>Array of params of this method</returns>
+        public Param[] GetParams()
+        {
+            return parList;
+        }
+
+        /// <summary>
+        /// Set the parameters for this method
+        /// </summary>
+        /// <param name="pars">Descriptors of the parameters for this method</param>
+        public void SetParams(Param[] pars)
+        {
+            parList = pars;
+            sig.SetParTypes(pars);
+        }
+
+        /// <summary>
+        /// Add some attributes to this method descriptor
+        /// </summary>
+        /// <param name="ma">the attributes to be added</param>
+        public void AddMethAttribute(MethAttr ma) { methFlags |= (ushort)ma; }
+
+        /// <summary>
+        /// Property to get and set the attributes for this method
+        /// </summary>
+        public MethAttr GetMethAttributes() { return (MethAttr)methFlags; }
+        public void SetMethAttributes(MethAttr ma) { methFlags = (ushort)ma; }
+
+        /// <summary>
+        /// Add some implementation attributes to this method descriptor
+        /// </summary>
+        /// <param name="ia">the attributes to be added</param>
+        public void AddImplAttribute(ImplAttr ia)
+        {
+            implFlags |= (ushort)ia;
+        }
+
+        /// <summary>
+        /// Property to get and set the implementation attributes for this method
+        /// </summary>
+        public ImplAttr GetImplAttributes() { return (ImplAttr)implFlags; }
+        public void SetImplAttributes(ImplAttr ia) { implFlags = (ushort)ia; }
+
+        public void AddPInvokeInfo(ModuleRef scope, string methName,
+            PInvokeAttr callAttr)
+        {
+            pinvokeImpl = new ImplMap((ushort)callAttr, this, methName, scope);
+            methFlags |= PInvokeImpl;
+        }
+
+        public void RemovePInvokeInfo()
+        {
+            pinvokeImpl = null;
+            methFlags &= NotPInvoke;
+        }
+
+        public void AddSecurity(SecurityAction act, byte[] permissionSet)
+        {
+            methFlags |= HasSecurity;
+            if (security == null) security = new ArrayList();
+            security.Add(new DeclSecurity(this, act, permissionSet));
+        }
+
+        public void AddSecurity(DeclSecurity sec)
+        {
+            methFlags |= HasSecurity;
+            if (security == null) security = new ArrayList();
+            security.Add(sec);
+        }
+
+        public DeclSecurity[] GetSecurity()
+        {
+            if (security == null) return null;
+            return (DeclSecurity[])security.ToArray(typeof(DeclSecurity));
+        }
+
+        public void RemoveSecurity()
+        {
+            security = null;
+            methFlags &= NoSecurity;
+        }
+
+        /// <summary>
+        /// Set the maximum stack height for this method
+        /// </summary>
+        /// <param name="maxStack">the maximum height of the stack</param>
+        public void SetMaxStack(int maxStack)
+        {
+            this.maxStack = maxStack;
+        }
+
+        /// <summary>
+        /// Retrieve the maximum size of the stack for the code
+        /// of this method
+        /// </summary>
+        /// <returns>max stack height for CIL codes</returns>
+        public int GetMaxStack()
+        {
+            return maxStack;
+        }
+
+        /// <summary>
+        /// Add local variables to this method
+        /// </summary>
+        /// <param name="locals">the locals to be added</param>
+        /// <param name="initLocals">are locals initialised to default values</param>
+        public void AddLocals(Local[] locals, bool initLocals)
+        {
+            if (locals == null) return;
+            this.locals = locals;
+            this.initLocals = initLocals;
+            numLocals = locals.Length;
+            for (int i = 0; i < numLocals; i++)
+            {
+                this.locals[i].SetIndex(i);
+            }
+        }
+
+        /// <summary>
+        /// Retrieve the locals for this method
+        /// </summary>
+        /// <returns>list of locals declared in this method</returns>
+        public Local[] GetLocals() { return locals; }
+
+        /// <summary>
+        /// Remove all the locals from this method
+        /// </summary>
+        public void RemoveLocals()
+        {
+            locals = null;
+            numLocals = 0;
+            initLocals = false;
+        }
+
+        /// <summary>
+        /// Mark this method as having an entry point
+        /// </summary>
+        public void DeclareEntryPoint() { entryPoint = true; }
+
+        /// <summary>
+        /// Does this method have an entrypoint?
+        /// </summary>
+        public bool HasEntryPoint() { return entryPoint; }
+
+        /// <summary>
+        /// Remove the entry point from this method
+        /// </summary>
+        public void RemoveEntryPoint() { entryPoint = false; }
+
+        /// <summary>
+        /// Create a code buffer for this method to add the IL instructions to
+        /// </summary>
+        /// <returns>a buffer for this method's IL instructions</returns>
+        public CILInstructions CreateCodeBuffer()
+        {
+            code = new CILInstructions(this);
+            return code;
+        }
+
+        /// <summary>
+        /// Get the CIL code buffer for this method
+        /// </summary>
+        /// <returns>Code buffer for this method</returns>
+        public CILInstructions GetCodeBuffer() { return code; }
+
+        /// <summary>
+        /// Make a method reference descriptor for this method to be used 
+        /// as a callsite signature for this vararg method
+        /// </summary>
+        /// <param name="optPars">the optional pars for the vararg method call</param>
+        /// <returns></returns>
+        public MethodRef MakeVarArgSignature(Type[] optPars)
+        {
+            MethSig mSig = new MethSig(name);
+            mSig.parTypes = sig.parTypes;
+            mSig.retType = sig.retType;
+            varArgSig = new MethodRef(sig);
+            varArgSig.MakeVarArgMethod(this, optPars);
+            return varArgSig;
+        }
+
+        public MethodRef GetVarArgSignature()
+        {
+            return varArgSig;
+        }
+
+        /// <summary>
+        /// Get the MethodRef equivalent to this MethodDef.  Assumes 
+        /// that one has been created.
+        /// </summary>
+        /// <returns>MethodRef for this MethodDef</returns>
+        public MethodRef RefOf() { return refOf; }
+
+        /// <summary>
+        /// Get the MethodRef equivalent to this MethodDef.  If one
+        /// does not exist, then create it.
+        /// </summary>
+        /// <returns>MethodRef for this MethodDef</returns>
+        public MethodRef MakeRefOf()
+        {
+            if (refOf != null) return refOf;
+            ClassRef parRef = ((ClassDef)parent).MakeRefOf();
+            refOf = parRef.GetMethod(name, sig.parTypes);
+            if (refOf == null)
+            {
+                Type rType = sig.MakeRefRetType();
+                Type[] pTypes = sig.MakeRefParTypes();
+                refOf = new MethodRef(parRef, name, rType, pTypes);
+                refOf.defOf = this;
+                refOf.AddCallConv(this.GetCallConv());
+            }
+            return refOf;
+        }
+
+        /*------------------------- internal functions --------------------------*/
+
+        private static bool IsPublicOrProtected(ushort methFlags)
+        {
+            return (methFlags & (ushort)MethAttr.Public) == (ushort)MethAttr.Public ||
+                   (methFlags & (ushort)MethAttr.Family) == (ushort)MethAttr.Family;
+        }
+
+        internal void InsertGenericParam(GenericParam genPar)
+        {
+            if (genericParams == null) genericParams = new ArrayList();
+            for (int i = 0; i < genericParams.Count - genPar.Index; i++)
+            {
+                genericParams.Add(null);
+            }
+            genericParams.Insert((int)genPar.Index, genPar);
+        }
+
+        internal override bool isDef() { return true; }
+
+        internal PEFile GetScope()
+        {
+            return ((ClassDef)parent).GetScope();
+        }
+
+        internal void ChangeRefsToDefs(ClassDef newPar, ClassDef[] oldTypes)
+        {
+            parent = newPar;
+            sig.ChangeParTypes(newPar, oldTypes);
+            if (code != null)
+                code.ChangeRefsToDefs(newPar, oldTypes);
+        }
+
+        internal void AddPInvokeInfo(ImplMap impl)
+        {
+            pinvokeImpl = impl;
+            methFlags |= PInvokeImpl;
+        }
+
+        internal void AddVarArgSig(MethodRef meth)
+        {
+            varArgSig = meth;
+            //meth.MakeVarArgMethod(this,null);
+        }
+
+        internal sealed override void TypeSig(MemoryStream sigStream)
+        {
+            sig.TypeSig(sigStream);
+        }
+
+        // fix for Whidbey bug
+        internal void AddGenericsToTable(MetaDataOut md)
+        {
+            if (genericParams != null)
+            {
+                for (int i = 0; i < genericParams.Count; i++)
+                {
+                    md.AddToTable(MDTable.GenericParam, (GenericParam)genericParams[i]);
+                }
+            }
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.Method, this);
+            nameIx = md.AddToStringsHeap(name);
+            if (genericParams != null)
+            {
+                for (int i = 0; i < genericParams.Count; i++)
+                {
+                    ((GenericParam)genericParams[i]).BuildMDTables(md);
+                }
+            }
+            if (security != null)
+            {
+                for (int i = 0; i < security.Count; i++)
+                {
+                    ((DeclSecurity)security[i]).BuildMDTables(md);
+                }
+            }
+            if (pinvokeImpl != null) pinvokeImpl.BuildMDTables(md);
+            if (entryPoint) md.SetEntryPoint(this);
+            if (locals != null)
+            {
+                localSig = new LocalSig(locals);
+                localSig.BuildMDTables(md);
+            }
+            try
+            {
+                if (code != null)
+                {
+                    if (code.IsEmpty())
+                    {
+                        code = null;
+                    }
+                    else
+                    {
+                        code.BuildTables(md);
+                    }
+                }
+            }
+            catch (InstructionException ex)
+            {
+                throw new Exception(ex.AddMethodName(name));
+            }
+            parIx = md.TableIndex(MDTable.Param);
+            for (int i = 0; i < sig.numPars; i++)
+            {
+                parList[i].seqNo = (ushort)(i + 1);
+                parList[i].BuildMDTables(md);
+            }
+            sig.BuildTables(md);
+        }
+
+        internal sealed override void BuildCILInfo(CILWriter output)
+        {
+            if (genericParams != null)
+            {
+                for (int i = 0; i < genericParams.Count; i++)
+                {
+                    ((GenericParam)genericParams[i]).BuildCILInfo(output);
+                }
+            }
+            if (security != null)
+            {
+                for (int i = 0; i < security.Count; i++)
+                {
+                    ((DeclSecurity)security[i]).BuildCILInfo(output);
+                }
+            }
+            if (pinvokeImpl != null) pinvokeImpl.BuildCILInfo(output);
+            if (locals != null)
+            {
+                for (int i = 0; i < locals.Length; i++)
+                {
+                    locals[i].BuildCILInfo(output);
+                }
+            }
+            try
+            {
+                if (code != null) code.BuildCILInfo(output);
+            }
+            catch (InstructionException ex)
+            {
+                throw new Exception(ex.AddMethodName(name));
+            }
+            sig.BuildCILInfo(output);
+
+        }
+
+        internal sealed override void BuildSignatures(MetaDataOut md)
+        {
+            if (locals != null)
+            {
+                localSig.BuildSignatures(md);
+                locToken = localSig.Token();
+            }
+            if (code != null)
+            {
+                // If the stack depth has not been explicity set, try to work out what is needed.
+                if (maxStack == 0)
+                {
+                    try
+                    {
+
+                        // Set the flag to show if the return type is void or other.
+                        code.ReturnsVoid = GetRetType().SameType(PrimitiveType.Void);
+
+                        // Calculate the max stack depth
+                        maxStack = code.GetMaxStackDepthRequired();
+                    }
+                    catch (CouldNotFindMaxStackDepth)
+                    {
+                        // Could not find the depth, assign the default
+                        maxStack = DefaultMaxStackDepth;
+                    }
+                }
+                code.CheckCode(locToken, initLocals, maxStack, md);
+                textOffset = md.AddCode(code);
+                if (Diag.DiagOn) Console.WriteLine("code offset = " + textOffset);
+            }
+            sig.BuildSignatures(md);
+            MemoryStream outSig = new MemoryStream();
+            TypeSig(outSig);
+            sigIx = md.AddToBlobHeap(outSig.ToArray());
+            done = false;
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return 8 + md.StringsIndexSize() + md.BlobIndexSize() + md.TableIndexSize(MDTable.Param);
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            if (code == null) output.Write(0);
+            else output.WriteCodeRVA(textOffset);
+            output.Write(implFlags);
+            output.Write(methFlags);
+            output.StringsIndex(nameIx);
+            output.BlobIndex(sigIx);
+            output.WriteIndex(MDTable.Param, parIx);
+        }
+
+        internal override void Write(CILWriter output)
+        {
+            output.Write("  .method ");
+            WriteFlags(output, methFlags);
+            sig.Write(output);
+            output.Write(" " + name + "(");
+            if (parList != null)
+            {
+                for (int i = 0; i < parList.Length; i++)
+                {
+                    parList[i].Write(output);
+                    if (i < parList.Length - 1)
+                    {
+                        output.Write(", ");
+                    }
+                }
+            }
+            output.Write(") ");
+            uint codeType = implFlags & (uint)0x11;
+            if (codeType == 0)
+            {
+                output.Write("cil ");
+            }
+            else if (codeType == 1)
+            {
+                output.Write("native ");
+            }
+            else if (codeType == 3)
+            {
+                output.Write("runtime ");
+            }
+            if ((implFlags & (uint)ImplAttr.Unmanaged) == 0)
+            {
+                output.Write("managed ");
+            }
+            else
+            {
+                output.Write("unmanaged ");
+            }
+            if ((implFlags & (uint)ImplAttr.ForwardRef) != 0)
+            {
+                output.Write("forwardref ");
+            }
+            if ((implFlags & (uint)ImplAttr.InternalCall) != 0)
+            {
+                output.Write("internalcall ");
+            }
+            if ((implFlags & (uint)ImplAttr.Synchronized) != 0)
+            {
+                output.Write("synchronized ");
+            }
+            if ((implFlags & (uint)ImplAttr.NoInLining) != 0)
+            {
+                output.Write("noinlining ");
+            }
+            output.WriteLine(" {");
+            if ((locals != null) && (locals.Length > 0))
+            {
+                output.Write("      .locals (");
+                for (int i = 0; i < locals.Length; i++)
+                {
+                    if (i > 0)
+                    {
+                        output.Write("              ");
+                    }
+                    locals[i].Write(output);
+                    if (i < locals.Length - 1)
+                    {
+                        output.WriteLine(",");
+                    }
+                }
+                output.WriteLine(" )");
+            }
+            if (entryPoint)
+            {
+                output.WriteLine("      .entrypoint");
+            }
+            if (code != null) code.Write(output);
+            output.WriteLine("  }");
+        }
+
+
+        internal sealed override uint GetCodedIx(CIx code)
+        {
+            switch (code)
+            {
+                case (CIx.HasCustomAttr): return 0;
+                case (CIx.HasDeclSecurity): return 1;
+                case (CIx.MemberRefParent): return 3;
+                case (CIx.MethodDefOrRef): return 0;
+                case (CIx.MemberForwarded): return 1;
+                case (CIx.CustomAttributeType): return 2;
+                case (CIx.TypeOrMethodDef): return 1;
+            }
+            return 0;
+        }
+
+    }
+
+}

PERWAPI/MDRefScopeElems.cs

@@ -0,0 +1,925 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Security.Cryptography;
+
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    /// <summary>
+    /// Base class for scopes (extended by Module, ModuleRef, Assembly, AssemblyRef)
+    /// </summary>
+    public abstract class ResolutionScope : MetaDataElement
+    {
+        internal protected uint nameIx = 0;
+        internal protected string name;
+        internal protected ArrayList classes = new ArrayList();
+        internal protected bool readAsDef = false;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal ResolutionScope(string name)
+        {
+            this.name = name;
+        }
+
+        internal virtual void AddToClassList(Class aClass)
+        {
+            classes.Add(aClass);
+        }
+
+        internal Class GetExistingClass(string nameSpace, string name)
+        {
+            for (int i = 0; i < classes.Count; i++)
+            {
+                Class aClass = (Class)classes[i];
+                if ((aClass.Name() == name) && (aClass.NameSpace() == nameSpace))
+                    return aClass;
+            }
+            return null;
+        }
+
+        protected Class GetClass(string nameSpace, string name, bool both)
+        {
+            for (int i = 0; i < classes.Count; i++)
+            {
+                Object aClass = classes[i];
+                if ((((Class)aClass).Name() == name) &&
+                    (!both || (both && (((Class)aClass).NameSpace() == nameSpace))))
+                    return (Class)aClass;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Delete a class from this module
+        /// </summary>
+        /// <param name="aClass">The name of the class to be deleted</param>
+        public void RemoveClass(Class aClass)
+        {
+            classes.Remove(aClass);
+        }
+
+        /// <summary>
+        /// Delete the class at an index in the class array
+        /// </summary>
+        /// <param name="ix">The index of the class to be deleted (from 0)</param>
+        public void RemoveClass(int ix)
+        {
+            classes.RemoveAt(ix);
+        }
+
+        public string Name() { return name; }
+
+        internal override string NameString() { return "[" + name + "]"; }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// A scope for descriptors which are referenced
+    /// </summary>
+    public abstract class ReferenceScope : ResolutionScope
+    {
+        /// <summary>
+        /// A default class decriptor for globals
+        /// </summary>
+        protected ClassRef defaultClass;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal ReferenceScope(string name)
+            : base(name)
+        {
+            defaultClass = new ClassRef(this, "", "");
+            defaultClass.MakeSpecial();
+        }
+
+        internal void ReadAsDef()
+        {
+            readAsDef = true;
+        }
+
+        internal ClassRef GetDefaultClass() { return defaultClass; }
+
+        internal void SetDefaultClass(ClassRef dClass)
+        {
+            defaultClass = dClass;
+        }
+
+        internal override void AddToClassList(Class aClass)
+        {
+            ((ClassRef)aClass).SetScope(this);
+            classes.Add(aClass);
+        }
+
+        internal void ReplaceClass(Class aClass)
+        {
+            bool found = false;
+            for (int i = 0; (i < classes.Count) && !found; i++)
+            {
+                if (((Class)classes[i]).Name() == aClass.Name())
+                {
+                    found = true;
+                }
+            }
+            if (!found)
+                classes.Add(aClass);
+        }
+
+        internal bool isDefaultClass(ClassRef aClass) { return aClass == defaultClass; }
+
+        /// <summary>
+        /// Add a class to this Scope.  If this class already exists, throw
+        /// an exception
+        /// </summary>
+        /// <param name="newClass">The class to be added</param>
+        public void AddClass(ClassRef newClass)
+        {
+            ClassRef aClass = (ClassRef)GetClass(newClass.NameSpace(), newClass.Name(), true);
+            if (aClass != null)
+                throw new DescriptorException("Class " + newClass.NameString());
+            if (Diag.DiagOn) Console.WriteLine("Adding class " + newClass.Name() + " to ResolutionScope " + name);
+            classes.Add(newClass);
+            // Change Refs to Defs here
+            newClass.SetScope(this);
+        }
+
+        /// <summary>
+        /// Add a class to this Scope.  If the class already exists,
+        /// throw an exception.  
+        /// </summary>
+        /// <param name="nsName">name space name</param>
+        /// <param name="name">class name</param>
+        /// <returns>a descriptor for this class in another module</returns>
+        public virtual ClassRef AddClass(string nsName, string name)
+        {
+            ClassRef aClass = GetClass(nsName, name);
+            if (aClass != null)
+            {
+                if ((aClass is SystemClass) && (!((SystemClass)aClass).added))
+                    ((SystemClass)aClass).added = true;
+                else
+                    throw new DescriptorException("Class " + aClass.NameString());
+            }
+            else
+            {
+                aClass = new ClassRef(this, nsName, name);
+                classes.Add(aClass);
+            }
+            return aClass;
+        }
+
+        /// <summary>
+        /// Add a value class to this scope.  If the class already exists,
+        /// throw an exception.  
+        /// </summary>
+        /// <param name="nsName">name space name</param>
+        /// <param name="name">class name</param>
+        /// <returns></returns>
+        public virtual ClassRef AddValueClass(string nsName, string name)
+        {
+            ClassRef aClass = AddClass(nsName, name);
+            aClass.MakeValueClass();
+            return aClass;
+        }
+
+        /// <summary>
+        /// Get a class of this scope, if it exists.
+        /// </summary>
+        /// <param name="name">The name of the class.</param>
+        /// <returns>ClassRef for "name".</returns>
+        public ClassRef GetClass(string name)
+        {
+            return (ClassRef)GetClass(null, name, false);
+        }
+
+        /// <summary>
+        /// Get a class of this scope, if it exists.
+        /// </summary>
+        /// <param name="nsName">The namespace of the class.</param>
+        /// <param name="name">The name of the class.</param>
+        /// <returns>ClassRef for "nsName.name".</returns>
+        public ClassRef GetClass(string nsName, string name)
+        {
+            return (ClassRef)GetClass(nsName, name, true);
+        }
+
+        /// <summary>
+        /// Get all the classes in this scope.
+        /// </summary>
+        /// <returns>An array of all the classes in this scope.</returns>
+        public ClassRef[] GetClasses()
+        {
+            return (ClassRef[])classes.ToArray(typeof(ClassRef));
+        }
+
+        /// <summary>
+        /// Fetch a MethodRef descriptor for the method "retType name (pars)".
+        /// If one exists, it is returned, else one is created.
+        /// </summary>
+        /// <param name="name">method name</param>
+        /// <param name="retType">return type</param>
+        /// <param name="pars">method parameter types</param>
+        /// <returns>a descriptor for this method in anther module</returns>
+        public MethodRef AddMethod(string name, Type retType, Type[] pars)
+        {
+            MethodRef meth = defaultClass.AddMethod(name, retType, pars);
+            return meth;
+        }
+
+        /// <summary>
+        /// Fetch a MethodRef descriptor for the method "retType name (pars, optPars)".
+        /// If one exists, it is returned, else one is created.
+        /// </summary>
+        /// <param name="name">method name</param>
+        /// <param name="retType">return type</param>
+        /// <param name="pars">parameter types</param>
+        /// <param name="optPars">optional param types for this vararg method</param>
+        /// <returns>a descriptor for this method</returns>
+        public MethodRef AddVarArgMethod(string name, Type retType, Type[] pars, Type[] optPars)
+        {
+            MethodRef meth = defaultClass.AddVarArgMethod(name, retType, pars, optPars);
+            return meth;
+        }
+
+        /// <summary>
+        /// Add a method to this scope.
+        /// </summary>
+        /// <param name="meth">The method to be added.</param>
+        public void AddMethod(MethodRef meth)
+        {
+            defaultClass.AddMethod(meth);
+        }
+
+        //		internal void CheckAddMethod(MethodRef meth) {
+        //			defaultClass.CheckAddMethod(meth);
+        //		}
+        /*
+            internal void CheckAddMethods(ArrayList meths) {
+              for (int i=0; i < meths.Count; i++) {
+                Method meth = (Method)meths[i];
+                defaultClass.CheckAddMethod(meth);
+                meth.SetParent(this);
+              }
+            }
+
+            internal MethodRef GetMethod(string name, uint sigIx) {
+              return defaultClass.GetMethod(name,sigIx);
+            }
+            */
+
+        /// <summary>
+        /// Get a method of this scope, if it exists.
+        /// </summary>
+        /// <param name="name">The name of the method.</param>
+        /// <returns>MethodRef for "name", or null if none exists.</returns>
+        public MethodRef GetMethod(string name)
+        {
+            return defaultClass.GetMethod(name);
+        }
+
+        /// <summary>
+        /// Get all the methods with a specified name in this scope.
+        /// </summary>
+        /// <param name="name">The name of the method(s).</param>
+        /// <returns>An array of all the methods called "name".</returns>
+        public MethodRef[] GetMethods(string name)
+        {
+            return defaultClass.GetMethods(name);
+        }
+
+
+        /// <summary>
+        /// Get a method of this scope, if it exists.
+        /// </summary>
+        /// <param name="name">The name of the method</param>
+        /// <param name="parTypes">The signature of the method.</param>
+        /// <returns>MethodRef for name(parTypes).</returns>
+        public MethodRef GetMethod(string name, Type[] parTypes)
+        {
+            return defaultClass.GetMethod(name, parTypes);
+        }
+
+        /// <summary>
+        /// Get a vararg method of this scope, if it exists.
+        /// </summary>
+        /// <param name="name">The name of the method.</param>
+        /// <param name="parTypes">The signature of the method.</param>
+        /// <param name="optPars">The optional parameters of the vararg method.</param>
+        /// <returns>MethodRef for name(parTypes,optPars).</returns>
+        public MethodRef GetMethod(string name, Type[] parTypes, Type[] optPars)
+        {
+            return defaultClass.GetMethod(name, parTypes, optPars);
+        }
+
+        /// <summary>
+        /// Get all the methods in this module
+        /// </summary>
+        /// <returns>Array of the methods of this module</returns>
+        public MethodRef[] GetMethods()
+        {
+            return defaultClass.GetMethods();
+        }
+
+        /// <summary>
+        /// Delete a method from this scope.
+        /// </summary>
+        /// <param name="meth">The method to be deleted.</param>
+        public void RemoveMethod(MethodRef meth)
+        {
+            defaultClass.RemoveMethod(meth);
+        }
+
+        /// <summary>
+        /// Delete a method from this scope.  If there are multiple methods with
+        /// the same name, the first on the list will be deleted.
+        /// </summary>
+        /// <param name="name">The name of the method to delete.</param>
+        public void RemoveMethod(string name)
+        {
+            defaultClass.RemoveMethod(name);
+        }
+
+        /// <summary>
+        /// Delete a method from this scope.
+        /// </summary>
+        /// <param name="name">The name of the method to be deleted.</param>
+        /// <param name="parTypes">The signature of the method to be deleted.</param>
+        public void RemoveMethod(string name, Type[] parTypes)
+        {
+            defaultClass.RemoveMethod(name, parTypes);
+        }
+
+        /// <summary>
+        /// Delete a (vararg) method from this scope.
+        /// </summary>
+        /// <param name="name">The name of the method to be deleted.</param>
+        /// <param name="parTypes">The signature of the method to be deleted.</param>
+        /// <param name="optTypes">The optional parameters of the vararg method.</param>
+        public void RemoveMethod(string name, Type[] parTypes, Type[] optTypes)
+        {
+            defaultClass.RemoveMethod(name, parTypes, optTypes);
+        }
+
+        /// <summary>
+        /// Delete a method from this scope.
+        /// </summary>
+        /// <param name="index">The index of the method to be deleted.  Index
+        /// into array returned by GetMethods().</param>
+        public void RemoveMethod(int index)
+        {
+            defaultClass.RemoveMethod(index);
+        }
+
+        /// <summary>
+        /// Add a field to this scope.
+        /// </summary>
+        /// <param name="name">field name</param>
+        /// <param name="fType">field type</param>
+        /// <returns>a descriptor for the field "name" in this scope</returns>
+        public FieldRef AddField(string name, Type fType)
+        {
+            FieldRef field = defaultClass.AddField(name, fType);
+            return field;
+        }
+
+        /// <summary>
+        /// Add a field to this scope.
+        /// </summary>
+        /// <param name="fld">The field to be added</param>
+        public void AddField(FieldRef fld)
+        {
+            defaultClass.AddField(fld);
+        }
+
+        /// <summary>
+        /// Add a number of fields to this scope.
+        /// </summary>
+        /// <param name="flds">The fields to be added.</param>
+        internal void AddFields(ArrayList flds)
+        {
+            for (int i = 0; i < flds.Count; i++)
+            {
+                FieldRef fld = (FieldRef)flds[i];
+                defaultClass.AddField(fld);
+            }
+        }
+
+        /// <summary>
+        /// Fetch the FieldRef descriptor for the field "name" in this module, 
+        /// if one exists
+        /// </summary>
+        /// <param name="name">field name</param>
+        /// <returns>FieldRef descriptor for "name" or null</returns>
+        public FieldRef GetField(string name)
+        {
+            return defaultClass.GetField(name);
+        }
+
+        /// <summary>
+        /// Get all the fields of this module
+        /// </summary>
+        /// <returns>Array of FieldRefs for this module</returns>
+        public FieldRef[] GetFields()
+        {
+            return defaultClass.GetFields();
+        }
+
+        internal void AddToMethodList(MethodRef meth)
+        {
+            defaultClass.AddToMethodList(meth);
+        }
+
+        internal void AddToFieldList(FieldRef fld)
+        {
+            defaultClass.AddToFieldList(fld);
+        }
+
+        internal MethodRef GetMethod(MethSig mSig)
+        {
+            return (MethodRef)defaultClass.GetMethod(mSig);
+        }
+
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// A reference to an external assembly (.assembly extern)
+    /// </summary>
+    public class AssemblyRef : ReferenceScope
+    {
+        private ushort major, minor, build, revision;
+        uint flags, keyIx, hashIx, cultIx;
+        bool hasVersion = false, isKeyToken = false;
+        byte[] keyBytes, hashBytes;
+        string culture;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal AssemblyRef(string name)
+            : base(name)
+        {
+            tabIx = MDTable.AssemblyRef;
+        }
+
+        internal AssemblyRef(string name, ushort maj, ushort min, ushort bldNo, ushort rev,
+            uint flags, byte[] kBytes, string cult, byte[] hBytes)
+            : base(name)
+        {
+            tabIx = MDTable.AssemblyRef;
+            major = maj;
+            minor = min;
+            build = bldNo;
+            revision = rev;
+            this.flags = flags;  // check
+            keyBytes = kBytes;  // need to set is token or full key
+            if (keyBytes != null)
+                isKeyToken = keyBytes.Length <= 8;
+            culture = cult;
+            hashBytes = hBytes;
+            tabIx = MDTable.AssemblyRef;
+        }
+
+        internal static AssemblyRef Read(PEReader buff)
+        {
+            ushort majVer = buff.ReadUInt16();
+            ushort minVer = buff.ReadUInt16();
+            ushort bldNo = buff.ReadUInt16();
+            ushort revNo = buff.ReadUInt16();
+            uint flags = buff.ReadUInt32();
+            byte[] pKey = buff.GetBlob();
+            string name = buff.GetString();
+            string cult = buff.GetString();
+            byte[] hBytes = buff.GetBlob();
+            AssemblyRef assemRef;
+            if (name.ToLower() == "mscorlib")
+            {
+                assemRef = MSCorLib.mscorlib;
+                assemRef.AddVersionInfo(majVer, minVer, bldNo, revNo);
+                assemRef.AddHash(hBytes);
+                if (pKey.Length > 8) assemRef.AddKey(pKey);
+                else assemRef.AddKeyToken(pKey);
+                assemRef.AddCulture(cult);
+                assemRef.SetFlags(flags);
+            }
+            else
+            {
+                assemRef = new AssemblyRef(name, majVer, minVer, bldNo, revNo, flags, pKey, cult, hBytes);
+            }
+            return assemRef;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] table)
+        {
+            for (int i = 0; i < table.Length; i++)
+                table[i] = Read(buff);
+        }
+
+        /*------------------------- public set and get methods --------------------------*/
+
+        /// <summary>
+        /// Add version information about this external assembly
+        /// </summary>
+        /// <param name="majVer">Major Version</param>
+        /// <param name="minVer">Minor Version</param>
+        /// <param name="bldNo">Build Number</param>
+        /// <param name="revNo">Revision Number</param>
+        public void AddVersionInfo(int majVer, int minVer, int bldNo, int revNo)
+        {
+            major = (ushort)majVer;
+            minor = (ushort)minVer;
+            build = (ushort)bldNo;
+            revision = (ushort)revNo;
+            hasVersion = true;
+        }
+
+        /// <summary>
+        /// Get the major version for this external assembly
+        /// </summary>
+        /// <returns>major version number</returns>
+        public int MajorVersion() { return major; }
+        /// <summary>
+        /// Get the minor version for this external assembly
+        /// </summary>
+        /// <returns>minor version number</returns>
+        public int MinorVersion() { return minor; }
+        /// <summary>
+        /// Get the build number for this external assembly
+        /// </summary>
+        /// <returns>build number</returns>
+        public int BuildNumber() { return build; }
+        /// <summary>
+        /// Get the revision number for this external assembly
+        /// </summary>
+        /// <returns>revision number</returns>
+        public int RevisionNumber() { return revision; }
+
+        /// <summary>
+        /// Check if this external assembly has any version information
+        /// </summary>
+        public bool HasVersionInfo() { return hasVersion; }
+
+        /// <summary>
+        /// Add the hash value for this external assembly
+        /// </summary>
+        /// <param name="hash">bytes of the hash value</param>
+        public void AddHash(byte[] hash) { hashBytes = hash; }
+
+        /// <summary>
+        /// Get the hash value for this external assembly
+        /// </summary>
+        /// <returns></returns>
+        public byte[] GetHash() { return hashBytes; }
+
+        /// <summary>
+        /// Set the culture for this external assembly
+        /// </summary>
+        /// <param name="cult">the culture string</param>
+        public void AddCulture(string cult) { culture = cult; }
+
+        public string GetCulture() { return culture; }
+
+        /// <summary>
+        /// Add the full public key for this external assembly
+        /// </summary>
+        /// <param name="key">bytes of the public key</param>
+        public void AddKey(byte[] key)
+        {
+            flags |= 0x0001;   // full public key
+            keyBytes = key;
+        }
+
+        /// <summary>
+        /// Add the public key token (low 8 bytes of the public key)
+        /// </summary>
+        /// <param name="key">low 8 bytes of public key</param>
+        public void AddKeyToken(byte[] key)
+        {
+            keyBytes = key;
+            isKeyToken = true;
+        }
+
+        /// <summary>
+        /// Get the public key token
+        /// </summary>
+        /// <returns>bytes of public key</returns>
+        public byte[] GetKey() { return keyBytes; }
+
+        /// <summary>
+        /// Make an AssemblyRef for "name".  
+        /// </summary>
+        /// <param name="name">The name of the assembly</param>
+        /// <returns>AssemblyRef for "name".</returns>
+        public static AssemblyRef MakeAssemblyRef(string name)
+        {
+            AssemblyRef assemRef = new AssemblyRef(name);
+            return assemRef;
+        }
+
+        public static AssemblyRef MakeAssemblyRef(
+            string name,
+            int majVer,
+            int minVer,
+            int bldNum,
+            int revNum,
+            byte[] key)
+        {
+            AssemblyRef assemRef = new AssemblyRef(name);
+            assemRef.AddVersionInfo(majVer, minVer, bldNum, revNum);
+            if (key.Length > 8)
+                assemRef.AddKey(key);
+            else
+                assemRef.AddKeyToken(key);
+            return assemRef;
+        }
+
+        /*------------------------ internal functions ----------------------------*/
+
+        internal void SetFlags(uint flags)
+        {
+            this.flags = flags;
+        }
+
+        internal string AssemblyString()
+        {
+            string result = name;
+            if (hasVersion)
+                result = result + ", Version=" + major + "." + minor + "." +
+                    build + "." + revision;
+            if (keyBytes != null)
+            {
+                string tokenStr = "=";
+                if (isKeyToken) tokenStr = "Token=";
+                result = result + ", PublicKey" + tokenStr;
+                for (int i = 0; i < keyBytes.Length; i++)
+                {
+                    result = result + Hex.Byte(keyBytes[i]);
+                }
+            }
+            if (culture != null)
+                result = result + ", Culture=" + culture;
+            return result;
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return 12 + 2 * md.StringsIndexSize() + 2 * md.BlobIndexSize();
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.AssemblyRef, this);
+            keyIx = md.AddToBlobHeap(keyBytes);
+            nameIx = md.AddToStringsHeap(name);
+            cultIx = md.AddToStringsHeap(culture);
+            hashIx = md.AddToBlobHeap(hashBytes);
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.Write(major);
+            output.Write(minor);
+            output.Write(build);
+            output.Write(revision);
+            output.Write(flags);
+            output.BlobIndex(keyIx);
+            output.StringsIndex(nameIx);
+            output.StringsIndex(cultIx);
+            output.BlobIndex(hashIx);
+        }
+
+        internal override void Write(CILWriter output)
+        {
+            output.WriteLine(".assembly extern " + name + " { }");
+        }
+
+
+        internal sealed override uint GetCodedIx(CIx code)
+        {
+            switch (code)
+            {
+                case (CIx.ResolutionScope): return 2;
+                case (CIx.HasCustomAttr): return 15;
+                case (CIx.Implementation): return 1;
+            }
+            return 0;
+        }
+
+    }
+    /**************************************************************************/
+    /// <summary>
+    /// The assembly for mscorlib.  
+    /// </summary>
+    public sealed class MSCorLib : AssemblyRef
+    {
+        internal static MSCorLib mscorlib = new MSCorLib();
+        internal SystemClass ObjectClass;
+        private ClassRef valueType;
+
+        internal MSCorLib()
+            : base("mscorlib")
+        {
+            classes.Add(new SystemClass(this, PrimitiveType.Void));
+            classes.Add(new SystemClass(this, PrimitiveType.Boolean));
+            classes.Add(new SystemClass(this, PrimitiveType.Char));
+            classes.Add(new SystemClass(this, PrimitiveType.Int8));
+            classes.Add(new SystemClass(this, PrimitiveType.UInt8));
+            classes.Add(new SystemClass(this, PrimitiveType.Int16));
+            classes.Add(new SystemClass(this, PrimitiveType.UInt16));
+            classes.Add(new SystemClass(this, PrimitiveType.Int32));
+            classes.Add(new SystemClass(this, PrimitiveType.UInt32));
+            classes.Add(new SystemClass(this, PrimitiveType.Int64));
+            classes.Add(new SystemClass(this, PrimitiveType.UInt64));
+            classes.Add(new SystemClass(this, PrimitiveType.Float32));
+            classes.Add(new SystemClass(this, PrimitiveType.Float64));
+            classes.Add(new SystemClass(this, PrimitiveType.IntPtr));
+            classes.Add(new SystemClass(this, PrimitiveType.UIntPtr));
+            classes.Add(new SystemClass(this, PrimitiveType.String));
+            classes.Add(new SystemClass(this, PrimitiveType.TypedRef));
+            ObjectClass = new SystemClass(this, PrimitiveType.Object);
+            classes.Add(ObjectClass);
+            valueType = new ClassRef(this, "System", "ValueType");
+            valueType.MakeValueClass();
+            classes.Add(valueType);
+        }
+
+        internal ClassRef ValueType()
+        {
+            return valueType;
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a module in an assembly
+    /// </summary>
+    public class ModuleRef : ReferenceScope
+    {
+        ArrayList exportedClasses = new ArrayList();
+        internal ModuleFile modFile;
+        internal Module defOf;
+        internal bool ismscorlib = false;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal ModuleRef(string name, bool entryPoint, byte[] hashValue)
+            : base(name)
+        {
+            modFile = new ModuleFile(name, hashValue, entryPoint);
+            ismscorlib = name.ToLower() == "mscorlib.dll";
+            tabIx = MDTable.ModuleRef;
+        }
+
+        internal ModuleRef(string name)
+            : base(name)
+        {
+            ismscorlib = name.ToLower() == "mscorlib.dll";
+            tabIx = MDTable.ModuleRef;
+        }
+
+        internal ModuleRef(ModuleFile file)
+            : base(file.Name())
+        {
+            modFile = file;
+            tabIx = MDTable.ModuleRef;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] mods, bool resolve)
+        {
+            for (int i = 0; i < mods.Length; i++)
+            {
+                string name = buff.GetString();
+                ModuleRef mRef = new ModuleRef(name);
+                if (resolve) mRef.modFile = buff.GetFileDesc(name);
+                mods[i] = mRef;
+            }
+        }
+
+        internal sealed override void Resolve(PEReader buff)
+        {
+            modFile = buff.GetFileDesc(name);
+            if (modFile != null)
+                modFile.fileModule = this;
+        }
+
+        /*------------------------- public set and get methods --------------------------*/
+
+
+        /// <summary>
+        /// Add a class which is declared public in this external module of
+        /// THIS assembly.  This class will be exported from this assembly.
+        /// The ilasm syntax for this is .extern class
+        /// </summary>
+        /// <param name="attrSet">attributes of the class to be exported</param>
+        /// <param name="nsName">name space name</param>
+        /// <param name="name">external class name</param>
+        /// <param name="declFile">the file where the class is declared</param>
+        /// <param name="isValueClass">is this class a value type?</param>
+        /// <returns>a descriptor for this external class</returns>
+        public ClassRef AddExternClass(TypeAttr attrSet, string nsName,
+            string name, bool isValueClass, PEFile pefile)
+        {
+            ClassRef cRef = new ClassRef(this, nsName, name);
+            if (isValueClass) cRef.MakeValueClass();
+            ExternClass eClass = new ExternClass(attrSet, nsName, name, modFile);
+            exportedClasses.Add(eClass);
+            cRef.SetExternClass(eClass);
+            classes.Add(cRef);
+            return cRef;
+        }
+
+        public static ModuleRef MakeModuleRef(string name, bool entryPoint, byte[] hashValue)
+        {
+            ModuleRef mRef = new ModuleRef(name, entryPoint, hashValue);
+            return mRef;
+        }
+
+        public void SetEntryPoint()
+        {
+            modFile.SetEntryPoint();
+        }
+
+        public void SetHash(byte[] hashVal)
+        {
+            modFile.SetHash(hashVal);
+        }
+
+        /*------------------------- internal functions --------------------------*/
+
+        /*    internal void AddMember(Member memb) {
+              if (memb is Method) {
+                Method existing = GetMethod(memb.Name(),((Method)memb).GetParTypes());
+                if (existing == null) 
+                  methods.Add(memb);
+              } else {
+                Field existing = GetField(memb.Name());
+                if (existing == null)
+                  fields.Add(memb);
+              }
+            }
+            */
+
+        internal void AddToExportedClassList(ClassRef exClass)
+        {
+            if (exportedClasses.Contains(exClass)) return;
+            exportedClasses.Add(exClass);
+        }
+
+        internal void AddExternClass(ExternClass eClass)
+        {
+            exportedClasses.Add(eClass);
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return md.StringsIndexSize();
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.ModuleRef, this);
+            nameIx = md.AddToStringsHeap(name);
+            if (modFile != null) modFile.BuildMDTables(md);
+            for (int i = 0; i < exportedClasses.Count; i++)
+                ((ExternClass)exportedClasses[i]).BuildMDTables(md);
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.StringsIndex(nameIx);
+        }
+
+        internal sealed override uint GetCodedIx(CIx code)
+        {
+            switch (code)
+            {
+                case (CIx.HasCustomAttr): return 12;
+                case (CIx.MemberRefParent): return 2;
+                case (CIx.ResolutionScope): return 1;
+            }
+            return 0;
+        }
+
+    }
+}

PERWAPI/MDSignatureElems.cs

@@ -0,0 +1,353 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Security.Cryptography;
+
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    /// <summary>
+    /// Base descriptor for signature blobs
+    /// </summary>
+    public class Signature : MetaDataElement
+    {
+        protected uint sigIx;
+        protected byte[] sigBytes;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal Signature()
+        {
+            tabIx = MDTable.StandAloneSig;
+        }
+
+        private Signature(uint sIx)
+        {
+            sigIx = sIx;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] sigs)
+        {
+            for (int i = 0; i < sigs.Length; i++)
+            {
+                uint sigIx = buff.GetBlobIx();
+                uint tag = buff.FirstBlobByte(sigIx);
+                if (tag == LocalSig.LocalSigByte)
+                    sigs[i] = new LocalSig(sigIx);
+                else if (tag == Field.FieldTag)
+                    sigs[i] = new Signature(sigIx);
+                else
+                    sigs[i] = new CalliSig(sigIx);
+                sigs[i].Row = (uint)i + 1;
+            }
+        }
+
+        internal override void Resolve(PEReader buff)
+        {
+            Type sigType = buff.GetFieldType(sigIx);
+            buff.ReplaceSig(this, sigType);
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return md.BlobIndexSize();
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            output.BlobIndex(sigIx);
+        }
+
+        internal sealed override uint GetCodedIx(CIx code) { return (uint)tabIx; }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Signature for calli instruction
+    /// </summary>
+    public class CalliSig : Signature
+    {
+        CallConv callConv;
+        Type retType;
+        Type[] parTypes, optParTypes;
+        uint numPars = 0, numOptPars = 0;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        /// <summary>
+        /// Create a signature for a calli instruction
+        /// </summary>
+        /// <param name="cconv">calling conventions</param>
+        /// <param name="retType">return type</param>
+        /// <param name="pars">parameter types</param>
+        public CalliSig(CallConv cconv, Type retType, Type[] pars)
+        {
+            callConv = cconv;
+            this.retType = retType;
+            parTypes = pars;
+            if (pars != null) numPars = (uint)pars.Length;
+        }
+
+        internal CalliSig(uint sigIx)
+        {
+            this.sigIx = sigIx;
+        }
+
+        /// <summary>
+        /// The return type of the method being called.
+        /// </summary>
+        public Type ReturnType { get { return retType; } }
+
+        /// <summary>
+        /// The number of parameters on the method being called.
+        /// </summary>
+        public uint NumPars { get { return numPars; } }
+
+        /// <summary>
+        /// The number of optional parameters on the method being called.
+        /// </summary>
+        public uint NumOptPars { get { return numOptPars; } }
+
+        /// <summary>
+        /// Check to see if the method signature has a particular calling convention.
+        /// </summary>
+        /// <param name="callCon">The convention to check to see if the method has.</param>
+        /// <returns>Ture if the calling convention exists on the method.</returns>
+        internal bool HasCallConv(CallConv callCon)
+        {
+            return ((callConv & callCon) == callCon);
+        }
+
+        internal sealed override void Resolve(PEReader buff)
+        {
+            MethSig mSig = buff.ReadMethSig(null, sigIx);
+            callConv = mSig.callConv;
+            retType = mSig.retType;
+            parTypes = mSig.parTypes;
+            if (parTypes != null) numPars = (uint)parTypes.Length;
+            optParTypes = mSig.optParTypes;
+            if (optParTypes != null) numOptPars = (uint)optParTypes.Length;
+        }
+
+        /// <summary>
+        /// Add the optional parameters to a vararg method
+        /// This method sets the vararg calling convention
+        /// </summary>
+        /// <param name="optPars">the optional pars for the vararg call</param>
+        public void AddVarArgs(Type[] optPars)
+        {
+            optParTypes = optPars;
+            if (optPars != null) numOptPars = (uint)optPars.Length;
+            callConv |= CallConv.Vararg;
+        }
+
+        /// <summary>
+        /// Add extra calling conventions to this callsite signature
+        /// </summary>
+        /// <param name="cconv"></param>
+        public void AddCallingConv(CallConv cconv)
+        {
+            callConv |= cconv;
+        }
+
+        internal void ChangeRefsToDefs(ClassDef newType, ClassDef[] oldTypes)
+        {
+            for (int i = 0; i < oldTypes.Length; i++)
+            {
+                if (retType == oldTypes[i]) retType = newType;
+                for (int j = 0; j < numPars; j++)
+                {
+                    if (parTypes[j] == oldTypes[i])
+                        parTypes[j] = newType;
+                }
+                for (int j = 0; j < numOptPars; j++)
+                {
+                    if (optParTypes[j] == oldTypes[i])
+                        optParTypes[j] = newType;
+                }
+            }
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(MDTable.StandAloneSig, this);
+            for (int i = 0; i < numPars; i++)
+            {
+                parTypes[i].BuildMDTables(md);
+            }
+            if (numOptPars > 0)
+            {
+                for (int i = 0; i < numOptPars; i++)
+                {
+                    optParTypes[i].BuildMDTables(md);
+                }
+            }
+        }
+
+        internal sealed override void BuildSignatures(MetaDataOut md)
+        {
+            MemoryStream sig = new MemoryStream();
+            sig.WriteByte((byte)callConv);
+            MetaDataOut.CompressNum(BlobUtil.CompressUInt(numPars + numOptPars), sig);
+            retType.TypeSig(sig);
+            for (int i = 0; i < numPars; i++)
+            {
+                parTypes[i].TypeSig(sig);
+            }
+            if (numOptPars > 0)
+            {
+                sig.WriteByte((byte)ElementType.Sentinel);
+                for (int i = 0; i < numOptPars; i++)
+                {
+                    optParTypes[i].TypeSig(sig);
+                }
+            }
+            sigIx = md.AddToBlobHeap(sig.ToArray());
+            done = false;
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for the locals for a method
+    /// </summary>
+    public class LocalSig : Signature
+    {
+        internal static readonly byte LocalSigByte = 0x7;
+        Local[] locals;
+        bool resolved = true;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public LocalSig(Local[] locals)
+        {
+            this.locals = locals;
+        }
+
+        internal LocalSig(uint sigIx)
+        {
+            resolved = false;
+            this.sigIx = sigIx;
+        }
+
+        internal override void Resolve(PEReader buff)
+        {
+        }
+
+        internal void Resolve(PEReader buff, MethodDef meth)
+        {
+            if (resolved) return;
+            buff.currentMethodScope = meth;
+            buff.currentClassScope = (Class)meth.GetParent();
+            locals = buff.ReadLocalSig(sigIx);
+            buff.currentMethodScope = null;
+            buff.currentClassScope = null;
+        }
+
+        internal Local[] GetLocals()
+        {
+            return locals;
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(tabIx, this);
+            for (int i = 0; i < locals.Length; i++)
+            {
+                locals[i].BuildTables(md);
+            }
+        }
+
+        internal byte[] SigBytes()
+        {
+            MemoryStream sig = new MemoryStream();
+            sig.WriteByte(LocalSigByte);
+            MetaDataOut.CompressNum(BlobUtil.CompressUInt((uint)locals.Length), sig);
+            for (int i = 0; i < locals.Length; i++)
+            {
+                ((Local)locals[i]).TypeSig(sig);
+            }
+            return sig.ToArray();
+        }
+
+        internal sealed override void BuildSignatures(MetaDataOut md)
+        {
+            sigIx = md.AddToBlobHeap(SigBytes());
+            done = false;
+        }
+
+    }
+
+    /// <summary>
+    /// Stores the signature for the debug info for a local variable.
+    /// </summary>
+    public class DebugLocalSig : Signature
+    {
+        internal static readonly byte LocalSigByte = 0x6;
+        bool resolved = true;
+        byte[] loc;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal DebugLocalSig(byte[] loc)
+        {
+            this.loc = loc;
+        }
+
+        internal DebugLocalSig(uint sigIx)
+        {
+            resolved = false;
+            this.sigIx = sigIx;
+        }
+
+        internal override void Resolve(PEReader buff)
+        {
+        }
+
+        internal void Resolve(PEReader buff, MethodDef meth)
+        {
+            if (resolved) return;
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            md.AddToTable(tabIx, this);
+        }
+
+        internal byte[] SigBytes()
+        {
+            byte[] b = new byte[loc.Length + 1];
+            b[0] = LocalSigByte;
+            System.Array.Copy(loc, 0, b, 1, loc.Length);
+            return b;
+        }
+
+        internal sealed override void BuildSignatures(MetaDataOut md)
+        {
+            sigIx = md.AddToBlobHeap(SigBytes());
+            done = false;
+        }
+
+    }
+
+}

PERWAPI/MDTypeElems.cs

@@ -0,0 +1,1010 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Security.Cryptography;
+
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    /// <summary>
+    /// Base class for all IL types
+    /// </summary>
+    public abstract class Type : MetaDataElement
+    {
+        protected byte typeIndex;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal Type(byte tyIx) { typeIndex = tyIx; }
+
+        internal byte GetTypeIndex() { return typeIndex; }
+
+        internal virtual bool SameType(Type tstType)
+        {
+            return this == tstType;
+        }
+
+        internal virtual void TypeSig(MemoryStream str)
+        {
+            throw new TypeSignatureException(this.GetType().AssemblyQualifiedName +
+                " doesn't have a type signature!!");
+        }
+
+        public virtual string TypeName()
+        {
+            return "NoTypeName";
+        }
+
+        internal virtual void WriteType(CILWriter output)
+        {
+            throw new NotYetImplementedException("Writing types for CIL");
+        }
+
+        internal virtual void WriteName(CILWriter output)
+        {
+            WriteType(output);
+        }
+
+        internal virtual Type AddTypeSpec(MetaDataOut md)
+        {
+            if (!isDef()) BuildMDTables(md);
+            return this;
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a custom modifier of a type (modopt or modreq)
+    /// </summary>
+    public class CustomModifiedType : Type
+    {
+        Type type;
+        Class cmodType;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        /// <summary>
+        /// Create a new custom modifier for a type
+        /// </summary>
+        /// <param name="type">the type to be modified</param>
+        /// <param name="cmod">the modifier</param>
+        /// <param name="cmodType">the type reference to be associated with the type</param>
+        public CustomModifiedType(Type type, CustomModifier cmod, Class cmodType)
+            : base((byte)cmod)
+        {
+            this.type = type;
+            this.cmodType = cmodType;
+        }
+
+        /*------------------------- public set and get methods --------------------------*/
+
+        public void SetModifiedType(Type modType) { type = modType; }
+        public Type GetModifiedType() { return type; }
+
+        public void SetModifingType(Class mod) { cmodType = mod; }
+        public Class GetModifingType() { return cmodType; }
+
+        public void SetModifier(CustomModifier cmod) { typeIndex = (byte)cmod; }
+        public CustomModifier GetModifier() { return (CustomModifier)typeIndex; }
+
+        /*----------------------------- internal functions ------------------------------*/
+
+        internal override bool SameType(Type tstType)
+        {
+            if (this == tstType) return true;
+            if (tstType is CustomModifiedType)
+            {
+                CustomModifiedType cmTstType = (CustomModifiedType)tstType;
+                return type.SameType(cmTstType.type) &&
+                    cmodType.SameType(cmTstType.cmodType);
+            }
+            return false;
+        }
+        internal sealed override void TypeSig(MemoryStream str)
+        {
+            str.WriteByte(typeIndex);
+            MetaDataOut.CompressNum(BlobUtil.CompressUInt(cmodType.TypeDefOrRefToken()), str);
+            type.TypeSig(str);
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            if (!(cmodType is ClassDef))
+                cmodType.BuildMDTables(md);
+            if (!(type is ClassDef))
+                type.BuildMDTables(md);
+        }
+
+    }
+
+    /**************************************************************************/
+    internal class Pinned : Type
+    {
+        internal Pinned() : base((byte)ElementType.Pinned) { }
+    }
+
+    /**************************************************************************/
+    internal class Sentinel : Type
+    {
+        internal Sentinel() : base((byte)ElementType.Sentinel) { }
+    }
+
+    /**************************************************************************/
+    public abstract class TypeSpec : Type
+    {
+
+        uint sigIx = 0;
+        internal bool typeSpecAdded = false; // so that MetaDataOut can reset it
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal TypeSpec(byte typeIx)
+            : base(typeIx)
+        {
+            tabIx = MDTable.TypeSpec;
+        }
+
+        internal static void Read(PEReader buff, TableRow[] specs)
+        {
+            for (int i = 0; i < specs.Length; i++)
+            {
+                specs[i] = new UnresolvedTypeSpec(buff, i);
+                //specs[i] = buff.GetBlobType(null,null,buff.GetBlobIx());
+                //if (specs[i] is GenericParam) {
+                //  Console.WriteLine("GenericParam in TypeSpec table at pos " + i);
+                //}
+            }
+        }
+
+        internal override sealed Type AddTypeSpec(MetaDataOut md)
+        {
+            if (typeSpecAdded) return this;
+            md.AddToTable(MDTable.TypeSpec, this);
+            BuildMDTables(md);
+            typeSpecAdded = true;
+            return this;
+        }
+
+        internal override void BuildSignatures(MetaDataOut md)
+        {
+            MemoryStream str = new MemoryStream();
+            TypeSig(str);
+            sigIx = md.AddToBlobHeap(str.ToArray());
+            done = false;
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            return md.BlobIndexSize();
+        }
+
+        internal sealed override void Write(PEWriter output)
+        {
+            //Console.WriteLine("Writing the blob index for a TypeSpec");
+            output.BlobIndex(sigIx);
+        }
+
+        internal sealed override uint GetCodedIx(CIx code)
+        {
+            switch (code)
+            {
+                case (CIx.TypeDefOrRef): return 2;
+                case (CIx.HasCustomAttr): return 13;
+                case (CIx.MemberRefParent): return 4;
+            }
+            return 0;
+        }
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for the Primitive types defined in IL
+    /// </summary>
+    public class PrimitiveType : TypeSpec
+    {
+        private string name;
+        private int systemTypeIndex;
+        internal static int NumSystemTypes = 18;
+
+        public static readonly PrimitiveType Void = new PrimitiveType(0x01, "Void", 0);
+        public static readonly PrimitiveType Boolean = new PrimitiveType(0x02, "Boolean", 1);
+        public static readonly PrimitiveType Char = new PrimitiveType(0x03, "Char", 2);
+        public static readonly PrimitiveType Int8 = new PrimitiveType(0x04, "SByte", 3);
+        public static readonly PrimitiveType UInt8 = new PrimitiveType(0x05, "Byte", 4);
+        public static readonly PrimitiveType Int16 = new PrimitiveType(0x06, "Int16", 5);
+        public static readonly PrimitiveType UInt16 = new PrimitiveType(0x07, "UInt16", 6);
+        public static readonly PrimitiveType Int32 = new PrimitiveType(0x08, "Int32", 7);
+        public static readonly PrimitiveType UInt32 = new PrimitiveType(0x09, "UInt32", 8);
+        public static readonly PrimitiveType Int64 = new PrimitiveType(0x0A, "Int64", 9);
+        public static readonly PrimitiveType UInt64 = new PrimitiveType(0x0B, "UInt64", 10);
+        public static readonly PrimitiveType Float32 = new PrimitiveType(0x0C, "Single", 11);
+        public static readonly PrimitiveType Float64 = new PrimitiveType(0x0D, "Double", 12);
+        public static readonly PrimitiveType String = new PrimitiveType(0x0E, "String", 13);
+        internal static readonly PrimitiveType Class = new PrimitiveType(0x12);
+        public static readonly PrimitiveType TypedRef = new PrimitiveType(0x16, "TypedReference", 14);
+        public static readonly PrimitiveType IntPtr = new PrimitiveType(0x18, "IntPtr", 15);
+        public static readonly PrimitiveType UIntPtr = new PrimitiveType(0x19, "UIntPtr", 16);
+        public static readonly PrimitiveType Object = new PrimitiveType(0x1C, "Object", 17);
+        internal static readonly PrimitiveType ClassType = new PrimitiveType(0x50);
+        internal static readonly PrimitiveType SZArray = new PrimitiveType(0x1D);
+        public static readonly PrimitiveType NativeInt = IntPtr;
+        public static readonly PrimitiveType NativeUInt = UIntPtr;
+        internal static PrimitiveType[] primitives = {null,Void,Boolean,Char,Int8,UInt8,
+                                                         Int16,UInt16,Int32,UInt32,Int64,
+                                                         UInt64,Float32,Float64,String};
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal PrimitiveType(byte typeIx) : base(typeIx) { }
+
+        internal PrimitiveType(byte typeIx, string name, int STIx)
+            : base(typeIx)
+        {
+            this.name = name;
+            this.systemTypeIndex = STIx;
+        }
+
+        internal string GetName() { return name; }
+
+        public override string TypeName()
+        {
+            if (typeIndex == 0x0E) return "System.String";
+            return name;
+        }
+
+        internal int GetSystemTypeIx() { return systemTypeIndex; }
+
+        internal sealed override void TypeSig(MemoryStream str)
+        {
+            str.WriteByte(typeIndex);
+        }
+
+        internal override void WriteType(CILWriter output)
+        {
+            //if (typeIndex == 0x0E) {
+            //    output.Write("[mscorlib]System.String");
+            //} else 
+            switch (typeIndex)
+            {
+                case (0x1C): output.Write("[mscorlib]System.Object"); break;
+                case (0x02): output.Write("bool"); break;
+                case (0x0C): output.Write("float32"); break;
+                case (0x0D): output.Write("float64"); break;
+                default: output.Write(name.ToLower()); break;
+            }
+        }
+
+        internal sealed override bool SameType(Type tstType)
+        {
+            if (tstType is SystemClass)
+                return tstType.SameType(this);
+            return this == tstType;
+        }
+
+        /* now done in MetaDataOut.WriteTildeStream
+        internal static void ClearAddedFlags() {   // KJG 18-April-2005
+            for (int i = 0; i < primitives.Length; i++) {
+                if (primitives[i] != null) primitives[i].typeSpecAdded = false;
+            }
+        }
+        */
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for  
+    /// </summary>
+    public class GenericParam : Type
+    {
+        private static readonly byte VAR = 0x13;
+        private static readonly byte MVAR = 0x1E;
+        ushort flags, index, kind = 0;
+        uint parentIx, nameIx;
+        string name;
+        MetaDataElement parent;
+        private ArrayList constraints = new ArrayList();
+        internal static bool extraField = true;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        private GenericParam(uint index, byte elemIx)
+            : base(elemIx)
+        {
+            this.index = (ushort)index;
+            sortTable = true;
+        }
+
+        internal GenericParam(string name, MetaDataElement parent, int index)
+            : base(VAR)
+        {
+            this.name = name;
+            this.parent = parent;
+            this.index = (ushort)index;
+            if (parent is Method) typeIndex = MVAR;
+            sortTable = true;
+            tabIx = MDTable.GenericParam;
+        }
+
+        internal GenericParam(PEReader buff)
+            : base(VAR)
+        {
+            index = buff.ReadUInt16();
+            flags = buff.ReadUInt16();
+            parentIx = buff.GetCodedIndex(CIx.TypeOrMethodDef);
+            name = buff.GetString();
+            if (extraField) kind = buff.ReadUInt16();
+            sortTable = true;
+            tabIx = MDTable.GenericParam;
+            // resolve generic param immediately for signature resolution
+            parent = buff.GetCodedElement(CIx.TypeOrMethodDef, parentIx);
+            if (parent != null)
+            {
+                if (parent is MethodDef)
+                {
+                    typeIndex = MVAR;
+                    ((MethodDef)parent).AddGenericParam(this);
+                }
+                else
+                {
+                    ((ClassDef)parent).AddGenericParam(this);
+                }
+            }
+        }
+
+        internal GenericParam(string name)
+            : base(MVAR)
+        {
+            this.name = name;
+            sortTable = true;
+            tabIx = MDTable.GenericParam;
+        }
+
+        internal static GenericParam AnonMethPar(uint ix)
+        {
+            return new GenericParam(ix, MVAR);
+        }
+
+        internal static GenericParam AnonClassPar(uint ix)
+        {
+            return new GenericParam(ix, VAR);
+        }
+
+        internal static void Read(PEReader buff, TableRow[] gpars)
+        {
+            for (int i = 0; i < gpars.Length; i++)
+                gpars[i] = new GenericParam(buff);
+        }
+
+        /*------------------------- public set and get methods --------------------------*/
+
+        /// <summary>
+        /// Set the attribute for this generic parameter
+        /// </summary>
+        /// <param name="attr">the attribute</param>
+        public void SetAttribute(GenericParamAttr attr)
+        {
+            flags = (ushort)attr;
+        }
+
+        /// <summary>
+        /// Get the attribute for this generic parameter
+        /// </summary>
+        public GenericParamAttr GetAttribute()
+        {
+            return (GenericParamAttr)flags;
+        }
+
+        /// <summary>
+        /// Add a type constraint to this generic parameter
+        /// </summary>
+        /// <param name="cType">class constraining the parameter type</param>
+        public void AddConstraint(Class cType)
+        {
+            constraints.Add(cType);
+        }
+
+        /// <summary>
+        /// Remove a constraint from this generic parameter
+        /// </summary>
+        /// <param name="cType">class type of constraint</param>
+        public void RemoveConstraint(Class cType)
+        {
+            for (int i = 0; i < constraints.Count; i++)
+            {
+                if (constraints[i] == cType)
+                {
+                    constraints.RemoveAt(i);
+                    return;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Return a constraint from the list
+        /// </summary>
+        /// <param name="i">constraint index</param>
+        /// <returns></returns>
+        public Class GetConstraint(int i)
+        {
+            return (Class)constraints[i];
+        }
+
+        /// <summary>
+        /// Get the number of constrains on this GenericParam
+        /// </summary>
+        /// <returns></returns>
+        public int GetConstraintCount()
+        {
+            return constraints.Count;
+        }
+
+        /// <summary>
+        /// Get the name of this generic parameter
+        /// </summary>
+        /// <returns>generic parameter name</returns>
+        public string GetName() { return name; }
+
+        public MetaDataElement GetParent() { return parent; }
+
+        public Class[] GetClassConstraints()
+        {
+            return (Class[])constraints.ToArray(typeof(Class)); // KJG 20-May-2005
+        }
+
+        /*----------------------------- internal functions ------------------------------*/
+
+        internal uint Index
+        {
+            get { return index; }
+            set { index = (ushort)value; }
+        }
+
+        internal void SetClassParam(Class paren, int ix)
+        {
+            typeIndex = VAR;
+            parent = paren;
+            index = (ushort)ix;
+        }
+
+        internal void SetMethParam(Method paren, int ix)
+        {
+            typeIndex = MVAR;
+            parent = paren;
+            index = (ushort)ix;
+        }
+
+        internal void CheckParent(MethodDef paren, PEReader buff)
+        {
+            if (paren == buff.GetCodedElement(CIx.TypeOrMethodDef, parentIx))
+            {
+                parent = paren;
+                paren.InsertGenericParam(this);
+            }
+        }
+
+        internal override void TypeSig(MemoryStream str)
+        {
+            str.WriteByte(typeIndex);
+            str.WriteByte((byte)index);
+        }
+
+        internal static uint Size(MetaData md)
+        {
+            if (extraField)
+                return 6 + md.CodedIndexSize(CIx.TypeOrMethodDef) + md.StringsIndexSize();
+            else
+                return 4 + md.CodedIndexSize(CIx.TypeOrMethodDef) + md.StringsIndexSize();
+        }
+
+        internal override Type AddTypeSpec(MetaDataOut md)
+        {
+            // check that this generic parameter belongs to the "current" method ??
+            GenericParTypeSpec tSpec = new GenericParTypeSpec(this);
+            md.AddToTable(MDTable.TypeSpec, tSpec);
+            return tSpec;
+        }
+
+        internal override uint SortKey()
+        {
+            return (parent.Row << MetaData.CIxShiftMap[(uint)CIx.TypeOrMethodDef])
+                | parent.GetCodedIx(CIx.TypeOrMethodDef);
+        }
+
+        internal override void BuildTables(MetaDataOut md)
+        {
+            if (parent is MethodRef || parent is ClassRef) return; // don't add it - fix by CK
+            md.AddToTable(MDTable.GenericParam, this);
+            nameIx = md.AddToStringsHeap(name);
+            for (int i = 0; i < constraints.Count; i++)
+            {
+                Class cClass = (Class)constraints[i];
+                constraints[i] = new GenericParamConstraint(this, cClass);
+                if (cClass is ClassRef) cClass.BuildMDTables(md);
+                // Fix by CK - should be BuildTables too??
+                if (cClass is ClassSpec) md.AddToTable(MDTable.TypeSpec, cClass);
+            }
+        }
+
+        internal override void BuildCILInfo(CILWriter output)
+        {
+            for (int i = 0; i < constraints.Count; i++)
+            {
+                Class cClass = (Class)constraints[i];
+                if (!cClass.isDef())
+                {
+                    cClass.BuildCILInfo(output);
+                }
+            }
+        }
+
+        internal void AddConstraints(MetaDataOut md)
+        {
+            for (int i = 0; i < constraints.Count; i++)
+            {
+                md.AddToTable(MDTable.GenericParamConstraint, (GenericParamConstraint)constraints[i]);
+            }
+        }
+
+        internal override void Write(PEWriter output)
+        {
+            output.Write(index);
+            output.Write(flags);
+            output.WriteCodedIndex(CIx.TypeOrMethodDef, parent);
+            output.StringsIndex(nameIx);
+            if (extraField) output.Write(kind);
+        }
+
+    }
+
+    /**************************************************************************/
+    internal class UnresolvedTypeSpec : TypeSpec
+    {
+        uint blobIx;
+
+        internal UnresolvedTypeSpec(PEReader buff, int i)
+            : base(0)
+        {
+            blobIx = buff.GetBlobIx();
+            Row = (uint)i + 1;
+            this.unresolved = true;
+        }
+
+        internal override void Resolve(PEReader buff)
+        {
+            buff.InsertInTable(MDTable.TypeSpec, Row, buff.GetBlobType(blobIx));
+            this.unresolved = false;
+        }
+
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// 
+    /// </summary> 
+    public class GenericParTypeSpec : TypeSpec
+    {
+        GenericParam gPar;
+        bool isClassPar;
+        uint index;
+
+        internal GenericParTypeSpec(GenericParam gPar)
+            : base(gPar.GetTypeIndex())
+        {
+            this.gPar = gPar;
+        }
+
+        internal GenericParTypeSpec(int gpTypeIx, uint ix)
+            : base((byte)gpTypeIx)
+        {
+            isClassPar = gpTypeIx == (int)ElementType.Var;
+            index = ix;
+        }
+
+        internal GenericParam GetGenericParam(MethodDef meth)
+        {
+            if (gPar == null)
+            {
+                if (isClassPar)
+                {
+                    ClassDef methClass = (ClassDef)meth.GetParent();
+                    gPar = methClass.GetGenericParam((int)index);
+                }
+                else
+                {
+                    gPar = meth.GetGenericParam((int)index);
+                }
+            }
+            return gPar;
+        }
+
+        internal override void TypeSig(MemoryStream str)
+        {
+            gPar.TypeSig(str);
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// The IL Array type
+    /// </summary>
+    public abstract class Array : TypeSpec
+    {
+        /// <summary>
+        /// The element type of the array
+        /// </summary>
+        protected Type elemType;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal Array(Type eType, byte TypeId)
+            : base(TypeId)
+        {
+            elemType = eType;
+            tabIx = MDTable.TypeSpec;
+        }
+
+        public Type ElemType() { return elemType; }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            if (!(elemType is ClassDef))
+                elemType.BuildMDTables(md);
+        }
+
+        internal sealed override void BuildCILInfo(CILWriter output)
+        {
+            if (!(elemType is ClassDef))
+                elemType.BuildCILInfo(output);
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Multi dimensional array with explicit bounds
+    /// </summary>
+    public class BoundArray : Array
+    {
+        int[] lowerBounds;
+        int[] sizes;
+        uint numDims;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        /// <summary>
+        /// Create a new multi dimensional array type 
+        /// eg. elemType[1..5,3..10,5,,] would be 
+        /// new BoundArray(elemType,5,[1,3,0],[5,10,4])
+        /// </summary>
+        /// <param name="elementType">the type of the elements</param>
+        /// <param name="dimensions">the number of dimensions</param>
+        /// <param name="loBounds">lower bounds of dimensions</param>
+        /// <param name="upBounds">upper bounds of dimensions</param>
+        public BoundArray(
+            Type elementType, 
+            int dimensions, 
+            int[] loBounds,
+            int[] upBounds) : base(elementType, 0x14)
+        {
+            numDims = (uint)dimensions;
+            lowerBounds = loBounds;
+
+            if (loBounds.Length > dimensions)
+                throw new TypeSignatureException("Array cannot have more bounds than rank");
+            if (upBounds != null)
+            {
+                if (upBounds.Length > loBounds.Length)
+                    throw new TypeSignatureException("Array cannot have more upper than lower bounds");
+                sizes = new int[upBounds.Length];
+                for (int i = 0; i < upBounds.Length; i++)
+                {
+                    sizes[i] = upBounds[i] - loBounds[i] + 1;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Create a new multi dimensional array type with low bounds
+        /// specified but no sizes specified.  C# arrays T[,] do this
+        /// with implicit low bounds of zero, but no sizes
+        /// </summary>
+        /// <param name="elementType">the type of the elements</param>
+        /// <param name="dimensions">the number of dimensions</param>
+        /// <param name="bounds">the low bounds of the dimensions</param>
+        public BoundArray(Type elementType, int dimensions, int[] bounds)
+            : base(elementType, 0x14)
+        {
+            if (bounds.Length > dimensions)
+                throw new TypeSignatureException("Array cannot have more bounds than rank");
+            numDims = (uint)dimensions;
+            lowerBounds = bounds;
+        }
+
+        /// <summary>
+        /// Create a new multi dimensional array type 
+        /// eg. elemType[,,] would be new BoundArray(elemType,3)
+        /// </summary>
+        /// <param name="elementType">the type of the elements</param>
+        /// <param name="dimensions">the number of dimensions</param>
+        public BoundArray(Type elementType, int dimensions)
+            : base(elementType, 0x14)
+        {
+            numDims = (uint)dimensions;
+        }
+
+        internal override bool SameType(Type tstType)
+        {
+            if (this == tstType) return true;
+            if (!(tstType is BoundArray)) return false;
+            BoundArray bArray = (BoundArray)tstType;
+            if (elemType.SameType(bArray.ElemType()))
+                return SameBounds(numDims, lowerBounds, sizes);
+            return false;
+        }
+
+        internal bool SameBounds(uint dims, int[] lbounds, int[] sizs)
+        {
+            if (dims != numDims) return false;
+            if (lowerBounds != null)
+            {
+                if ((lbounds == null) || (lowerBounds.Length != lbounds.Length)) return false;
+                for (int i = 0; i < lowerBounds.Length; i++)
+                    if (lowerBounds[i] != lbounds[i]) return false;
+            }
+            else
+                if (lbounds != null) return false;
+            if (sizes != null)
+            {
+                if ((sizs == null) || (sizes.Length != sizs.Length)) return false;
+                for (int i = 0; i < sizes.Length; i++)
+                    if (sizes[i] != sizs[i]) return false;
+            }
+            else
+                if (sizs != null) return false;
+            return true;
+        }
+
+        internal sealed override void TypeSig(MemoryStream str)
+        {
+            str.WriteByte(typeIndex);
+            elemType.TypeSig(str);
+            MetaDataOut.CompressNum(BlobUtil.CompressUInt(numDims), str);
+            if ((sizes != null) && (sizes.Length > 0))
+            {
+                MetaDataOut.CompressNum(BlobUtil.CompressUInt((uint)sizes.Length), str);
+                for (int i = 0; i < sizes.Length; i++)
+                {
+                    MetaDataOut.CompressNum(BlobUtil.CompressUInt((uint)sizes[i]), str);
+                }
+            }
+            else str.WriteByte(0);
+            if ((lowerBounds != null) && (lowerBounds.Length > 0))
+            {
+                MetaDataOut.CompressNum(BlobUtil.CompressUInt((uint)lowerBounds.Length), str);
+                for (int i = 0; i < lowerBounds.Length; i++)
+                {
+                    MetaDataOut.CompressNum(BlobUtil.CompressInt(lowerBounds[i]), str);
+                }
+            }
+            else str.WriteByte(0);
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Single dimensional array with zero lower bound
+    /// </summary>
+    public class ZeroBasedArray : Array
+    {
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        /// <summary>
+        /// Create a new array  -   elementType[]
+        /// </summary>
+        /// <param name="elementType">the type of the array elements</param>
+        public ZeroBasedArray(Type elementType) : base(elementType, (byte)ElementType.SZArray) { }
+
+        internal sealed override void TypeSig(MemoryStream str)
+        {
+            str.WriteByte(typeIndex);
+            elemType.TypeSig(str);
+        }
+
+        internal override bool SameType(Type tstType)
+        {
+            if (this == tstType) return true;
+            if (!(tstType is ZeroBasedArray)) return false;
+            //return elemType == ((ZeroBasedArray)tstType).ElemType();
+            return elemType.SameType(((ZeroBasedArray)tstType).ElemType());
+        }
+
+        internal override void WriteType(CILWriter output)
+        {
+            elemType.WriteType(output);
+            output.Write("[]");
+        }
+
+
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a FunctionPointer type
+    /// </summary>
+    /// 
+    public class MethPtrType : TypeSpec
+    {
+        // MethPtrType == FNPTR
+        Method meth;
+        MethSig mSig;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        /// <summary>
+        /// Create a new function pointer type
+        /// </summary>
+        /// <param name="meth">the function to be referenced</param>
+        public MethPtrType(Method meth)
+            : base((byte)ElementType.FnPtr)
+        {
+            this.meth = meth;
+        }
+
+        internal MethPtrType(MethSig msig)
+            : base((byte)ElementType.FnPtr)
+        {
+            mSig = msig;
+        }
+
+        internal sealed override void TypeSig(MemoryStream str)
+        {
+            str.WriteByte(typeIndex);
+            if (meth == null)
+                mSig.TypeSig(str);
+            else
+                meth.TypeSig(str);
+        }
+
+        internal override bool SameType(Type tstType)
+        {
+            if (this == tstType) return true;
+            if (tstType is MethPtrType)
+            {
+                MethPtrType mpType = (MethPtrType)tstType;
+
+            }
+            return false;
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            Type[] types = meth.GetParTypes();
+            if (types != null)
+                for (int i = 0; i < types.Length; i++)
+                    types[i].BuildMDTables(md);
+            types = meth.GetOptParTypes();
+            if (types != null)
+                for (int i = 0; i < types.Length; i++)
+                    types[i].BuildMDTables(md);
+        }
+
+        internal sealed override void BuildCILInfo(CILWriter output)
+        {
+            Type[] types = meth.GetParTypes();
+            if (types != null)
+                for (int i = 0; i < types.Length; i++)
+                    types[i].BuildCILInfo(output);
+            types = meth.GetOptParTypes();
+            if (types != null)
+                for (int i = 0; i < types.Length; i++)
+                    types[i].BuildCILInfo(output);
+        }
+
+        /*    internal sealed override void BuildSignatures(MetaDataOut md) {
+              if (sigIx == 0) {
+                MemoryStream sig = new MemoryStream();
+                TypeSig(sig);
+                sigIx = md.AddToBlobHeap(sig.ToArray());
+              }
+              done = false;
+            }
+            */
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for an pointer (type * or type &)
+    /// </summary>
+    public abstract class PtrType : TypeSpec
+    {
+        protected Type baseType;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal PtrType(Type bType, byte typeIx)
+            : base(typeIx)
+        {
+            baseType = bType;
+        }
+
+        public Type GetBaseType() { return baseType; }
+
+        internal sealed override void TypeSig(MemoryStream str)
+        {
+            str.WriteByte(typeIndex);
+            baseType.TypeSig(str);
+        }
+
+        internal sealed override void BuildTables(MetaDataOut md)
+        {
+            if (!(baseType is ClassDef))
+                baseType.BuildMDTables(md);
+        }
+
+        internal sealed override void BuildCILInfo(CILWriter output)
+        {
+            if (!(baseType is ClassDef))
+                baseType.BuildCILInfo(output);
+        }
+
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a managed pointer (type & or byref)
+    /// </summary>
+    public class ManagedPointer : PtrType
+    {  // <type> & (BYREF)  
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        /// <summary>
+        /// Create new managed pointer to baseType
+        /// </summary>
+        /// <param name="bType">the base type of the pointer</param>
+        public ManagedPointer(Type baseType) : base(baseType, 0x10) { }
+    }
+
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for an unmanaged pointer (type *)
+    /// </summary>
+    public class UnmanagedPointer : PtrType
+    { // PTR
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        /// <summary>
+        /// Create a new unmanaged pointer to baseType
+        /// </summary>
+        /// <param name="baseType">the base type of the pointer</param>
+        public UnmanagedPointer(Type baseType) : base(baseType, 0x0F) { }
+
+    }
+
+}

PERWAPI/MetaDataClass.cs

@@ -0,0 +1,213 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+
+
+namespace QUT.PERWAPI
+{
+
+    /**************************************************************************/
+    // Class containing MetaData Constants
+    /**************************************************************************/
+    /// <summary>
+    /// MetaData 
+    ///   Root (20 bytes + UTF-8 Version String + quad align padding)
+    ///   StreamHeaders (8 bytes + null terminated name string + quad align padding)
+    ///   Streams 
+    ///     #~        (always present - holds metadata tables)
+    ///     #Strings  (always present - holds identifier strings)
+    ///     #US       (Userstring heap)
+    ///     #Blob     (signature blobs)
+    ///     #GUID     (guids for assemblies or Modules)
+    /// </summary>
+
+    internal class MetaData
+    {
+        internal static readonly uint maxSmlIxSize = 0xFFFF;
+        internal static readonly uint max1BitSmlIx = 0x7FFF;
+        internal static readonly uint max2BitSmlIx = 0x3FFF;
+        internal static readonly uint max3BitSmlIx = 0x1FFF;
+        internal static readonly uint max5BitSmlIx = 0x7FF;
+        internal static readonly uint[] CIxBitMasks = { 0x0, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F };
+        internal static readonly int[] CIxShiftMap = { 2, 2, 5, 1, 2, 3, 1, 1, 1, 2, 3, 2, 1 };
+        internal static readonly uint[] CIxMaxMap = {max2BitSmlIx,max2BitSmlIx,max5BitSmlIx,
+                                                        max1BitSmlIx,max2BitSmlIx,max3BitSmlIx,
+                                                        max1BitSmlIx,max1BitSmlIx,max1BitSmlIx,
+                                                        max2BitSmlIx,max3BitSmlIx,max2BitSmlIx, max1BitSmlIx};
+        internal static readonly int[] TypeDefOrRefTable = { (int)MDTable.TypeDef, (int)MDTable.TypeRef, (int)MDTable.TypeSpec };
+        internal static readonly int[] HasConstantTable = { (int)MDTable.Field, (int)MDTable.Param, (int)MDTable.Property };
+        internal static readonly int[] HasCustomAttributeTable = {(int)MDTable.Method, (int)MDTable.Field, (int)MDTable.TypeRef, 
+                                                                     (int)MDTable.TypeDef,(int)MDTable.Param, (int)MDTable.InterfaceImpl,
+                                                                     (int)MDTable.MemberRef, (int)MDTable.Module,(int)MDTable.DeclSecurity,
+                                                                     (int)MDTable.Property,(int)MDTable.Event, (int)MDTable.StandAloneSig, 
+                                                                     (int)MDTable.ModuleRef, (int)MDTable.TypeSpec, (int)MDTable.Assembly,
+                                                                     (int)MDTable.AssemblyRef, (int)MDTable.File, (int)MDTable.ExportedType, 
+                                                                     (int)MDTable.ManifestResource };
+        internal static readonly int[] HasFieldMarshalTable = { (int)MDTable.Field, (int)MDTable.Param };
+        internal static readonly int[] HasDeclSecurityTable = { (int)MDTable.TypeDef, (int)MDTable.Method, (int)MDTable.Assembly };
+        internal static readonly int[] MemberRefParentTable = {(int)MDTable.TypeDef, (int)MDTable.TypeRef, (int)MDTable.ModuleRef, (int)MDTable.Method, 
+                                                                  (int)MDTable.TypeSpec };
+        internal static readonly int[] HasSemanticsTable = { (int)MDTable.Event, (int)MDTable.Property };
+        internal static readonly int[] MethodDefOrRefTable = { (int)MDTable.Method, (int)MDTable.MemberRef };
+        internal static readonly int[] MemberForwardedTable = { (int)MDTable.Field, (int)MDTable.Method };
+        internal static readonly int[] ImplementationTable = { (int)MDTable.File, (int)MDTable.AssemblyRef, (int)MDTable.ExportedType };
+        internal static readonly int[] CustomAttributeTypeTable = { 0, 0, (int)MDTable.Method, (int)MDTable.MemberRef };
+        internal static readonly int[] ResolutionScopeTable = {(int)MDTable.Module, (int)MDTable.ModuleRef, (int)MDTable.AssemblyRef,
+                                                                  (int)MDTable.TypeRef };
+        internal static readonly int[] TypeOrMethodDefTable = { (int)MDTable.TypeDef, (int)MDTable.Method };
+        internal static readonly int[][] CIxTables = {TypeDefOrRefTable, HasConstantTable,
+                                                         HasCustomAttributeTable, HasFieldMarshalTable, HasDeclSecurityTable, 
+                                                         MemberRefParentTable, HasSemanticsTable, MethodDefOrRefTable, MemberForwardedTable,
+                                                         ImplementationTable, CustomAttributeTypeTable, ResolutionScopeTable,
+                                                         TypeOrMethodDefTable };
+
+        internal static readonly byte StringsHeapMask = 0x1;
+        internal static readonly byte GUIDHeapMask = 0x2;
+        internal static readonly byte BlobHeapMask = 0x4;
+        internal static readonly uint MetaDataSignature = 0x424A5342;
+        // NOTE: version and stream name strings MUST always be quad padded
+        internal static readonly string[] versions = {  "v1.1.4322\0\0\0", 
+                                                        "v2.0.40607\0\0", 
+                                                        "v2.0.41202\0\0",
+                                                        "v2.0.50215\0\0",
+                                                        "v2.0.50727\0\0",
+                                                        "2.0.0.0\0"
+                                                     };
+        internal static readonly byte[] LMajors = { 6, 8, 8, 8, 8 };
+        //internal static readonly string shortVersion = version.Substring(0,9);
+        internal static readonly char[] tildeNameArray = { '#', '~', '\0', '\0' };
+        internal static readonly char[] stringsNameArray = { '#', 'S', 't', 'r', 'i', 'n', 'g', 's', '\0', '\0', '\0', '\0' };
+        internal static readonly char[] usNameArray = { '#', 'U', 'S', '\0' };
+        internal static readonly char[] guidNameArray = { '#', 'G', 'U', 'I', 'D', '\0', '\0', '\0' };
+        internal static readonly char[] blobNameArray = { '#', 'B', 'l', 'o', 'b', '\0', '\0', '\0' };
+        internal static readonly String stringsName = "#Strings";
+        internal static readonly String userstringName = "#US";
+        internal static readonly String blobName = "#Blob";
+        internal static readonly String guidName = "#GUID";
+        internal static readonly String tildeName = "#~";
+        internal static readonly uint MetaDataHeaderSize = 20 + (uint)versions[0].Length;
+        internal static readonly uint TildeHeaderSize = 24;
+        internal static readonly uint StreamHeaderSize = 8;
+        internal static readonly uint NumMetaDataTables = (int)MDTable.MaxMDTable;
+        internal static readonly uint tildeHeaderSize = 8 + (uint)tildeNameArray.Length;
+
+        internal ulong valid = 0, /*sorted = 0x000002003301FA00;*/ sorted = 0;
+        internal bool[] largeIx = new bool[NumMetaDataTables];
+        internal bool[] lgeCIx = new bool[(int)CIx.MaxCIx];
+        internal uint[] elemSize = new uint[NumMetaDataTables];
+        internal bool largeStrings = false, largeUS = false, largeGUID = false, largeBlob = false;
+
+        internal MetaData()
+        {
+            InitMetaData();
+        }
+
+        internal void InitMetaData()
+        {
+            for (int i = 0; i < NumMetaDataTables; i++)
+                largeIx[i] = false;
+            for (int i = 0; i < lgeCIx.Length; i++)
+                lgeCIx[i] = false;
+        }
+
+        internal bool LargeIx(MDTable tabIx) { return largeIx[(uint)tabIx]; }
+
+        internal uint CodedIndexSize(CIx code)
+        {
+            if (lgeCIx[(uint)code]) return 4;
+            return 2;
+        }
+
+        internal uint TableIndexSize(MDTable tabIx)
+        {
+            if (largeIx[(uint)tabIx]) return 4;
+            return 2;
+        }
+
+        internal uint StringsIndexSize()
+        {
+            if (largeStrings) return 4;
+            return 2;
+        }
+
+        internal uint GUIDIndexSize()
+        {
+            if (largeGUID) return 4;
+            return 2;
+        }
+
+        internal uint USIndexSize()
+        {
+            if (largeUS) return 4;
+            return 2;
+        }
+
+        internal uint BlobIndexSize()
+        {
+            if (largeBlob) return 4;
+            return 2;
+        }
+
+        internal void CalcElemSize()
+        {
+            elemSize[(int)MDTable.Assembly] = Assembly.Size(this);
+            elemSize[(int)MDTable.AssemblyOS] = 12;
+            elemSize[(int)MDTable.AssemblyProcessor] = 4;
+            elemSize[(int)MDTable.AssemblyRefOS] = 12 + TableIndexSize(MDTable.AssemblyRef);
+            elemSize[(int)MDTable.AssemblyRefProcessor] = 4 + TableIndexSize(MDTable.AssemblyRef);
+            elemSize[(int)MDTable.Module] = Module.Size(this);
+            elemSize[(int)MDTable.TypeRef] = ClassRef.Size(this);
+            elemSize[(int)MDTable.TypeDef] = ClassDef.Size(this);
+            elemSize[(int)MDTable.Field] = FieldDef.Size(this);
+            elemSize[(int)MDTable.Method] = MethodDef.Size(this);
+            elemSize[(int)MDTable.Param] = Param.Size(this);
+            elemSize[(int)MDTable.InterfaceImpl] = InterfaceImpl.Size(this);
+            elemSize[(int)MDTable.MemberRef] = FieldRef.Size(this);
+            elemSize[(int)MDTable.Constant] = ConstantElem.Size(this);
+            elemSize[(int)MDTable.CustomAttribute] = CustomAttribute.Size(this);
+            elemSize[(int)MDTable.FieldMarshal] = FieldMarshal.Size(this);
+            elemSize[(int)MDTable.DeclSecurity] = DeclSecurity.Size(this);
+            elemSize[(int)MDTable.ClassLayout] = ClassLayout.Size(this);
+            elemSize[(int)MDTable.FieldLayout] = FieldLayout.Size(this);
+            elemSize[(int)MDTable.StandAloneSig] = Signature.Size(this);
+            elemSize[(int)MDTable.EventMap] = MapElem.Size(this, MDTable.EventMap);
+            elemSize[(int)MDTable.Event] = Event.Size(this);
+            elemSize[(int)MDTable.PropertyMap] = MapElem.Size(this, MDTable.PropertyMap);
+            elemSize[(int)MDTable.Property] = Property.Size(this);
+            elemSize[(int)MDTable.MethodSemantics] = MethodSemantics.Size(this);
+            elemSize[(int)MDTable.MethodImpl] = MethodImpl.Size(this);
+            elemSize[(int)MDTable.ModuleRef] = ModuleRef.Size(this);
+            elemSize[(int)MDTable.TypeSpec] = TypeSpec.Size(this);
+            elemSize[(int)MDTable.ImplMap] = ImplMap.Size(this);
+            elemSize[(int)MDTable.FieldRVA] = FieldRVA.Size(this);
+            elemSize[(int)MDTable.Assembly] = Assembly.Size(this);
+            elemSize[(int)MDTable.AssemblyRef] = AssemblyRef.Size(this);
+            elemSize[(int)MDTable.File] = FileRef.Size(this);
+            elemSize[(int)MDTable.ExportedType] = ExternClass.Size(this);
+            elemSize[(int)MDTable.ManifestResource] = ManifestResource.Size(this);
+            elemSize[(int)MDTable.NestedClass] = MapElem.Size(this, MDTable.NestedClass);
+            elemSize[(int)MDTable.GenericParam] = GenericParam.Size(this);
+            elemSize[(int)MDTable.GenericParamConstraint] = GenericParamConstraint.Size(this);
+            elemSize[(int)MDTable.MethodSpec] = MethodSpec.Size(this);
+        }
+
+    }
+
+}

PERWAPI/MetaDataOut.cs

@@ -0,0 +1,554 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Text;
+using System.Collections;
+
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    // MetaData generated from user created descriptors
+    /**************************************************************************/
+    internal class MetaDataOut : MetaData
+    {
+        MetaDataStream strings, us, guid, blob;
+        MetaDataStream[] streams;
+        uint numStreams = 5;
+        uint tildeTide = 0, tildePadding = 0, tildeStart = 0;
+        uint numTables = 0, resourcesSize = 0;
+        ArrayList byteCodes = new ArrayList();
+        uint codeSize = 0, byteCodePadding = 0, metaDataSize = 0;
+        internal PEWriter output;
+        private byte heapSizes = 0;
+        MetaDataElement entryPoint;
+        long mdStart;
+        ArrayList resources;
+        private ArrayList[] tables = new ArrayList[NumMetaDataTables];
+
+        // Allow the debug mode to be set.
+        public bool Debug = false;
+
+        internal MetaDataOut()
+            : base()
+        {
+        }
+
+        Hashtable debugsigs = new Hashtable();
+
+        /// <summary>
+        /// Get the debug signature for a local.
+        /// </summary>
+        /// <param name="loc">The local.</param>
+        /// <returns>The signature.</returns>
+        internal DebugLocalSig GetDebugSig(Local loc)
+        {
+            byte[] b = loc.GetSig();
+            string s = BitConverter.ToString(b);
+            DebugLocalSig sig = (DebugLocalSig)debugsigs[s];
+            if (sig != null) return sig;
+            sig = new DebugLocalSig(b);
+            debugsigs.Add(s, sig);
+            return sig;
+        }
+
+        internal void InitMetaDataOut(PEWriter file)
+        {
+            // tilde = new MetaDataStream(tildeNameArray,false,0);
+            this.output = file;
+            streams = new MetaDataStream[5];
+            strings = new MetaDataStream(MetaData.stringsNameArray, new UTF8Encoding(), true);
+            us = new MetaDataStream(MetaData.usNameArray, new UnicodeEncoding(), true);
+            guid = new MetaDataStream(MetaData.guidNameArray, false);
+            blob = new MetaDataStream(MetaData.blobNameArray, new UnicodeEncoding(), true);
+            streams[1] = strings;
+            streams[2] = us;
+            streams[3] = guid;
+            streams[4] = blob;
+        }
+
+        internal uint Size()
+        {
+            //Console.WriteLine("metaData size = " + metaDataSize);
+            return metaDataSize;
+        }
+
+        internal uint AddToUSHeap(string str)
+        {
+            if (str == null) return 0;
+            return us.Add(str, true);
+        }
+
+        internal uint AddToStringsHeap(string str)
+        {
+            if ((str == null) || (str == "")) return 0;
+            return strings.Add(str, false);
+        }
+
+        internal uint AddToGUIDHeap(Guid guidNum)
+        {
+            return guid.Add(guidNum);
+        }
+
+        internal uint AddToBlobHeap(byte[] blobBytes)
+        {
+            if (blobBytes == null) return 0;
+            return blob.Add(blobBytes);
+        }
+
+        internal uint AddToBlobHeap(long val, uint numBytes)
+        {
+            return blob.Add(val, numBytes);
+        }
+
+        internal uint AddToBlobHeap(ulong val, uint numBytes)
+        {
+            return blob.Add(val, numBytes);
+        }
+
+        internal uint AddToBlobHeap(char ch)
+        {
+            return blob.Add(ch);
+        }
+
+        /*
+        internal uint AddToBlobHeap(byte val) {
+          return blob.Add(val);
+        }
+
+        internal uint AddToBlobHeap(sbyte val) {
+          return blob.Add(val);
+        }
+
+        internal uint AddToBlobHeap(ushort val) {
+          return blob.Add(val);
+        }
+
+        internal uint AddToBlobHeap(short val) {
+          return blob.Add(val);
+        }
+
+        internal uint AddToBlobHeap(uint val) {
+          return blob.Add(val);
+        }
+
+        internal uint AddToBlobHeap(int val) {
+          return blob.Add(val);
+        }
+
+        internal uint AddToBlobHeap(ulong val) {
+          return blob.Add(val);
+        }
+
+        internal uint AddToBlobHeap(long val) {
+          return blob.Add(val);
+        }
+        */
+
+        internal uint AddToBlobHeap(float val)
+        {
+            return blob.Add(val);
+        }
+
+        internal uint AddToBlobHeap(double val)
+        {
+            return blob.Add(val);
+        }
+
+        internal uint AddToBlobHeap(string val)
+        {
+            return blob.Add(val, true);
+        }
+
+        private ArrayList GetTable(MDTable tableIx)
+        {
+            int tabIx = (int)tableIx;
+            if (tables[tabIx] == null)
+            {
+                tables[tabIx] = new ArrayList();
+                valid |= ((ulong)0x1 << tabIx);
+                // Console.WriteLine("after creating table " + tableIx + "(" + tabIx + ") valid = " + valid);
+                numTables++;
+            }
+            return tables[tabIx];
+        }
+
+        internal void AddToTable(MDTable tableIx, MetaDataElement elem)
+        {
+            // updates Row field of the element
+            // Console.WriteLine("Adding element to table " + (uint)tableIx);
+            ArrayList table = GetTable(tableIx);
+            if (table.Contains(elem))
+            {
+                Console.Out.WriteLine("ERROR - element already in table " + tableIx);
+                return;
+            }
+            elem.Row = (uint)table.Count + 1;
+            table.Add(elem);
+        }
+
+        internal uint TableIndex(MDTable tableIx)
+        {
+            if (tables[(int)tableIx] == null) return 1;
+            return (uint)tables[(int)tableIx].Count + 1;
+        }
+
+        internal uint AddCode(CILInstructions byteCode)
+        {
+            byteCodes.Add(byteCode);
+            uint offset = codeSize;
+            codeSize += byteCode.GetCodeSize();
+            return offset;
+        }
+
+        internal void SetEntryPoint(MetaDataElement ep)
+        {
+            entryPoint = ep;
+        }
+
+        internal uint AddResource(byte[] resBytes)
+        {
+            if (resources == null) resources = new ArrayList();
+            resources.Add(resBytes);
+            uint offset = resourcesSize;
+            resourcesSize += (uint)resBytes.Length + 4;
+            return offset;
+        }
+
+        internal void AddData(DataConstant cVal)
+        {
+            output.AddInitData(cVal);
+        }
+
+        internal static void CompressNum(byte[] arr, MemoryStream sig)
+        {
+            for (int ix = 0; ix < arr.Length; ix++) sig.WriteByte(arr[ix]);
+        }
+
+        internal uint CodeSize()
+        {
+            return codeSize + byteCodePadding;
+        }
+
+        internal uint GetResourcesSize() { return resourcesSize; }
+
+        private void SetStreamOffsets()
+        {
+            uint sizeOfHeaders = StreamHeaderSize + (uint)tildeNameArray.Length;
+            for (int i = 1; i < numStreams; i++)
+            {
+                sizeOfHeaders += streams[i].headerSize();
+            }
+            metaDataSize = MetaDataHeaderSize + sizeOfHeaders;
+            //Console.WriteLine("Size of meta data headers (tildeStart) = " + Hex.Long(metaDataSize));
+            tildeStart = metaDataSize;
+            metaDataSize += tildeTide + tildePadding;
+            //Console.WriteLine(tildeNameArray + " - size = " + (tildeTide + tildePadding));
+            for (int i = 1; i < numStreams; i++)
+            {
+                //Console.WriteLine("Stream " + i + " " + new String(streams[i].name) + " starts at " + Hex.Long(metaDataSize));
+                streams[i].Start = metaDataSize;
+                metaDataSize += streams[i].Size();
+                streams[i].WriteDetails();
+            }
+            if (largeStrings) heapSizes |= 0x01;
+            if (largeGUID) heapSizes |= 0x02;
+            if (largeBlob) heapSizes |= 0x04;
+        }
+
+        internal void CalcTildeStreamSize()
+        {
+            largeStrings = strings.LargeIx();
+            largeBlob = blob.LargeIx();
+            largeGUID = guid.LargeIx();
+            largeUS = us.LargeIx();
+            CalcElemSize();
+            //tilde.SetIndexSizes(strings.LargeIx(),us.LargeIx(),guid.LargeIx(),blob.LargeIx());
+            tildeTide = TildeHeaderSize;
+            tildeTide += 4 * numTables;
+            //Console.WriteLine("Tilde header + sizes = " + tildeTide);
+            for (int i = 0; i < NumMetaDataTables; i++)
+            {
+                if (tables[i] != null)
+                {
+                    ArrayList table = tables[i];
+                    // Console.WriteLine("Meta data table " + i + " at offset " + tildeTide);
+                    tildeTide += (uint)table.Count * elemSize[i];
+                    // Console.WriteLine("Metadata table " + i + " has size " + table.Count);
+                    // Console.WriteLine("tildeTide = " + tildeTide);
+                }
+            }
+            if ((tildeTide % 4) != 0) tildePadding = 4 - (tildeTide % 4);
+            //Console.WriteLine("tildePadding = " + tildePadding);
+        }
+
+        internal void WriteTildeStream(PEWriter output)
+        {
+            long startTilde = output.Seek(0, SeekOrigin.Current);
+            //Console.WriteLine("Starting tilde output at offset " + Hex.Long(startTilde));
+            output.Write((uint)0); // Reserved
+            output.Write(output.verInfo.tsMajVer); // MajorVersion
+            output.Write(output.verInfo.tsMinVer); // MinorVersion
+            output.Write(heapSizes);
+            output.Write((byte)1); // Reserved
+            output.Write(valid);
+            output.Write(sorted);
+            for (int i = 0; i < NumMetaDataTables; i++)
+            {
+                if (tables[i] != null)
+                {
+                    uint count = (uint)tables[i].Count;
+                    output.Write(count);
+                }
+            }
+            long tabStart = output.Seek(0, SeekOrigin.Current);
+            //Console.WriteLine("Starting metaData tables at " + tabStart);
+            for (int i = 0; i < NumMetaDataTables; i++)
+            {
+                if (tables[i] != null)
+                {
+                    //Console.WriteLine("Starting metaData table " + i + " at " + (output.Seek(0,SeekOrigin.Current) - startTilde));
+                    ArrayList table = tables[i];
+                    for (int j = 0; j < table.Count; j++)
+                    {
+                        ((MetaDataElement)table[j]).Write(output);
+                    }
+                }
+            }
+            // reset the typespec flags
+            if (tables[(int)MDTable.TypeSpec] != null)
+            {
+                ArrayList typeSpecTable = tables[(int)MDTable.TypeSpec];
+                for (int i = 0; i < typeSpecTable.Count; i++)
+                {
+                    ((TypeSpec)typeSpecTable[i]).typeSpecAdded = false;
+                }
+            }
+            //Console.WriteLine("Writing padding at " + output.Seek(0,SeekOrigin.Current));
+            for (int i = 0; i < tildePadding; i++) output.Write((byte)0);
+        }
+
+        private void SortTable(ArrayList mTable)
+        {
+            //Console.WriteLine("Sorting table");
+            if (mTable == null) return;
+            mTable.Sort();
+            for (int i = 0; i < mTable.Count; i++)
+            {
+                ((MetaDataElement)mTable[i]).Row = (uint)i + 1;
+            }
+        }
+
+        internal void BuildMDTables()
+        {
+            // Check ordering of specific tables
+            // Constant, CustomAttribute, FieldMarshal, DeclSecurity, MethodSemantics
+            // ImplMap, NestedClass, GenericParam
+            // Need to load GenericParamConstraint AFTER GenericParam table in correct order
+            // The tables:
+            //   InterfaceImpl, ClassLayout, FieldLayout, MethodImpl, FieldRVA
+            // will _ALWAYS_ be in the correct order as embedded in BuildMDTables
+
+            SortTable(tables[(int)MDTable.Constant]);
+            SortTable(tables[(int)MDTable.CustomAttribute]);
+            SortTable(tables[(int)MDTable.FieldMarshal]);
+            SortTable(tables[(int)MDTable.DeclSecurity]);
+            SortTable(tables[(int)MDTable.MethodSemantics]);
+            SortTable(tables[(int)MDTable.ImplMap]);
+            SortTable(tables[(int)MDTable.NestedClass]);
+            if (tables[(int)MDTable.GenericParam] != null)
+            {
+                SortTable(tables[(int)MDTable.GenericParam]);
+                // Now add GenericParamConstraints
+                for (int i = 0; i < tables[(int)MDTable.GenericParam].Count; i++)
+                {
+                    ((GenericParam)tables[(int)MDTable.GenericParam][i]).AddConstraints(this);
+                }
+            }
+
+            /*
+            // for bug in Whidbey GenericParam table ordering
+            int end = tables[(int)MDTable.TypeDef].Count;
+            int methEnd = 0;
+            if (tables[(int)MDTable.Method] != null) {
+              methEnd = tables[(int)MDTable.Method].Count;
+            }
+            for (int i=0; i < end; i++) {
+              ((ClassDef)tables[(int)MDTable.TypeDef][i]).AddGenericsToTable(this);
+              if (methEnd > i)
+                ((MethodDef)tables[(int)MDTable.Method][i]).AddGenericsToTable(this);
+            }
+            for (int i=end; i < methEnd; i++) {
+              ((MethodDef)tables[(int)MDTable.Method][i]).AddGenericsToTable(this);
+            }
+            // end of bug fix
+            */
+            for (int i = 0; i < tables.Length; i++)
+            {
+                if (tables[i] != null)
+                {
+                    for (int j = 0; j < tables[i].Count; j++)
+                    {
+                        ((MetaDataElement)tables[i][j]).BuildSignatures(this);
+                    }
+                }
+            }
+        }
+
+        internal void SetIndexSizes()
+        {
+            for (int i = 0; i < NumMetaDataTables; i++)
+            {
+                if (tables[i] != null)
+                {
+                    largeIx[i] = (uint)tables[i].Count > maxSmlIxSize;
+                }
+            }
+            for (int i = 0; i < CIxTables.Length; i++)
+            {
+                for (int j = 0; j < CIxTables[i].Length; j++)
+                {
+                    int tabIx = CIxTables[i][j];
+                    if (tables[tabIx] != null)
+                    {
+                        lgeCIx[i] = lgeCIx[i] | tables[tabIx].Count > CIxMaxMap[i];
+                    }
+                }
+            }
+        }
+
+        internal void BuildMetaData()
+        {
+            SetIndexSizes();
+            for (int i = 1; i < numStreams; i++)
+            {
+                if (streams[i].Size() <= 1)
+                {
+                    //Console.WriteLine("Stream " + new String(streams[i].name) + " has size 0");
+                    for (int j = i + 1; j < numStreams; j++)
+                    {
+                        streams[i] = streams[j];
+                    }
+                    i--;
+                    numStreams--;
+                }
+                else
+                    streams[i].EndStream();
+            }
+            //Console.WriteLine("numStreams = " + numStreams);
+            CalcTildeStreamSize();
+            SetStreamOffsets();
+            byteCodePadding = NumToAlign(codeSize, 4);
+            if (entryPoint != null) output.SetEntryPoint(entryPoint.Token());
+        }
+
+        internal void WriteByteCodes(PEWriter output)
+        {
+            for (int i = 0; i < byteCodes.Count; i++)
+            {
+                ((CILInstructions)byteCodes[i]).Write(output);
+            }
+            for (int i = 0; i < byteCodePadding; i++)
+            {
+                output.Write((byte)0);
+            }
+        }
+
+        internal void WriteResources(PEWriter output)
+        {
+            if (resources == null) return;
+            for (int i = 0; i < resources.Count; i++)
+            {
+                byte[] resBytes = (byte[])resources[i];
+                output.Write((uint)resBytes.Length);
+                output.Write(resBytes);
+            }
+        }
+
+        internal void WriteMetaData(PEWriter output)
+        {
+            this.output = output;
+            if (Diag.DiagOn)
+            {
+                mdStart = output.Seek(0, SeekOrigin.Current);
+                Console.WriteLine("Writing metaData at " + Hex.Long(mdStart));
+            }
+            output.Write(MetaDataSignature);
+            output.Write(output.verInfo.mdMajVer);
+            output.Write(output.verInfo.mdMinVer);
+            output.Write(0);         // Reserved
+            output.Write(output.verInfo.netVerString.Length);
+            output.Write(output.verInfo.netVerString.ToCharArray());   // version string is already zero padded
+            output.Write((short)0);  // Flags, reserved
+            output.Write((ushort)numStreams);
+            // write tilde header
+            output.Write(tildeStart);
+            output.Write(tildeTide + tildePadding);
+            output.Write(tildeNameArray);
+            for (int i = 1; i < numStreams; i++)
+            {
+                if (Diag.DiagOn)
+                    Console.WriteLine("Stream " + new String(streams[i].name) + " should start at " + Hex.Long(streams[i].Start + mdStart));
+                streams[i].WriteHeader(output);
+            }
+            if (Diag.DiagOn)
+            {
+                Console.Write("Writing tilde stream at " + Hex.Long(output.Seek(0, SeekOrigin.Current)));
+                Console.WriteLine(" should be at " + Hex.Long(tildeStart + mdStart));
+            }
+            WriteTildeStream(output);
+            for (int i = 1; i < numStreams; i++)
+            {
+                if (Diag.DiagOn)
+                    Console.WriteLine("Writing stream " + new String(streams[i].name) + " at " + Hex.Long(output.Seek(0, SeekOrigin.Current)));
+                streams[i].Write(output);
+            }
+            //Console.WriteLine("Finished Writing metaData at " + output.Seek(0,SeekOrigin.Current));
+        }
+
+        //    internal bool LargeStringsIndex() { return strings.LargeIx(); }
+        //    internal bool LargeGUIDIndex() { return guid.LargeIx(); }
+        //    internal bool LargeUSIndex() { return us.LargeIx(); }
+        //    internal bool LargeBlobIndex() { return blob.LargeIx(); }
+
+        private uint NumToAlign(uint val, uint alignVal)
+        {
+            if ((val % alignVal) == 0) return 0;
+            return alignVal - (val % alignVal);
+        }
+
+        internal void WriteCodedIndex(CIx code, MetaDataElement elem, PEWriter output)
+        {
+            uint ix = 0;
+            if (elem != null)
+            {
+                ix = (elem.Row << CIxShiftMap[(uint)code]) | elem.GetCodedIx(code);
+                // Console.WriteLine("coded index = " + ix + " row = " + elem.Row);
+                //} else {
+                // Console.WriteLine("elem for coded index is null");
+            }
+            if (lgeCIx[(uint)code])
+                output.Write(ix);
+            else
+                output.Write((ushort)ix);
+        }
+
+    }
+
+}

PERWAPI/MethSigClass.cs

@@ -0,0 +1,343 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    public class MethSig
+    {
+        internal string name;
+        internal CallConv callConv = CallConv.Default;
+        internal Type retType;
+        internal Type[] parTypes, optParTypes;
+        internal uint numPars = 0, numOptPars = 0, numGenPars = 0;
+        //uint sigIx;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal MethSig(string nam)
+        {
+            name = nam;
+        }
+
+        internal MethSig InstantiateGenTypes(Class classType, Type[] genTypes)
+        {
+            MethSig newSig = new MethSig(name);
+            newSig.callConv = callConv;
+            newSig.numPars = numPars;
+            newSig.numOptPars = numOptPars;
+            newSig.numGenPars = numGenPars;
+            newSig.parTypes = ReplaceGenPars(parTypes, classType, genTypes);
+            newSig.optParTypes = ReplaceGenPars(optParTypes, classType, genTypes);
+            newSig.retType = SubstituteType(retType, classType, genTypes);
+            return newSig;
+        }
+
+        private Type[] ReplaceGenPars(Type[] typeList, MetaDataElement paren, Type[] genTypes)
+        {
+            if (typeList == null) return null;
+            Type[] newList = new Type[typeList.Length];
+            for (int i = 0; i < typeList.Length; i++)
+            {
+                newList[i] = SubstituteType(typeList[i], paren, genTypes);
+            }
+            return newList;
+        }
+
+        private Type SubstituteType(Type origType, MetaDataElement paren, Type[] genTypes)
+        {
+            if ((origType is GenericParam) && (((GenericParam)origType).GetParent() == paren))
+                return genTypes[((GenericParam)origType).Index];
+            return origType;
+        }
+
+        internal void SetParTypes(Param[] parList)
+        {
+            if (parList == null) { numPars = 0; return; }
+            numPars = (uint)parList.Length;
+            parTypes = new Type[numPars];
+            for (int i = 0; i < numPars; i++)
+            {
+                parTypes[i] = parList[i].GetParType();
+            }
+        }
+
+        internal void ChangeParTypes(ClassDef newType, ClassDef[] oldTypes)
+        {
+            System.Diagnostics.Debug.Assert(newType != null);
+            for (int i = 0; i < oldTypes.Length; i++)
+            {
+                if (retType == oldTypes[i]) retType = newType;
+                for (int j = 0; j < numPars; j++)
+                {
+                    if (parTypes[j] == oldTypes[i])
+                        parTypes[j] = newType;
+                }
+                for (int j = 0; j < numOptPars; j++)
+                {
+                    if (optParTypes[j] == oldTypes[i])
+                        optParTypes[j] = newType;
+                }
+            }
+        }
+
+        internal Type MakeRefRetType()
+        {
+            if (retType is ClassDef)
+            {
+                return ((ClassDef)retType).MakeRefOf();
+            }
+            else
+            {
+                return retType;
+            }
+        }
+
+        internal Type[] MakeRefParTypes()
+        {
+            Type[] pTypes = new Type[numPars];
+            for (int i = 0; i < numPars; i++)
+            {
+                if (parTypes[i] is ClassDef)
+                {
+                    pTypes[i] = ((ClassDef)parTypes[i]).MakeRefOf();
+                }
+                else
+                {
+                    pTypes[i] = parTypes[i];
+                }
+            }
+            return pTypes;
+        }
+
+        /*
+         *     internal bool HasNameAndSig(string name, Type[] sigTypes) {
+              if (this.name.CompareTo(name) != 0) return false;
+              return HasSig(sigTypes);
+            }
+
+            internal bool HasNameAndSig(string name, Type[] sigTypes, Type[] optTypes) {
+              if (this.name.CompareTo(name) != 0) return false;
+              return HasSig(sigTypes,optTypes);
+            }
+            */
+
+        internal bool HasSig(Type[] sigTypes)
+        {
+            if (sigTypes == null) return (numPars == 0);
+            if (sigTypes.Length != numPars) return false;
+            for (int i = 0; i < numPars; i++)
+            {
+                if (!sigTypes[i].SameType(parTypes[i]))
+                    return false;
+            }
+            return (optParTypes == null) || (optParTypes.Length == 0);
+        }
+
+        internal bool HasSig(Type[] sigTypes, Type[] optTypes)
+        {
+            if (sigTypes == null)
+            {
+                if (numPars > 0) return false;
+                if (optTypes == null) return (numOptPars == 0);
+            }
+            if (sigTypes.Length != numPars) return false;
+            for (int i = 0; i < numPars; i++)
+            {
+                if (!sigTypes[i].SameType(parTypes[i]))
+                    return false;
+            }
+            if (optTypes == null) return numOptPars == 0;
+            if (optTypes.Length != numOptPars) return false;
+            for (int i = 0; i < optTypes.Length; i++)
+            {
+                if (!optTypes[i].SameType(optParTypes[i]))
+                    return false;
+            }
+            return true;
+        }
+        /*    
+           internal void CheckParTypes(Param[] parList) {
+             //numGenPars = 0;
+             for (int i=0; i < numPars; i++) {
+               if (parTypes[i] is GenericParam)
+                 numGenPars++;
+             }
+             if (numGenPars > 0)
+               callConv |= CallConv.Generic;
+             else if ((callConv & CallConv.Generic) > 0)
+               callConv ^= CallConv.Generic;
+           }
+           */
+
+        internal void TypeSig(MemoryStream sig)
+        {
+            sig.WriteByte((byte)callConv);
+            if (numGenPars > 0) 
+                MetaDataOut.CompressNum(BlobUtil.CompressUInt(numGenPars), sig);
+            MetaDataOut.CompressNum(BlobUtil.CompressUInt(numPars + numOptPars), sig);
+            retType.TypeSig(sig);
+            for (int i = 0; i < numPars; i++)
+            {
+                parTypes[i].TypeSig(sig);
+            }
+            if (numOptPars > 0)
+            {
+                sig.WriteByte((byte)ElementType.Sentinel);
+                for (int i = 0; i < numOptPars; i++)
+                {
+                    optParTypes[i].TypeSig(sig);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Check to see if the method signature has a particular calling convention.
+        /// </summary>
+        /// <param name="callCon">The convention to check to see if the method has.</param>
+        /// <returns>Ture if the calling convention exists on the method.</returns>
+        internal bool HasCallConv(CallConv callCon)
+        {
+            return ((callConv & callCon) == callCon);
+        }
+
+        internal void WriteCallConv(CILWriter output)
+        {
+            if ((callConv & CallConv.Instance) != 0)
+            {
+                output.Write("instance ");
+                if ((callConv & CallConv.InstanceExplicit) == CallConv.InstanceExplicit)
+                {
+                    output.Write("explicit ");
+                }
+            }
+            uint callKind = (uint)callConv & 0x07;
+            switch (callKind)
+            {
+                case 0: break;
+                case 1: output.Write("unmanaged cdecl "); break;
+                case 2: output.Write("unmanaged stdcall "); break;
+                case 3: output.Write("unmanaged thiscall "); break;
+                case 4: output.Write("unmanaged fastcall "); break;
+                case 5: output.Write("vararg "); break;
+            }
+        }
+
+        internal void Write(CILWriter output)
+        {
+            WriteCallConv(output);
+            retType.WriteType(output);
+        }
+
+        internal void WriteParTypes(CILWriter output)
+        {
+            output.Write("(");
+            for (int i = 0; i < numPars; i++)
+            {
+                parTypes[i].WriteType(output);
+                if ((i < numPars - 1) || (numOptPars > 0))
+                    output.Write(", ");
+            }
+            for (int i = 0; i < numOptPars; i++)
+            {
+                optParTypes[i].WriteType(output);
+                if (i < numPars - 1)
+                    output.Write(", ");
+            }
+            output.Write(")");
+        }
+
+        internal string NameString()
+        {
+            string parString = "(";
+            if (numPars > 0)
+            {
+                parString += parTypes[0].NameString();
+                for (int i = 1; i < numPars; i++)
+                {
+                    parString += "," + parTypes[i].NameString();
+                }
+            }
+            if (numOptPars > 0)
+            {
+                if (numPars > 0) parString += ",";
+                parString += optParTypes[0].NameString();
+                for (int i = 1; i < numOptPars; i++)
+                {
+                    parString += "," + optParTypes[i].NameString();
+                }
+            }
+            return name + parString + ")";
+        }
+
+        internal void BuildTables(MetaDataOut md)
+        {
+            if (!retType.isDef())
+                retType.BuildMDTables(md);
+            for (int i = 0; i < numPars; i++)
+            {
+                if (!parTypes[i].isDef())
+                    parTypes[i].BuildMDTables(md);
+            }
+            for (int i = 0; i < numOptPars; i++)
+            {
+                if (!optParTypes[i].isDef())
+                    optParTypes[i].BuildMDTables(md);
+            }
+        }
+
+        internal void BuildCILInfo(CILWriter output)
+        {
+            if (!retType.isDef())
+                retType.BuildCILInfo(output);
+            for (int i = 0; i < numPars; i++)
+            {
+                if (!parTypes[i].isDef())
+                    parTypes[i].BuildCILInfo(output);
+            }
+            for (int i = 0; i < numOptPars; i++)
+            {
+                if (!optParTypes[i].isDef())
+                    optParTypes[i].BuildCILInfo(output);
+            }
+        }
+
+        internal void BuildSignatures(MetaDataOut md)
+        {
+            if (!retType.isDef())
+                retType.BuildSignatures(md);
+            for (int i = 0; i < numPars; i++)
+            {
+                if (!parTypes[i].isDef())
+                    parTypes[i].BuildSignatures(md);
+            }
+            for (int i = 0; i < numOptPars; i++)
+            {
+                if (!optParTypes[i].isDef())
+                    optParTypes[i].BuildSignatures(md);
+            }
+        }
+
+    }
+
+
+}

PERWAPI/NativeTypes.cs

@@ -0,0 +1,157 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    // Descriptors for Native Types for parameter marshalling
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptors for native types used for marshalling
+    /// </summary>
+    public class NativeType
+    {
+        public static readonly NativeType Void = new NativeType(0x01);
+        public static readonly NativeType Boolean = new NativeType(0x02);
+        public static readonly NativeType Int8 = new NativeType(0x03);
+        public static readonly NativeType UInt8 = new NativeType(0x04);
+        public static readonly NativeType Int16 = new NativeType(0x05);
+        public static readonly NativeType UInt16 = new NativeType(0x06);
+        public static readonly NativeType Int32 = new NativeType(0x07);
+        public static readonly NativeType UInt32 = new NativeType(0x08);
+        public static readonly NativeType Int64 = new NativeType(0x09);
+        public static readonly NativeType UInt64 = new NativeType(0x0A);
+        public static readonly NativeType Float32 = new NativeType(0x0B);
+        public static readonly NativeType Float64 = new NativeType(0x0C);
+        public static readonly NativeType Currency = new NativeType(0x0F);
+        public static readonly NativeType BStr = new NativeType(0x13);
+        public static readonly NativeType LPStr = new NativeType(0x14);
+        public static readonly NativeType LPWStr = new NativeType(0x15);
+        public static readonly NativeType LPTStr = new NativeType(0x16);
+        public static readonly NativeType FixedSysString = new NativeType(0x17);
+        public static readonly NativeType IUnknown = new NativeType(0x19);
+        public static readonly NativeType IDispatch = new NativeType(0x1A);
+        public static readonly NativeType Struct = new NativeType(0x1B);
+        public static readonly NativeType Interface = new NativeType(0x1C);
+        public static readonly NativeType Int = new NativeType(0x1F);
+        public static readonly NativeType UInt = new NativeType(0x20);
+        public static readonly NativeType ByValStr = new NativeType(0x22);
+        public static readonly NativeType AnsiBStr = new NativeType(0x23);
+        public static readonly NativeType TBstr = new NativeType(0x24);
+        public static readonly NativeType VariantBool = new NativeType(0x25);
+        public static readonly NativeType FuncPtr = new NativeType(0x26);
+        public static readonly NativeType AsAny = new NativeType(0x28);
+        private static readonly NativeType[] nativeTypes = { null, Void, Boolean, Int8,  
+                                                               UInt8, Int16, UInt16, Int32,
+                                                               UInt32, Int64,  UInt64, 
+                                                               Float32,  Float64, null, null,
+                                                               Currency, null, null, null,
+                                                               BStr, LPStr, LPWStr, LPTStr,
+                                                               FixedSysString, null, IUnknown,
+                                                               IDispatch, Struct, Interface,
+                                                               null, null, Int, UInt, null,
+                                                               ByValStr, AnsiBStr, TBstr,
+                                                               VariantBool, FuncPtr, null,
+                                                               AsAny};
+
+        protected byte typeIndex;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal NativeType(byte tyIx) { typeIndex = tyIx; }
+
+        internal byte GetTypeIndex() { return typeIndex; }
+
+        internal static NativeType GetNativeType(int ix)
+        {
+            if (ix < nativeTypes.Length)
+                return nativeTypes[ix];
+            return null;
+        }
+
+        internal virtual byte[] ToBlob()
+        {
+            byte[] bytes = new byte[1];
+            bytes[0] = GetTypeIndex();
+            return bytes;
+        }
+
+        internal void Write(CILWriter output)
+        {
+            throw new NotYetImplementedException("Native types for CIL");
+        }
+
+    }
+
+    /**************************************************************************/
+    public class NativeArray : NativeType
+    {
+        NativeType elemType;
+        uint len = 0, parNum = 0, elemMult = 1;
+        internal static readonly byte ArrayTag = 0x2A;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        public NativeArray(NativeType elemType)
+            : base((byte)NativeTypeIx.Array)
+        {
+            this.elemType = elemType;
+        }
+
+        public NativeArray(NativeType elemType, int len)
+            : base((byte)NativeTypeIx.Array)
+        {
+            this.elemType = elemType;
+            this.len = (uint)len;
+        }
+
+        public NativeArray(NativeType elemType, int numElem, int parNumForLen)
+            : base((byte)NativeTypeIx.Array)
+        {
+            this.elemType = elemType;
+            len = (uint)numElem;
+            parNum = (uint)parNumForLen;
+        }
+
+        internal NativeArray(NativeType elemType, uint pNum, uint elemMult, uint numElem)
+            : base((byte)NativeTypeIx.Array)
+        {
+            this.elemType = elemType;
+            parNum = pNum;
+            this.elemMult = elemMult;
+            len = numElem;
+        }
+
+        internal override byte[] ToBlob()
+        {
+            MemoryStream str = new MemoryStream();
+            str.WriteByte(GetTypeIndex());
+            if (elemType == null) str.WriteByte(0x50);  // no info (MAX)
+            else str.WriteByte(elemType.GetTypeIndex());
+            MetaDataOut.CompressNum(BlobUtil.CompressUInt(parNum), str);
+            MetaDataOut.CompressNum(BlobUtil.CompressUInt(elemMult), str);
+            MetaDataOut.CompressNum(BlobUtil.CompressUInt(len), str);
+            return str.ToArray();
+        }
+
+    }
+}

PERWAPI/PDBClasses.cs

@@ -0,0 +1,938 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+// If the compilation requires the use of the original
+// SimpleWriter.dll
+// then define the following symbol
+// #define SIMPLEWRITER
+// without this symbol, the code requires SymbolRW.
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Diagnostics;
+using System.Diagnostics.SymbolStore;
+using QSy = QUT.Symbols;
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************  
+     * Classes related to PDB                                                 *
+     **************************************************************************/
+
+    #region PDB Classes
+
+    /// <summary>
+    /// Writes PDB files
+    /// </summary>
+    public class PDBWriter
+    {
+        private ArrayList _docWriters = new ArrayList();
+        private ArrayList methods = new ArrayList();
+        private Method currentMethod = null;
+        private Scope currentScope = null;
+        private string filename;
+        private byte[] debugInfo;
+        private SymbolToken entryPoint;
+
+        /// <summary>
+        /// The name of the PE file this PDB file belongs to.
+        /// </summary>
+        public string PEFilename
+        {
+            get { return filename; }
+        }
+
+        /// <summary>
+        /// The name of the PDB file being written.
+        /// </summary>
+        public string PDBFilename
+        {
+            get { return Path.ChangeExtension(filename, ".pdb"); }
+        }
+
+        /// <summary>
+        /// Provide access to the debug info which needs to be written to the PE file.
+        /// This is only available after the call to WritePDBFile() has been made.
+        /// </summary>
+        public byte[] DebugInfo
+        {
+            get
+            {
+                if (debugInfo == null) throw new Exception("DeugInfo is only available after calling WritePDBFile()");
+                return debugInfo;
+            }
+        }
+
+        /// <summary>
+        /// Create a new instance of the PDB Writer
+        /// </summary>
+        /// <param name="PEFilename">The name of the PE file we are writting the PDB file for.</param>
+        public PDBWriter(string PEFilename)
+        {
+            filename = PEFilename;
+        }
+
+        /// <summary>
+        /// Set the entry method of the applicaiton
+        /// </summary>
+        /// <param name="token">The token for the entry method.</param>
+        public void SetEntryPoint(int token)
+        {
+            entryPoint = new SymbolToken(token);
+        }
+
+        /// <summary>
+        /// Open a new scope.
+        /// </summary>
+        /// <param name="offset">Offset as to where the scope should start.</param>
+        public void OpenScope(int offset)
+        {
+
+            // Make sure we are in a method
+            if (currentMethod == null)
+                throw new Exception("You can not open a scope before opening a method.");
+
+            // Create and add the new scope
+            Scope scope = new Scope();
+            scope.OffsetStart = offset;
+            scope.ParentScope = currentScope;
+
+            // Check if this is the first/root scope or a child scope.
+            if (currentScope == null)
+            {
+
+                // Check to make sure we don't try to create two root scopes.
+                if (currentMethod.Scope != null)
+                    throw new Exception("Only one top-most scope is permitted.");
+
+                currentMethod.Scope = scope;
+            }
+            else
+            {
+                currentScope.ChildScopes.Add(scope);
+            }
+
+            // Set the current scope
+            currentScope = scope;
+
+        }
+
+        /// <summary>
+        /// Close the current scope at the given offset.
+        /// </summary>
+        /// <param name="offset">The offset of where to close the scope.</param>
+        public void CloseScope(int offset)
+        {
+
+            // Make sure a scope is open
+            if (currentScope == null)
+                throw new Exception("You can not close a scope now, none are open.");
+
+            // Set the end offset for this scope and close it.
+            currentScope.OffsetEnd = offset;
+            currentScope = currentScope.ParentScope;
+
+        }
+
+        /// <summary>
+        /// Bind a local to the current scope.
+        /// </summary>
+        /// <param name="name">The name of the variable.</param>
+        /// <param name="idx">The index of the variable in the locals table.</param>
+        /// <param name="token">The symbol token for the given variable.</param>
+        /// <param name="startOffset">The starting offset for the binding.  Set to 0 to default to current scope.</param>
+        /// <param name="endOffset">The ending offset for the binding.  Set to 0 to default to current scope.</param>
+        public void BindLocal(string name, int idx, uint token, int startOffset, int endOffset)
+        {
+
+            // Check to make sure a scope is open
+            if (currentScope == null)
+                throw new Exception("You must have an open scope in order to bind locals.");
+
+            // Create the new local binding object
+            LocalBinding lb = new LocalBinding();
+            lb.Name = name;
+            lb.Index = idx;
+            lb.Token = new SymbolToken((int)token);
+            lb.OffsetStart = startOffset;
+            lb.OffsetEnd = endOffset;
+
+            // Add to the current scope
+            currentScope.Locals.Add(lb);
+
+        }
+
+        /// <summary>
+        /// Adds a given ConstantBinding to the current scope.
+        /// </summary>
+        /// <param name="binding">The constant to add to this scope.</param>
+        /* Not supported at this time.  Doesn't work correctly.  AKB 2007-02-03
+        public void BindConstant(ConstantBinding binding) {
+
+            // Check to make sure a scope is open
+            if (currentScope == null)
+                throw new Exception("You must have an open scope in order to bind a constant.");
+
+            // Add the constants to the current scope
+            currentScope.Constants.Add(binding);
+
+        }
+        */
+
+        /// <summary>
+        /// Add a new sequnce point.
+        /// </summary>
+        /// <param name="sourceFile">The source file the sequence point is in.</param>
+        /// <param name="docLanguage">The language of the source file.</param>
+        /// <param name="langVendor">The language vendor of the source file.</param>
+        /// <param name="docType">The document type.</param>
+        /// <param name="offset">The offset of the sequence point.</param>
+        /// <param name="line">The starting line for the sequence point.</param>
+        /// <param name="col">The starting column for the sequence point.</param>
+        /// <param name="endLine">The ending line for the sequence point.</param>
+        /// <param name="endCol">The ending column for the sequence point.</param>
+        public void AddSequencePoint(string sourceFile, Guid docLanguage, Guid langVendor, Guid docType, int offset, int line, int col, int endLine, int endCol)
+        {
+            Document sourceDoc = null;
+
+            // Make sure we are in a method
+            if (currentMethod == null)
+                throw new Exception("You can not add sequence points before opening a method.");
+
+            // Check if a reference for this source document already exists
+            foreach (Document doc in _docWriters)
+                if (sourceFile == doc._file && docLanguage == doc._docLanguage && langVendor == doc._langVendor && docType == doc._docType)
+                {
+                    sourceDoc = doc;
+                    break;
+                }
+
+            // If no existing document, create a new one
+            if (sourceDoc == null)
+            {
+                sourceDoc = new Document();
+                sourceDoc._file = sourceFile;
+                sourceDoc._docLanguage = docLanguage;
+                sourceDoc._langVendor = langVendor;
+                sourceDoc._docType = docType;
+                _docWriters.Add(sourceDoc);
+            }
+
+            SequencePointList spList = (SequencePointList)currentMethod.SequencePointList[sourceDoc];
+
+            if (spList == null)
+                currentMethod.SequencePointList.Add(sourceDoc, spList = new SequencePointList());
+
+            spList.offsets.Add(offset);
+            spList.lines.Add(line);
+            spList.cols.Add(col);
+            spList.endLines.Add(endLine);
+            spList.endCols.Add(endCol);
+        }
+
+        /// <summary>
+        /// Open a method.  Scopes and sequence points will be added to this method.
+        /// </summary>
+        /// <param name="token">The token for this method.</param>
+        public void OpenMethod(int token)
+        {
+
+            // Add this new method to the list of methods
+            Method meth = new Method();
+            meth.Token = new SymbolToken(token);
+            methods.Add(meth);
+
+            // Set the current method
+            currentMethod = meth;
+
+        }
+
+        /// <summary>
+        /// Close the current method.
+        /// </summary>
+        public void CloseMethod()
+        {
+
+            // Make sure a method is open
+            if (currentMethod == null)
+                throw new Exception("No methods currently open.");
+
+            // Check to make sure all scopes have been closed.
+            if (currentScope != null)
+                throw new Exception("Can not close method until all scopes are closed.  Method Token: " + currentMethod.Token.ToString());
+
+            // Change the current method to null
+            currentMethod = null;
+
+        }
+
+        /// <summary>
+        /// Write the PDB file to disk.
+        /// </summary>
+        public void WritePDBFile()
+        {
+
+            /* 
+             * Write default template PDB file first
+             * 
+             * NOTE: This is a dodgy hack so please feel free to change! AKB 06-01-2007
+             * 
+             * For some reason if there isn't a PDB file to start with the
+             * debugger used to step through the resulting PDB file will 
+             * jump all over the place.  Resulting in incorrect step-throughs.
+             * I have not been able to work out why yet but I think it has
+             * something to do with the call to GetWriterForFile().
+             * Also, it doesn't happen on all PDB files.
+             * It is interesting to note that if it is writting a debug file 
+             * to go with a PE file compiled by csc (MS Compiler) it works fine.
+             */
+
+            // Get the blank PDB file from the resource assembly
+            System.Reflection.Assembly currentAssembly = System.Reflection.Assembly.GetExecutingAssembly();
+            Stream blankPDB = currentAssembly.GetManifestResourceStream("PERWAPI.Blank.pdb");
+
+            // Write the blank PDB file to the disk
+            using (FileStream fs = new FileStream(PDBFilename, FileMode.OpenOrCreate, FileAccess.Write))
+            {
+                BinaryWriter bw = new BinaryWriter(fs);
+
+                // Loop through the PDB file and write it to the disk
+                byte[] buffer = new byte[32768];
+                while (true)
+                {
+                    int read = blankPDB.Read(buffer, 0, buffer.Length);
+                    if (read <= 0) break;
+                    bw.Write(buffer, 0, read);
+                }
+
+                // Close all of the streams we have opened
+                bw.Close();
+                fs.Close();
+            }
+
+            // Create the new Symbol Writer
+            QSy.SymbolWriter symWriter = new QSy.SymbolWriter(PEFilename, PDBFilename);
+            // Add each of the source documents
+            foreach (Document doc in _docWriters)
+            {
+#if SIMPLEWRITER
+                doc._docWriter = symWriter.DefineDocument(
+                    doc._file,
+                    doc._docLanguage,
+                    doc._langVendor,
+                    doc._docType
+                );
+                // Set the entry point if it exists
+                if (entryPoint.GetToken() != 0)
+                    symWriter.SetUserEntryPoint(entryPoint.GetToken());
+#else 
+                doc.docWriter = symWriter.DefineDocument(
+                    doc._file,
+                    ref doc._docLanguage,
+                    ref doc._langVendor,
+                    ref doc._docType
+                );
+                // Set the entry point if it exists
+                if (entryPoint.GetToken() != 0)
+                    symWriter.SetUserEntryPoint(entryPoint);
+#endif // SIMPLEWRITER
+            }
+            // Loop through and add each method
+            foreach (Method meth in methods)
+            {
+#if SIMPLEWRITER
+                symWriter.OpenMethod(meth.Token.GetToken());
+#else
+                symWriter.OpenMethod(meth.Token);
+#endif
+                // Write the scope and the locals
+                if (meth.Scope != null) WriteScopeAndLocals(symWriter, meth.Scope);
+
+                // Add each of the sequence points
+                foreach (Document sourceDoc in meth.SequencePointList.Keys)
+                {
+                    SequencePointList spList = (SequencePointList)meth.SequencePointList[sourceDoc];
+#if SIMPLEWRITER
+                    symWriter.DefineSequencePoints(sourceDoc._docWriter,
+                        (uint[])spList.offsets.ToArray(typeof(int)),
+                        (uint[])spList.lines.ToArray(typeof(int)),
+                        (uint[])spList.cols.ToArray(typeof(int)),
+                        (uint[])spList.endLines.ToArray(typeof(int)),
+                        (uint[])spList.endCols.ToArray(typeof(int)));
+#else
+                    symWriter.DefineSequencePoints(sourceDoc.docWriter,
+                        (int[])spList.offsets.ToArray(typeof(int)),
+                        (int[])spList.lines.ToArray(typeof(int)),
+                        (int[])spList.cols.ToArray(typeof(int)),
+                        (int[])spList.endLines.ToArray(typeof(int)),
+                        (int[])spList.endCols.ToArray(typeof(int)));
+#endif // SIMPLEWRITER
+                }
+                symWriter.CloseMethod();
+            }
+
+            // Get the debug info
+            debugInfo = symWriter.GetDebugInfo();
+            // Close the PDB file
+            symWriter.Close();
+
+        }
+
+        /// <summary>
+        /// Write out the scopes and the locals to the PDB file.
+        /// </summary>
+        /// <param name="symWriter">The symbol writer for this file.</param>
+        /// <param name="scope">The scope to write out.</param>
+        private void WriteScopeAndLocals(QSy.SymbolWriter symWriter, Scope scope)
+        {
+            // Open the scope
+            symWriter.OpenScope(scope.OffsetStart);
+
+            // Add each local variable
+            foreach (LocalBinding lb in scope.Locals)
+            {
+                symWriter.DefineLocalVariable2(
+                    lb.Name,
+                    0,
+#if SIMPLEWRITER
+                    lb.Token.GetToken(),
+#else
+                    lb.Token,              
+#endif
+                    1,
+                    lb.Index,
+                    0,
+                    0,
+                    lb.OffsetStart,
+                    lb.OffsetEnd
+                );
+            }
+
+            // Add each constants
+            /* For now don't add constants.  Doesn't work. AKB 09-01-2007
+            foreach (ConstantBinding cb in scope.Constants) {
+                symWriter.DefineConstant(
+                    cb.Name,
+                    cb.Value,
+                    cb.GetSig()
+                );
+            }
+            */
+
+            // Add any child scopes
+            foreach (Scope childScope in scope.ChildScopes)
+                WriteScopeAndLocals(symWriter, childScope);
+
+            // Close the scope
+            symWriter.CloseScope(scope.OffsetEnd);
+
+        }
+
+        /// <summary>
+        /// A list of sequence points.
+        /// </summary>
+        private class SequencePointList
+        {
+            internal ArrayList offsets = new ArrayList();
+            internal ArrayList lines = new ArrayList();
+            internal ArrayList cols = new ArrayList();
+            internal ArrayList endLines = new ArrayList();
+            internal ArrayList endCols = new ArrayList();
+        }
+
+        /// <summary>
+        /// A source file document.
+        /// </summary>
+        private class Document
+        {
+            internal string _file;
+            internal Guid _docLanguage, _langVendor, _docType;
+#if SIMPLEWRITER
+            internal ulong _docWriter;
+#else
+            internal object docWriter;
+#endif
+        }
+
+        /// <summary>
+        /// A method.
+        /// </summary>
+        private class Method
+        {
+            internal SymbolToken Token;
+            internal Scope Scope = null;
+            internal Hashtable SequencePointList = new Hashtable();
+        }
+
+        /// <summary>
+        /// A scope.
+        /// </summary>
+        private class Scope
+        {
+            internal int OffsetStart;
+            internal int OffsetEnd;
+            internal Scope ParentScope = null;
+            internal ArrayList Locals = new ArrayList();
+            internal ArrayList Constants = new ArrayList();
+            internal ArrayList ChildScopes = new ArrayList();
+        }
+
+        /// <summary>
+        /// A local binding.
+        /// </summary>
+        private class LocalBinding
+        {
+            internal string Name;
+            internal int Index;
+            internal SymbolToken Token;
+            internal int OffsetStart;
+            internal int OffsetEnd;
+        }
+
+    }
+
+    /// <summary>
+    /// Read a given PDB file.
+    /// </summary>
+    public class PDBReader
+    {
+        //private static Guid IID_IMetaDataImport = new Guid("7DAC8207-D3AE-4c75-9B67-92801A497D44");
+        //private static Guid CLSID_CorSymBinder = new Guid("AA544D41-28CB-11d3-BD22-0000F80849BD");
+        private ISymbolReader _reader;
+        private string _fileName;
+
+        /// <summary>
+        /// Read the given PDB file by filename.
+        /// </summary>
+        /// <param name="fileName">The filename and path to the PDB file.</param>
+        public PDBReader(string fileName)
+        {
+            _reader = (ISymbolReader)(new QSy.SymbolReader(fileName));
+            _fileName = fileName;
+        }
+
+        /// <summary>
+        /// Return a particular method.
+        /// </summary>
+        /// <param name="token">The token to identify the method.</param>
+        /// <returns>The method with the given token.</returns>
+        public PDBMethod GetMethod(int token)
+        {
+            try
+            {
+                ISymbolMethod method = _reader.GetMethod(new SymbolToken(token));
+
+                if (method != null)
+                    return new PDBMethod(method);
+                else
+                    return null;
+            }
+            catch
+            {
+                return null; // call fails on tokens which are not referenced
+            }
+        }
+
+    }
+
+    /// <summary>
+    /// Defines debug information for a method.
+    /// </summary>
+    public class PDBMethod
+    {
+        private ISymbolMethod _meth;
+
+        /// <summary>
+        /// Create a new PDB method object from an ISymbolMethod object.
+        /// </summary>
+        /// <param name="meth">The ISymbolMethod object to wrap.</param>
+        internal PDBMethod(ISymbolMethod meth)
+        {
+            _meth = meth;
+        }
+
+        /// <summary>
+        /// The root scope of the method.
+        /// </summary>
+        public PDBScope Scope
+        {
+            get
+            {
+                return new PDBScope(_meth.RootScope);
+            }
+        }
+
+        /// <summary>
+        /// The sequence points in the method.
+        /// </summary>
+        public PDBSequencePoint[] SequencePoints
+        {
+            get
+            {
+                int spCount = _meth.SequencePointCount;
+                int[] offsets = new int[spCount];
+                ISymbolDocument[] documents = new ISymbolDocument[spCount];
+                int[] lines = new int[spCount];
+                int[] cols = new int[spCount];
+                int[] endLines = new int[spCount];
+                int[] endCols = new int[spCount];
+
+                _meth.GetSequencePoints(offsets, documents, lines, cols, endLines, endCols);
+                PDBSequencePoint[] spList = new PDBSequencePoint[spCount];
+
+                for (int i = 0; i < spCount; i++)
+                    spList[i] = new PDBSequencePoint(offsets[i], new PDBDocument(documents[i]), lines[i], cols[i], endLines[i], endCols[i]);
+
+                return spList;
+            }
+        }
+
+    }
+
+    /// <summary>
+    /// Defines a scope in which local variables exist.
+    /// </summary>
+    public class PDBScope
+    {
+        private ISymbolScope _scope;
+
+        /// <summary>
+        /// Create a new scope from a ISymbolScope
+        /// </summary>
+        /// <param name="scope"></param>
+        internal PDBScope(ISymbolScope scope)
+        {
+            _scope = scope;
+        }
+
+        /// <summary>
+        /// The starting index for the scope.
+        /// </summary>
+        public int StartOffset
+        {
+            get
+            {
+                return _scope.StartOffset;
+            }
+        }
+
+        /// <summary>
+        /// The end index for the scope.
+        /// </summary>
+        public int EndOffset
+        {
+            get
+            {
+                return _scope.EndOffset;
+            }
+        }
+
+        /// <summary>
+        /// The variables that exist in this scope.
+        /// </summary>
+        public PDBVariable[] Variables
+        {
+            get
+            {
+                ArrayList vars = new ArrayList();
+                foreach (ISymbolVariable var in _scope.GetLocals())
+                    vars.Add(new PDBVariable(var));
+
+                return (PDBVariable[])vars.ToArray(typeof(PDBVariable));
+            }
+        }
+
+        /// <summary>
+        /// The sub-scopes within this scope.
+        /// </summary>
+        public PDBScope[] Children
+        {
+            get
+            {
+                ArrayList children = new ArrayList();
+                foreach (ISymbolScope child in _scope.GetChildren())
+                    children.Add(new PDBScope(child));
+
+                return (PDBScope[])children.ToArray(typeof(PDBScope));
+            }
+        }
+
+    }
+
+    /// <summary>
+    /// Defines a reference to one section of code to be highlighted when 
+    /// stepping through in debug mode.  Typically one line of code.
+    /// </summary>
+    public class PDBSequencePoint
+    {
+        internal PDBDocument _document;
+        internal int _offset;
+        internal int _line;
+        internal int _column;
+        internal int _endLine;
+        internal int _endColumn;
+
+        /// <summary>
+        /// Create a new sequence point.
+        /// </summary>
+        /// <param name="offset"></param>
+        /// <param name="doc">The source file.</param>
+        /// <param name="line">The line the point begins on.</param>
+        /// <param name="col">The column the point begins with.</param>
+        /// <param name="endLine">The line the point ends on.</param>
+        /// <param name="endCol">The column the point ends with.</param>
+        internal PDBSequencePoint(int offset, PDBDocument doc, int line, int col, int endLine, int endCol)
+        {
+            _offset = offset;
+            _document = doc;
+            _line = line;
+            _column = col;
+            _endLine = endLine;
+            _endColumn = endCol;
+        }
+
+        /// <summary>
+        /// The source file for this sequence point.
+        /// </summary>
+        public PDBDocument Document
+        {
+            get
+            {
+                return _document;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Offset
+        {
+            get
+            {
+                return _offset;
+            }
+        }
+
+        /// <summary>
+        /// The line this sequence point starts on.
+        /// </summary>
+        public int Line
+        {
+            get
+            {
+                return _line;
+            }
+        }
+
+        /// <summary>
+        /// The column this sequnce point starts with.
+        /// </summary>
+        public int Column
+        {
+            get
+            {
+                return _column;
+            }
+        }
+
+        /// <summary>
+        /// The line this sequence point ends with.
+        /// </summary>
+        public int EndLine
+        {
+            get
+            {
+                return _endLine;
+            }
+        }
+
+        /// <summary>
+        /// The column this sequence point ends with.
+        /// </summary>
+        public int EndColumn
+        {
+            get
+            {
+                return _endColumn;
+            }
+        }
+
+    }
+
+    /// <summary>
+    /// A PDB variable object.  Stores debug information about a variable.
+    /// </summary>
+    public class PDBVariable
+    {
+        private ISymbolVariable _var;
+
+        /// <summary>
+        /// Create a new PDBVariable object from an ISymbolVariable object.
+        /// </summary>
+        /// <param name="var"></param>
+        internal PDBVariable(ISymbolVariable var)
+        {
+            _var = var;
+        }
+
+        /// <summary>
+        /// The name of the variable.
+        /// </summary>
+        public string Name
+        {
+            get
+            {
+                return _var.Name;
+            }
+        }
+
+        /// <summary>
+        /// The address or index of the variable.
+        /// </summary>
+        public int Address
+        {
+            get
+            {
+                return _var.AddressField1;
+            }
+        }
+
+    }
+
+    /// <summary>
+    /// A PDB document is a source file.
+    /// </summary>
+    public class PDBDocument
+    {
+        private ISymbolDocument _doc;
+
+        /// <summary>
+        /// Create a new document object from an existing document.
+        /// </summary>
+        /// <param name="doc">The ISymbolDocument to wrap.</param>
+        internal PDBDocument(ISymbolDocument doc)
+        {
+            _doc = doc;
+        }
+
+        /// <summary>
+        /// The language for this document.
+        /// </summary>
+        public Guid Language
+        {
+            get
+            {
+                return _doc.Language; ;
+            }
+        }
+
+        /// <summary>
+        /// The language vendor for this document.
+        /// </summary>
+        public Guid LanguageVendor
+        {
+            get
+            {
+                return _doc.LanguageVendor;
+            }
+        }
+
+        /// <summary>
+        /// The type for this document.
+        /// </summary>
+        public Guid DocumentType
+        {
+            get
+            {
+                return _doc.DocumentType;
+            }
+        }
+
+        /// <summary>
+        /// The path/url to the source file.
+        /// </summary>
+        public string URL
+        {
+            get
+            {
+                return _doc.URL; ;
+            }
+        }
+
+    }
+
+    /**************************************************************************/
+    // Added to enable PDB reading
+
+    internal class MergeBuffer
+    {
+        private CILInstruction[] _buffer;
+        private ArrayList _debugBuffer;
+        private int _current;
+
+        public MergeBuffer(CILInstruction[] buffer)
+        {
+            _debugBuffer = new ArrayList();
+            _buffer = buffer;
+        }
+
+        public void Add(CILInstruction inst, uint offset)
+        {
+            while (_current < _buffer.Length && _buffer[_current].offset < offset)
+                _debugBuffer.Add(_buffer[_current++]);
+            if (_debugBuffer.Count > 0 && offset >= ((CILInstruction)_debugBuffer[_debugBuffer.Count - 1]).offset)
+            {
+                inst.offset = offset;
+                _debugBuffer.Add(inst);
+            }
+            else
+            {
+                int i;
+                for (i = 0; i < _debugBuffer.Count; i++)
+                    if (((CILInstruction)_debugBuffer[i]).offset > offset)
+                        break;
+                inst.offset = offset;
+                _debugBuffer.Insert((i > 0 ? i - 1 : i), inst);
+            }
+        }
+
+        /// <summary>
+        /// Tests if Instructions begin and end with an OpenScope/CloseScope pair
+        /// </summary>
+        /// <returns>True if there is a root scope</returns>
+        public bool hasRootScope()
+        {
+            return (_debugBuffer.Count > 0 && _debugBuffer[0] is OpenScope);
+        }
+
+        public CILInstruction[] Instructions
+        {
+            get
+            {
+                while (_current < _buffer.Length)
+                    _debugBuffer.Add(_buffer[_current++]);
+                return (CILInstruction[])_debugBuffer.ToArray(typeof(CILInstruction));
+            }
+        }
+    }
+
+
+    #endregion
+    /**************************************************************************/  
+
+}

PERWAPI/PEFile.cs

@@ -0,0 +1,591 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    /**************************************************************************/
+    /**************************************************************************/
+    // Base Class for PE Files
+    /**************************************************************************/
+    /**************************************************************************/
+    /**************************************************************************/
+    /// <summary>
+    /// Base class for the PEFile (starting point)
+    /// </summary>
+    public class PEFile : Module
+    {
+        private string outputDir, fileName;
+        private Stream outStream;
+        private Assembly thisAssembly;
+        PEWriter output;
+        MetaDataOut metaData;
+        System.IO.FileStream unmanagedResources;
+        internal MetaDataTables metaDataTables;
+        internal PEFileVersionInfo versionInfo;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        /// <summary>
+        /// Create a new PE File with the name "fileName".  If "fileName" ends in ".dll" then
+        /// the file is a dll, otherwise it is an exe file.  This PE File has no assembly.
+        /// </summary>
+        /// <param name="fileName">Name for the output file.</param>
+        public PEFile(string fileName)
+            : base(fileName)
+        {
+            //PrimitiveType.ClearAddedFlags();   // KJG 18-April-2005 - Now done in MetaDataOut
+            this.fileName = fileName;
+            metaData = new MetaDataOut();
+            versionInfo = new PEFileVersionInfo();
+            versionInfo.SetDefaults(fileName);
+        }
+
+        /// <summary>
+        /// Create a new PE File with the name "fileName".  If "fileName" ends in ".dll" then
+        /// the file is a dll, otherwise it is an exe file.  This file has an Assembly called
+        /// "assemblyName".
+        /// </summary>
+        /// <param name="fileName">Name for the output file</param>
+        /// <param name="assemblyName">Name of the assembly</param>
+        public PEFile(string fileName, string assemblyName)
+            : base(fileName)
+        {
+            //PrimitiveType.ClearAddedFlags();   // KJG 18-April-2005 - Now done in MetaDataOut
+            this.fileName = fileName;
+            thisAssembly = new Assembly(assemblyName, this);
+            metaData = new MetaDataOut();
+            versionInfo = new PEFileVersionInfo();
+            versionInfo.SetDefaults(fileName);
+        }
+
+        /// <summary>
+        /// Read a PE file and create all the data structures to represent it
+        /// </summary>
+        /// <param name="filename">The file name of the PE file</param>
+        /// <returns>PEFile object representing "filename"</returns>
+        public static PEFile ReadPEFile(string filename)
+        {
+            return PEReader.ReadPEFile(filename, false);
+        }
+        /// <summary>
+        /// Read an existing PE File and return the exported interface 
+        /// (ie. anything that was specified as public).  
+        /// All the MetaData structures will be Refs.
+        /// </summary>
+        /// <param name="filename">The name of the pe file</param>
+        /// <returns>The AssemblyRef or ModuleRef describing the exported interface of the specified file</returns>
+        public static ReferenceScope ReadExportedInterface(string filename)
+        {
+            return PEReader.GetExportedInterface(filename);
+        }
+
+        public static PEFile ReadPublicClasses(string filename)
+        {
+            PEFile pefile = PEReader.ReadPEFile(filename, true);
+            ArrayList newClasses = new ArrayList();
+            for (int i = 0; i < pefile.classes.Count; i++)
+            {
+                ClassDef aClass = (ClassDef)pefile.classes[i];
+                if (aClass.isPublic()) newClasses.Add(aClass);
+            }
+            pefile.classes = newClasses;
+            return pefile;
+        }
+
+        /*---------------------------- public set and get methods ------------------------------*/
+
+        /// <summary>
+        /// Get the version of .NET for this PE file
+        /// </summary>
+        /// <returns>.NET version</returns>
+        public NetVersion GetNetVersion()
+        {
+            return versionInfo.netVersion;
+        }
+
+        /// <summary>
+        /// Set the .NET version for this PE file
+        /// </summary>
+        /// <param name="nVer">.NET version</param>
+        public void SetNetVersion(NetVersion nVer)
+        {
+            versionInfo.netVersion = nVer;
+            versionInfo.netVerString = MetaData.versions[(int)versionInfo.netVersion];
+            if ((nVer == NetVersion.Whidbey40) || (nVer == NetVersion.Whidbey41))
+            {
+                versionInfo.tsMinVer = 1;
+            }
+            else
+            {
+                versionInfo.tsMinVer = 0;
+            }
+            if (nVer == NetVersion.Whidbey50)
+            {
+                versionInfo.tsMajVer = 2;
+            }
+            GenericParam.extraField = nVer <= NetVersion.Whidbey40;
+            if (Diag.DiagOn && GenericParam.extraField)
+                Console.WriteLine("Writing extra field for GenericParams");
+        }
+
+        /// <summary>
+        /// Get the .NET version for this PE file
+        /// </summary>
+        /// <returns>string representing the .NET version</returns>
+        public string GetNetVersionString()
+        {
+            return versionInfo.netVerString.Trim();
+        }
+
+        /// <summary>
+        /// Make a descriptor for an external assembly to this PEFile (.assembly extern)
+        /// </summary>
+        /// <param name="assemName">the external assembly name</param>
+        /// <returns>a descriptor for this external assembly</returns>
+        public AssemblyRef MakeExternAssembly(string assemName)
+        {
+            if (assemName.CompareTo(MSCorLib.mscorlib.Name()) == 0) return MSCorLib.mscorlib;
+            return new AssemblyRef(assemName);
+        }
+
+        /// <summary>
+        /// Make a descriptor for an external module to this PEFile (.module extern)
+        /// </summary>
+        /// <param name="name">the external module name</param>
+        /// <returns>a descriptor for this external module</returns>
+        public ModuleRef MakeExternModule(string name)
+        {
+            return new ModuleRef(name);
+        }
+
+        /// <summary>
+        /// Set the directory that the PE File will be written to.  
+        /// The default is the current directory.
+        /// </summary>
+        /// <param name="outputDir">The directory to write the PE File to.</param>
+        public void SetOutputDirectory(string outputDir)
+        {
+            this.outputDir = outputDir;
+        }
+
+        /// <summary>
+        /// Direct PE File output to an existing stream, instead of creating
+        /// a new file.
+        /// </summary>
+        /// <param name="output">The output stream</param>
+        public void SetOutputStream(Stream output)
+        {
+            this.outStream = output;
+        }
+
+        /// <summary>
+        /// Specify if this PEFile is a .dll or .exe
+        /// </summary>
+        public void SetIsDLL(bool isDll)
+        {
+            versionInfo.isDLL = isDll;
+            if (isDll)
+                versionInfo.characteristics = FileImage.dllCharacteristics;
+            else
+                versionInfo.characteristics = FileImage.exeCharacteristics;
+        }
+
+        /// <summary>
+        /// Set the subsystem (.subsystem) (Default is Windows Console mode)
+        /// </summary>
+        /// <param name="subS">subsystem value</param>
+        public void SetSubSystem(SubSystem subS)
+        {
+            versionInfo.subSystem = subS;
+        }
+
+        /// <summary>
+        /// Set the flags (.corflags)
+        /// </summary>
+        /// <param name="flags">the flags value</param>
+        public void SetCorFlags(CorFlags flags)
+        {
+            versionInfo.corFlags = flags;
+        }
+
+        public string GetFileName()
+        {
+            return fileName;
+        }
+
+        public void SetFileName(string filename)
+        {
+            this.fileName = filename;
+        }
+
+        /// <summary>
+        /// Get a Meta Data Element from this PE file
+        /// </summary>
+        /// <param name="token">The meta data token for the required element</param>
+        /// <returns>The meta data element denoted by token</returns>
+        public MetaDataElement GetElement(uint token)
+        {
+            if (buffer != null)
+                return buffer.GetTokenElement(token);
+            if (metaDataTables != null)
+                return metaDataTables.GetTokenElement(token);
+            return null;
+        }
+
+        /// <summary>
+        /// Add a manifest resource to this PEFile 
+        /// </summary>
+        public void AddUnmanagedResources(string resFilename)
+        {
+            if (!System.IO.File.Exists(resFilename))
+                throw (new FileNotFoundException("Unmanaged Resource File Not Found", resFilename));
+            unmanagedResources = System.IO.File.OpenRead(resFilename);
+            throw new NotYetImplementedException("Unmanaged Resources are not yet implemented");
+        }
+
+        /// <summary>
+        /// Add a managed resource to this PEFile.  The resource will be embedded in this PE file. 
+        /// </summary>
+        /// <param name="resName">The name of the managed resource</param>
+        /// <param name="resBytes">The managed resource</param>
+        /// <param name="isPublic">Access for the resource</param>
+        public void AddManagedResource(string resName, byte[] resBytes, bool isPublic)
+        {
+            resources.Add(new ManifestResource(this, resName, resBytes, isPublic));
+        }
+
+        /// <summary>
+        /// Add a managed resource from another assembly.
+        /// </summary>
+        /// <param name="resName">The name of the resource</param>
+        /// <param name="assem">The assembly where the resource is</param>
+        /// <param name="isPublic">Access for the resource</param>
+        public void AddExternalManagedResource(string resName, AssemblyRef assem, bool isPublic)
+        {
+            resources.Add(new ManifestResource(this, resName, assem, 0, isPublic));
+        }
+
+        /// <summary>
+        /// Add a managed resource from another file in this assembly.
+        /// </summary>
+        /// <param name="resName">The name of the resource</param>
+        /// <param name="assem">The assembly where the resource is</param>
+        /// <param name="isPublic">Access for the resource</param>
+        public void AddExternalManagedResource(string resName, ResourceFile resFile, uint offset, bool isPublic)
+        {
+            resources.Add(new ManifestResource(this, resName, resFile, offset, isPublic));
+        }
+
+        /// <summary>
+        /// Add a managed resource from another module in this assembly.
+        /// </summary>
+        /// <param name="resName">The name of the resource</param>
+        /// <param name="assem">The assembly where the resource is</param>
+        /// <param name="isPublic">Access for the resource</param>
+        public void AddExternalManagedResource(string resName, ModuleRef mod, uint offset, bool isPublic)
+        {
+            resources.Add(new ManifestResource(this, resName, mod.modFile, offset, isPublic));
+        }
+
+        /// <summary>
+        /// Add a managed resource from another assembly.
+        /// </summary>
+        /// <param name="mr"></param>
+        /// <param name="isPublic"></param>
+        public void AddExternalManagedResource(ManifestResource mr, bool isPublic)
+        {
+            resources.Add(new ManifestResource(this, mr, isPublic));
+        }
+
+        /// <summary>
+        /// Find a resource
+        /// </summary>
+        /// <param name="name">The name of the resource</param>
+        /// <returns>The resource with the name "name" or null </returns>
+        public ManifestResource GetResource(string name)
+        {
+            for (int i = 0; i < resources.Count; i++)
+            {
+                if (((ManifestResource)resources[i]).Name == name)
+                    return (ManifestResource)resources[i];
+            }
+            return null;
+        }
+
+        public ManifestResource[] GetResources()
+        {
+            return (ManifestResource[])resources.ToArray(typeof(ManifestResource));
+        }
+
+        /// <summary>
+        /// Get the descriptor for this assembly.  The PEFile must have been
+        /// created with hasAssembly = true
+        /// </summary>
+        /// <returns>the descriptor for this assembly</returns>
+        public Assembly GetThisAssembly()
+        {
+            return thisAssembly;
+        }
+
+        public AssemblyRef[] GetImportedAssemblies()
+        {
+            return buffer.GetAssemblyRefs();
+        }
+
+        public string[] GetNamesOfImports()
+        {
+            return buffer.GetAssemblyRefNames();
+        }
+
+        /*------------------------------------------ Output Methods -------------------------------*/
+
+        private void BuildMetaData()
+        {
+            BuildMDTables(metaData);
+            if (thisAssembly != null)
+            {
+                thisAssembly.BuildMDTables(metaData);
+            }
+            metaData.BuildMDTables(); // DoCustomAttributes, BuildSignatures for each in metadata tables
+        }
+
+        /// <summary>
+        /// Write out the PEFile (the "bake" function)
+        /// </summary>
+        /// <param name="debug">include debug information</param>
+        public void WritePEFile(bool writePDB)
+        {
+
+            if (outStream == null)
+            {
+                if (outputDir != null)
+                {
+                    if (!outputDir.EndsWith("\\"))
+                        fileName = outputDir + "\\" + fileName;
+                    else
+                        fileName = outputDir + fileName;
+                }
+                output = new PEWriter(versionInfo, fileName, metaData, writePDB);
+            }
+            else
+            {
+                // Check to make sure we have not been asked to write a PDB
+                if (writePDB) throw new Exception("You can not write PDB data when writing to a stream.  Please try writing to a file instead.");
+
+                output = new PEWriter(versionInfo, outStream, metaData);
+            }
+
+            BuildMetaData();
+            output.MakeFile(versionInfo);
+        }
+
+        /// <summary>
+        /// Makes the assembly debuggable by attaching the DebuggableAttribute
+        /// to the Assembly. Call immediately before calling WritePEFile.
+        /// </summary>
+        /// <param name="allowDebug">set true to enable debugging, false otherwise</param>
+        /// <param name="suppressOpt">set true to disable optimizations that affect debugging</param>
+        public void MakeDebuggable(bool allowDebug, bool suppressOpt)
+        {
+            ClassRef debugRef = null;
+            MethodRef dCtor = null;
+            Type[] twoBools = new Type[] { PrimitiveType.Boolean, PrimitiveType.Boolean };
+            debugRef = MSCorLib.mscorlib.GetClass("System.Diagnostics", "DebuggableAttribute");
+            if (debugRef == null)
+                debugRef = MSCorLib.mscorlib.AddClass("System.Diagnostics", "DebuggableAttribute");
+            dCtor = debugRef.GetMethod(".ctor", twoBools);
+            if (dCtor == null)
+            {
+                dCtor = debugRef.AddMethod(".ctor", PrimitiveType.Void, twoBools);
+                dCtor.AddCallConv(CallConv.Instance);
+            }
+            Constant[] dbgArgs = new Constant[] { new BoolConst(allowDebug), new BoolConst(suppressOpt) };
+            thisAssembly.AddCustomAttribute(dCtor, dbgArgs);
+        }
+
+        /// <summary>
+        /// Write out a CIL text file for this PE file
+        /// </summary>
+        /// <param name="debug">include debug information</param>
+        public void WriteCILFile(bool debug)
+        {
+            string cilFile = fileName.Substring(0, fileName.IndexOf('.')) + ".il";
+            CILWriter writer = new CILWriter(cilFile, debug, this);
+            writer.BuildCILInfo();
+            writer.WriteFile(debug);
+        }
+
+        internal void SetThisAssembly(Assembly assem)
+        {
+            if (Diag.DiagOn) Console.WriteLine("Setting fileScope to assembly " + assem.Name());
+            thisAssembly = assem;
+        }
+
+        internal void AddToResourceList(ManifestResource res)
+        {
+            resources.Add(res);
+        }
+
+        internal void AddToFileList()
+        {
+        }
+
+        internal void SetDLLFlags(ushort dflags)
+        {
+            versionInfo.DLLFlags = dflags;
+        }
+
+        public void ReadPDB()
+        {
+            PDBReader reader = new PDBReader(this.fileName);
+            foreach (ClassDef cDef in GetClasses())
+                foreach (MethodDef mDef in cDef.GetMethods())
+                {
+                    CILInstructions buffer = mDef.GetCodeBuffer();
+                    PDBMethod meth = reader.GetMethod((int)mDef.Token());
+
+                    if (meth == null)
+                        continue; // no symbols for this method
+
+                    PDBSequencePoint[] spList = meth.SequencePoints;
+
+                    MergeBuffer mergeBuffer = new MergeBuffer(buffer.GetInstructions());
+
+                    PDBScope outer = meth.Scope;
+                    Scope root = ReadPDBScope(outer, mergeBuffer, null, mDef);
+                    buffer.currentScope = root;
+                    bool hasRootScope = mergeBuffer.hasRootScope();
+
+                    if (!hasRootScope)
+                        mergeBuffer.Add(new OpenScope(root), (uint)0);
+                    foreach (PDBSequencePoint sp in spList)
+                    {
+                        PDBDocument doc = sp.Document;
+                        mergeBuffer.Add(
+                            new Line((uint)sp.Line, (uint)sp.Column, (uint)sp.EndLine, (uint)sp.EndColumn,
+                            SourceFile.GetSourceFile(doc.URL, doc.Language, doc.LanguageVendor, doc.DocumentType)),
+                            (uint)sp.Offset);
+                    }
+                    if (!hasRootScope)
+                        mergeBuffer.Add(new CloseScope(root), (uint)outer.EndOffset);
+
+                    buffer.SetInstructions(mergeBuffer.Instructions);
+                }
+        }
+
+        private Scope ReadPDBScope(PDBScope scope, MergeBuffer mergeBuffer, Scope parent, MethodDef thisMeth)
+        {
+            Scope thisScope = new Scope(parent, thisMeth);
+
+            if (parent != null) mergeBuffer.Add(new OpenScope(thisScope), (uint)scope.StartOffset);
+
+            foreach (PDBVariable var in scope.Variables)
+                thisScope.AddLocalBinding(var.Name, var.Address);
+
+            foreach (PDBScope child in scope.Children)
+                ReadPDBScope(child, mergeBuffer, thisScope, thisMeth);
+
+            if (parent != null) mergeBuffer.Add(new CloseScope(thisScope), (uint)scope.EndOffset);
+
+            return thisScope;
+        }
+    }
+
+    /**************************************************************************/
+    internal class PEFileVersionInfo
+    {
+
+        private static char[] nulls = { '\0' };
+        internal bool fromExisting;
+        internal ushort characteristics;
+        internal bool isDLL;
+        internal byte lMajor;
+        internal byte lMinor;
+        internal uint fileAlign;
+        internal ushort osMajor;
+        internal ushort osMinor;
+        internal ushort userMajor;
+        internal ushort userMinor;
+        internal ushort subSysMajor;
+        internal ushort subSysMinor;
+        internal SubSystem subSystem;
+        internal ushort DLLFlags = 0;
+        internal ushort cliMajVer;
+        internal ushort cliMinVer;
+        internal CorFlags corFlags = CorFlags.CF_IL_ONLY;
+        internal ushort mdMajVer;
+        internal ushort mdMinVer;
+        internal NetVersion netVersion;
+        internal string netVerString;
+        internal byte tsMajVer;
+        internal byte tsMinVer;
+
+        internal void SetDefaults(string name)
+        {
+            fromExisting = false;
+            isDLL = name.EndsWith(".dll") || name.EndsWith(".DLL");
+            if (isDLL)
+            {
+                characteristics = FileImage.dllCharacteristics;
+            }
+            else
+            {
+                characteristics = FileImage.exeCharacteristics;
+            }
+            lMajor = MetaData.LMajors[0];
+            lMinor = 0;
+            fileAlign = FileImage.minFileAlign;
+            osMajor = 4;
+            osMinor = 0;
+            userMajor = 0;
+            userMinor = 0;
+            subSysMajor = 4;
+            subSysMinor = 0;
+            subSystem = SubSystem.Windows_CUI;
+            DLLFlags = FileImage.DLLFlags;
+            cliMajVer = 2;
+            cliMinVer = 0;
+            corFlags = CorFlags.CF_IL_ONLY;
+            mdMajVer = 1;
+            mdMinVer = 1; // MetaData Minor Version  ECMA = 0, PEFiles = 1
+            netVersion = NetVersion.Everett;
+            netVerString = MetaData.versions[0];
+            tsMajVer = 1;
+            tsMinVer = 0;
+        }
+
+        internal void SetVersionFromString()
+        {
+            for (int i = 0; i < MetaData.versions.Length; i++)
+            {
+                if (MetaData.versions[i].Trim(nulls) == netVerString)
+                {
+                    netVersion = (NetVersion)i;
+                    netVerString = MetaData.versions[i];
+                }
+            }
+        }
+
+    }
+
+
+}

PERWAPI/PERWAPI.cs

@@ -0,0 +1,417 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004-2010.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ * 
+ * Contributions Made By:
+ * 
+ * Douglas Stockwell - Developed support for PDB files.
+ * Andrew Bacon - Integrated PDB file support and developed automatic 
+ *                stack depth calculations.
+ * 
+ */
+
+// The conditional compilation on the CORAPI symbol has been
+// deleted from this version.  Go back to version 1 in the QUT SVN
+// repository to get the conditional code if needed.
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Text;
+using System.Diagnostics;
+using System.Reflection; // For the assembly attributes
+
+//
+//  The assembly version is managed manually here.
+//  1.1.* are versions with the PDB handling built 
+//  Version 1.1.1+ uses System.Security.Crytography
+//  to provide public key token methods
+//
+namespace QUT.PERWAPI {
+  internal class MetaDataTables {
+    private TableRow[][] tables;
+
+    internal MetaDataTables(TableRow[][] tabs) {
+      tables = tabs;
+    }
+
+    internal MetaDataElement GetTokenElement(uint token) {
+      uint tabIx = (token & FileImage.TableMask) >> 24;
+      uint elemIx = (token & FileImage.ElementMask) - 1;
+      return (MetaDataElement)tables[tabIx][(int)elemIx];
+    }
+
+  }
+
+  /**************************************************************************/
+  // Streams for PE File Reader
+  /**************************************************************************/
+  /// <summary>
+  /// Stream in the Meta Data  (#Strings, #US, #Blob and #GUID)
+  /// </summary>
+  /// 
+
+  internal class MetaDataInStream : BinaryReader {
+    //protected bool largeIx = false;
+    protected byte[] data;
+
+    public MetaDataInStream(byte[] streamBytes)
+      : base(new MemoryStream(streamBytes)) {
+      data = streamBytes;
+    }
+
+    public uint ReadCompressedNum() {
+      //int pos = (int)BaseStream.Position;
+      //Console.WriteLine("Position = " + BaseStream.Position);
+      byte b = ReadByte();
+      //pos++;
+      uint num = 0;
+      if (b <= 0x7F) {
+        num = b;
+      }
+      else if (b >= 0xC0) {
+        num = (uint)(((b - 0xC0) << 24) + (ReadByte() << 16) + (ReadByte() << 8) + ReadByte());
+      }
+      else { // (b >= 0x80) && (b < 0xC0)
+        num = (uint)((b - 0x80) << 8) + ReadByte();
+      }
+      return num;
+    }
+
+    public int ReadCompressedInt() {
+      // This code is based on a revised version of the
+      // (incorrect) ECMA-335 spec which clarifies the 
+      // encoding of array lower bounds. (kjg 2008-Feb-22 )
+      //
+      uint rawBits = ReadCompressedNum();
+      uint magnitude = (rawBits >> 1);
+      if ((rawBits & 1) != 1)
+        return (int)magnitude;
+      else if (magnitude <= 0x3f)
+        return (int)(magnitude | 0xffffffc0);
+      else if (magnitude <= 0x1fff)
+        return (int)(magnitude | 0xffffe000);
+      else
+        return (int)(magnitude | 0xf0000000);
+    }
+
+    internal bool AtEnd() {
+      long pos = BaseStream.Position;
+      long len = BaseStream.Length;
+      //if (pos >= len-1)
+      //  Console.WriteLine("At end of stream");
+      return BaseStream.Position == BaseStream.Length - 1;
+    }
+
+    internal byte[] GetBlob(uint ix) {
+      if (ix == 0) return new byte[0];
+      BaseStream.Seek(ix, SeekOrigin.Begin);
+      //Console.WriteLine("Getting blob size at index " + buff.GetPos());
+      //if (Diag.CADiag) Console.WriteLine("Getting blob size at " + (BaseStream.Position+PEReader.blobStreamStartOffset));
+      uint bSiz = ReadCompressedNum();
+      //byte[] blobBytes = new byte[ReadCompressedNum()];
+      //if (Diag.CADiag) Console.WriteLine("Blob size =  " + bSiz);
+      byte[] blobBytes = new byte[bSiz];
+      for (int i = 0; i < blobBytes.Length; i++) {
+        blobBytes[i] = ReadByte();
+      }
+      return blobBytes;
+    }
+
+    internal byte[] GetBlob(uint ix, int len) {
+      //Console.WriteLine("Getting blob size at index " + buffer.GetPos());
+      byte[] blobBytes = new byte[len];
+      for (int i = 0; i < len; i++) {
+        blobBytes[i] = data[ix++];
+      }
+      return blobBytes;
+    }
+
+    internal string GetString(uint ix) {
+      uint end;
+      for (end = ix; data[end] != '\0'; end++) ;
+      char[] str = new char[end - ix];
+      for (int i = 0; i < str.Length; i++) {
+        str[i] = (char)data[ix + i];
+      }
+      return new string(str, 0, str.Length);
+    }
+
+    internal string GetBlobString(uint ix) {
+      if (ix == 0) return "";
+      BaseStream.Seek(ix, SeekOrigin.Begin);
+      return GetBlobString();
+    }
+
+    internal string GetBlobString() {
+      uint strLen = ReadCompressedNum();
+      char[] str = new char[strLen];
+      uint readpos = (uint)this.BaseStream.Position;
+      for (int i = 0; i < strLen; i++) {
+        str[i] = ReadChar();
+        uint newpos = (uint)this.BaseStream.Position;
+        if (newpos > readpos + 1)
+          strLen -= newpos - (readpos + 1);
+        readpos = newpos;
+      }
+      return new string(str, 0, (int)strLen);
+    }
+
+    internal void GoToIndex(uint ix) {
+      BaseStream.Seek(ix, SeekOrigin.Begin);
+    }
+
+  }
+  /**************************************************************************/
+
+  internal class MetaDataStringStream : BinaryReader {
+    //BinaryReader br;
+
+    internal MetaDataStringStream(byte[] bytes)
+      : base(new MemoryStream(bytes), Encoding.Unicode) {
+      //br = new BinaryReader(new MemoryStream(bytes)/*,Encoding.Unicode*/);
+    }
+
+    private uint GetStringLength() {
+      uint b = ReadByte();
+      uint num = 0;
+      if (b <= 0x7F) {
+        num = b;
+      }
+      else if (b >= 0xC0) {
+        num = (uint)(((b - 0xC0) << 24) + (ReadByte() << 16) + (ReadByte() << 8) + ReadByte());
+      }
+      else { // (b >= 0x80) && (b < 0xC0)
+        num = (uint)((b - 0x80) << 8) + ReadByte();
+      }
+      return num;
+    }
+
+    internal string GetUserString(uint ix) {
+      BaseStream.Seek(ix, SeekOrigin.Begin);
+      uint strLen = GetStringLength() / 2;
+      char[] strArray = new char[strLen];
+      for (int i = 0; i < strLen; i++) {
+        //strArray[i] = ReadChar(); // works for everett but not whidbey
+        strArray[i] = (char)ReadUInt16();
+      }
+      return new String(strArray);
+    }
+
+  }
+
+
+  /**************************************************************************/
+  // Streams for generated MetaData
+  /**************************************************************************/
+  /// <summary>
+  /// Stream in the generated Meta Data  (#Strings, #US, #Blob and #GUID)
+  /// </summary>
+  internal class MetaDataStream : BinaryWriter {
+    private static readonly uint StreamHeaderSize = 8;
+    private static uint maxSmlIxSize = 0xFFFF;
+
+    private uint start = 0;
+    uint size = 0, tide = 1;
+    bool largeIx = false;
+    uint sizeOfHeader;
+    internal char[] name;
+    Hashtable htable = new Hashtable();
+
+    internal MetaDataStream(char[] name, bool addInitByte)
+      : base(new MemoryStream()) {
+      if (addInitByte) { Write((byte)0); size = 1; }
+      this.name = name;
+      sizeOfHeader = StreamHeaderSize + (uint)name.Length;
+    }
+
+    internal MetaDataStream(char[] name, System.Text.Encoding enc, bool addInitByte)
+      : base(new MemoryStream(), enc) {
+      if (addInitByte) { Write((byte)0); size = 1; }
+      this.name = name;
+      sizeOfHeader = StreamHeaderSize + (uint)name.Length;
+    }
+
+    public uint Start {
+      get {
+        return start;
+      }
+      set {
+        start = value;
+      }
+    }
+
+    internal uint headerSize() {
+      // Console.WriteLine(name + " stream has headersize of " + sizeOfHeader);
+      return sizeOfHeader;
+    }
+
+    //internal void SetSize(uint siz) {
+    //  size = siz;
+    //}
+
+    internal uint Size() {
+      return size;
+    }
+
+    internal bool LargeIx() {
+      return largeIx;
+    }
+
+    internal void WriteDetails() {
+      // Console.WriteLine(name + " - size = " + size);
+    }
+
+    internal uint Add(string str, bool prependSize) {
+      Object val = htable[str];
+      uint index = 0;
+      if (val == null) {
+        index = size;
+        htable[str] = index;
+        char[] arr = str.ToCharArray();
+        if (prependSize)
+          CompressNum((uint)arr.Length * 2 + 1);
+        Write(arr);
+        Write((byte)0);
+        size = (uint)Seek(0, SeekOrigin.Current);
+      }
+      else {
+        index = (uint)val;
+      }
+      return index;
+    }
+
+    internal uint Add(Guid guid) {
+      Write(guid.ToByteArray());
+      size = (uint)Seek(0, SeekOrigin.Current);
+      return tide++;
+    }
+
+    internal uint Add(byte[] blob) {
+      uint ix = size;
+      CompressNum((uint)blob.Length);
+      Write(blob);
+      size = (uint)Seek(0, SeekOrigin.Current);
+      return ix;
+    }
+
+    internal uint Add(long val, uint numBytes) {
+      uint ix = size;
+      Write((byte)numBytes);
+      switch (numBytes) {
+        case 1: Write((byte)val); break;
+        case 2: Write((short)val); break;
+        case 4: Write((int)val); break;
+        default: Write(val); break;
+      }
+      size = (uint)Seek(0, SeekOrigin.Current);
+      return ix;
+    }
+
+    internal uint Add(ulong val, uint numBytes) {
+      uint ix = size;
+      Write((byte)numBytes);
+      switch (numBytes) {
+        case 1: Write((byte)val); break;
+        case 2: Write((ushort)val); break;
+        case 4: Write((uint)val); break;
+        default: Write(val); break;
+      }
+      size = (uint)Seek(0, SeekOrigin.Current);
+      return ix;
+    }
+
+    internal uint Add(char ch) {
+      uint ix = size;
+      Write((byte)2);  // size of blob to follow
+      Write(ch);
+      size = (uint)Seek(0, SeekOrigin.Current);
+      return ix;
+    }
+
+    internal uint Add(float val) {
+      uint ix = size;
+      Write((byte)4);  // size of blob to follow
+      Write(val);
+      size = (uint)Seek(0, SeekOrigin.Current);
+      return ix;
+    }
+
+    internal uint Add(double val) {
+      uint ix = size;
+      Write((byte)8);  // size of blob to follow
+      Write(val);
+      size = (uint)Seek(0, SeekOrigin.Current);
+      return ix;
+    }
+
+    private void CompressNum(uint val) {
+      if (val <= 0x7F) {
+        Write((byte)val);
+      }
+      else if (val <= 0x3FFF) {
+        byte b1 = (byte)((val >> 8) | 0x80);
+        byte b2 = (byte)(val & FileImage.iByteMask[0]);
+        Write(b1);
+        Write(b2);
+      }
+      else {
+        byte b1 = (byte)((val >> 24) | 0xC0);
+        byte b2 = (byte)((val & FileImage.iByteMask[2]) >> 16);
+        byte b3 = (byte)((val & FileImage.iByteMask[1]) >> 8); ;
+        byte b4 = (byte)(val & FileImage.iByteMask[0]);
+        Write(b1);
+        Write(b2);
+        Write(b3);
+        Write(b4);
+      }
+    }
+
+    private void QuadAlign() {
+      if ((size % 4) != 0) {
+        uint pad = 4 - (size % 4);
+        size += pad;
+        for (int i = 0; i < pad; i++) {
+          Write((byte)0);
+        }
+      }
+    }
+
+    internal void EndStream() {
+      QuadAlign();
+      if (size > maxSmlIxSize) {
+        largeIx = true;
+      }
+    }
+
+    internal void WriteHeader(BinaryWriter output) {
+      output.Write(start);
+      output.Write(size);
+      output.Write(name);
+    }
+
+    internal virtual void Write(BinaryWriter output) {
+      // Console.WriteLine("Writing " + name + " stream at " + output.Seek(0,SeekOrigin.Current) + " = " + start);
+      MemoryStream str = (MemoryStream)BaseStream;
+      output.Write(str.ToArray());
+    }
+
+  }
+
+
+}
+
+
+

PERWAPI/PERWAPI.csproj

@@ -0,0 +1,150 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{6E89897A-ECB1-460E-976E-A14179524F81}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>QUT.PERWAPI</AssemblyName>
+    <AssemblyOriginatorKeyFile>QUTgpTools.pfx</AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>QUT.PERWAPI</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <SignAssembly>true</SignAssembly>
+    <OldToolsVersion>2.0</OldToolsVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CILWriter.cs" />
+    <Compile Include="ClassLayout.cs" />
+    <Compile Include="MDClassElems.cs" />
+    <Compile Include="CodeBlocks.cs" />
+    <Compile Include="MDClassRefElems.cs" />
+    <Compile Include="CustomAttribute.cs" />
+    <Compile Include="MDDefScopeElems.cs" />
+    <Compile Include="MDFeatureElems.cs" />
+    <Compile Include="MDExternClassElem.cs" />
+    <Compile Include="MDClassDefElems.cs" />
+    <Compile Include="FieldMarshal.cs" />
+    <Compile Include="FieldRVA.cs" />
+    <Compile Include="MDFieldElems.cs" />
+    <Compile Include="MDFileRefElems.cs" />
+    <Compile Include="MDRefScopeElems.cs" />
+    <Compile Include="MDSignatureElems.cs" />
+    <Compile Include="MetaDataClass.cs" />
+    <Compile Include="MetaDataOut.cs" />
+    <Compile Include="MethSigClass.cs" />
+    <Compile Include="NativeTypes.cs" />
+    <Compile Include="PDBClasses.cs" />
+    <Compile Include="PEFile.cs" />
+    <Compile Include="Constants.cs" />
+    <Compile Include="EHClause.cs" />
+    <Compile Include="Enumerations.cs" />
+    <Compile Include="FileImage.cs" />
+    <Compile Include="Instructions.cs" />
+    <Compile Include="Local.cs" />
+    <Compile Include="MDElements.cs" />
+    <Compile Include="PEReader.cs" />
+    <Compile Include="PEResourceClasses.cs" />
+    <Compile Include="PERWAPI.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="PEWriter.cs" />
+    <Compile Include="MDMethodElems.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SectionClass.cs" />
+    <Compile Include="SourceFile.cs" />
+    <Compile Include="MDTypeElems.cs" />
+    <Compile Include="Utils.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Blank.pdb" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\CVS-symbolRW\SymbolRW.csproj">
+      <Project>{2BC469D1-46DA-4FBF-A431-6B1344BBCD23}</Project>
+      <Name>SymbolRW</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="QUTgpTools.pfx" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>

PERWAPI/PEReader.cs

@@ -0,0 +1,1679 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    // Class to Read PE Files
+    /**************************************************************************/
+
+
+    internal class PEReader : BinaryReader
+    {
+
+        private bool x64;
+        internal static long blobStreamStartOffset = 0;
+        private static readonly int cliIx = 14;
+        private Section[] inputSections;
+        int numSections = 0;
+        uint[] DataDirectoryRVA = new uint[16];
+        uint[] DataDirectorySize = new uint[16];
+        uint[] streamOffsets, streamSizes;
+        String[] streamNames;
+        private TableRow[][] tables = new TableRow[MetaData.NumMetaDataTables][];
+        uint[] tableLengths = new uint[MetaData.NumMetaDataTables];
+        MetaData md = new MetaData();
+        MetaDataStringStream userstring;
+        MetaDataInStream blob, strings, guid;
+        Sentinel sentinel = new Sentinel();
+        Pinned pinned = new Pinned();
+        //CorFlags corFlags;
+        uint metaDataRVA = 0, metaDataSize = 0, flags = 0;
+        uint entryPoint = 0, resourcesRVA = 0, resourcesSize = 0;
+        uint strongNameRVA = 0, strongNameSize = 0, vFixupsRVA = 0, vFixupsSize = 0;
+        //ushort dllFlags = 0, subSystem = 0;
+        //uint fileAlign = 0;
+        //char[] verString;
+        bool refsOnly = false;
+        long[] tableStarts;
+        ResolutionScope thisScope;
+        PEFileVersionInfo verInfo = new PEFileVersionInfo();
+        internal Method currentMethodScope;
+        internal Class currentClassScope;
+        int genInstNestLevel = 0;
+        internal bool skipBody = true;
+
+        private PEReader(PEFile pefile, System.IO.FileStream file, bool refs, bool skipBody)
+            :
+            base(new MemoryStream(new BinaryReader(file).ReadBytes(System.Convert.ToInt32(file.Length))))
+        {
+            this.skipBody = skipBody;
+            thisScope = pefile;
+            refsOnly = refs;
+            verInfo.fromExisting = true;
+            try
+            {
+                ReadDOSHeader();
+            }
+            catch (PEFileException)
+            {
+                Console.WriteLine("Bad DOS header");
+                return;
+            }
+            ReadFileHeader();
+            ReadSectionHeaders();
+            ReadCLIHeader();
+            ReadMetaData();
+            if (refsOnly)
+                ReadMetaDataTableRefs();
+            else
+            {
+                ReadMetaDataTables();
+                pefile.metaDataTables = new MetaDataTables(tables);
+            }
+            file.Close();
+
+            if (thisScope != null)
+            {
+                thisScope.buffer = this;
+                if (pefile != null)
+                {
+                    pefile.versionInfo = verInfo;
+                }
+            }
+            strings = null;
+            userstring = null;
+            blob = null;
+            guid = null;
+        }
+
+        private static System.IO.FileStream GetFile(string filename)
+        {
+            if (Diag.DiagOn)
+            {
+                Console.WriteLine("Current directory is " + System.Environment.CurrentDirectory);
+                Console.WriteLine("Looking for file " + filename);
+            }
+            if (System.IO.File.Exists(filename))
+            {
+                return System.IO.File.OpenRead(filename);
+            }
+            else
+                throw (new System.IO.FileNotFoundException("File Not Found", filename));
+        }
+
+        public static PEFile ReadPEFile(string filename, bool skipBody)
+        {
+            System.IO.FileStream file = GetFile(filename);
+            PEFile pefile = new PEFile(filename);
+            PEReader reader = new PEReader(pefile, file, false, skipBody);
+            return pefile;
+        }
+
+        internal static ReferenceScope GetExportedInterface(string filename)
+        {
+            System.IO.FileStream file = GetFile(filename);
+            PEReader reader = new PEReader(null, file, true, true);
+            return (ReferenceScope)reader.thisScope;
+        }
+
+        //internal ResolutionScope GetThisScope() { return thisScope; }
+
+        internal string[] GetAssemblyRefNames()
+        {
+            string[] assemNames = new string[tableLengths[(int)MDTable.AssemblyRef]];
+            for (int i = 0; i < assemNames.Length; i++)
+            {
+                assemNames[i] = ((AssemblyRef)tables[(int)MDTable.AssemblyRef][i]).Name();
+            }
+            return assemNames;
+        }
+
+        internal AssemblyRef[] GetAssemblyRefs()
+        {
+            AssemblyRef[] assemRefs = new AssemblyRef[tableLengths[(int)MDTable.AssemblyRef]];
+            for (int i = 0; i < assemRefs.Length; i++)
+            {
+                assemRefs[i] = (AssemblyRef)tables[(int)MDTable.AssemblyRef][i];
+            }
+            return assemRefs;
+        }
+        /*----------------------------- Reading ----------------------------------------*/
+
+        internal void InputError()
+        {
+            throw new PEFileException("Error in input");
+        }
+
+        internal void MetaDataError(string msg)
+        {
+            msg = "ERROR IN METADATA: " + msg;
+            if (thisScope != null)
+                msg = "MODULE " + thisScope.Name() + ": " + msg;
+            throw new PEFileException(msg);
+        }
+
+        internal Section GetSection(uint rva)
+        {
+            for (int i = 0; i < inputSections.Length; i++)
+            {
+                if (inputSections[i].ContainsRVA(rva)) return inputSections[i];
+            }
+            return null;
+        }
+
+        internal uint GetOffset(uint rva)
+        {
+            for (int i = 0; i < inputSections.Length; i++)
+            {
+                if (inputSections[i].ContainsRVA(rva))
+                    return inputSections[i].GetOffset(rva);
+            }
+            return 0;
+        }
+
+        internal void ReadZeros(int num)
+        {
+            for (int i = 0; i < num; i++)
+            {
+                byte next = ReadByte();
+                if (next != 0) InputError();
+            }
+        }
+
+        private void ReadDOSHeader()
+        {
+            for (int i = 0; i < FileImage.PESigOffset; i++)
+            {
+                if (FileImage.DOSHeader[i] != ReadByte())
+                {
+                    InputError();
+                }
+            }
+            uint sigOffset = ReadUInt32();
+            for (int i = FileImage.PESigOffset + 4; i < FileImage.DOSHeader.Length - 4; i++)
+            {
+                if (FileImage.DOSHeader[i] != ReadByte()) { InputError(); }
+            }
+            BaseStream.Seek(sigOffset, SeekOrigin.Begin);
+            if ((char)ReadByte() != 'P') InputError();
+            if ((char)ReadByte() != 'E') InputError();
+            if (ReadByte() != 0) InputError();
+            if (ReadByte() != 0) InputError();
+        }
+
+        private void ReadFileHeader()
+        {
+            // already read PE signature
+            ushort machineid = ReadUInt16();
+            if (machineid != FileImage.machine && machineid != FileImage.machinex64) InputError();
+            numSections = ReadUInt16();
+            uint TimeStamp = ReadUInt32();
+            ReadZeros(8);     /* Pointer to Symbol Table, Number of Symbols */
+            int optHeadSize = ReadUInt16();
+            verInfo.characteristics = ReadUInt16();
+            verInfo.isDLL = (verInfo.characteristics & FileImage.dllFlag) != 0;
+            /* Now read PE Optional Header */
+            /* Standard Fields */
+            ushort magic = ReadUInt16();
+            if (magic != FileImage.magic && magic != FileImage.magic64) InputError();
+            x64 = magic == FileImage.magic64;
+            verInfo.lMajor = ReadByte(); // != FileImage.lMajor) InputError();
+            verInfo.lMinor = ReadByte(); // != FileImage.lMinor) InputError();
+            uint codeSize = ReadUInt32();
+            if (Diag.DiagOn) Console.WriteLine("codeSize = " + Hex.Int(codeSize));
+            uint initDataSize = ReadUInt32();
+            if (Diag.DiagOn) Console.WriteLine("initDataSize = " + Hex.Int(initDataSize));
+            uint uninitDataSize = ReadUInt32();
+            if (Diag.DiagOn) Console.WriteLine("uninitDataSize = " + Hex.Int(uninitDataSize));
+            uint entryPointRVA = ReadUInt32();
+            if (Diag.DiagOn) Console.WriteLine("entryPointRVA = " + Hex.Int(entryPointRVA));
+            uint baseOfCode = ReadUInt32();
+            if (Diag.DiagOn) Console.WriteLine("baseOfCode = " + Hex.Int(baseOfCode));
+            //uint baseOfData = ReadUInt32();
+            if (!x64)
+            {
+                uint baseOfData = ReadUInt32();
+                if (Diag.DiagOn) Console.WriteLine("baseOfData = " + Hex.Int(baseOfData));
+            }
+            /* NT-Specific Fields */
+            ulong imageBase = x64 ? ReadUInt64() : ReadUInt32();
+            if (Diag.DiagOn) Console.WriteLine("imageBase = " + Hex.Long(imageBase));
+            uint sectionAlign = ReadUInt32();
+            if (Diag.DiagOn) Console.WriteLine("sectionAlign = " + Hex.Int(sectionAlign));
+            verInfo.fileAlign = ReadUInt32();
+            if (Diag.DiagOn) Console.WriteLine("fileAlign = " + Hex.Int(verInfo.fileAlign));
+            verInfo.osMajor = ReadUInt16();
+            if (Diag.DiagOn) Console.WriteLine("osMajor = " + Hex.Int(verInfo.osMajor));
+            //ReadZeros(6);         // osMinor, userMajor, userMinor
+            verInfo.osMinor = ReadUInt16();
+            verInfo.userMajor = ReadUInt16();
+            verInfo.userMinor = ReadUInt16();
+            verInfo.subSysMajor = ReadUInt16();
+            if (Diag.DiagOn) Console.WriteLine("subsysMajor = " + Hex.Int(verInfo.subSysMajor));
+            verInfo.subSysMinor = ReadUInt16();
+            ReadZeros(4);         // Reserved
+            uint imageSize = ReadUInt32();
+            if (Diag.DiagOn) Console.WriteLine("imageSize = " + Hex.Int(imageSize));
+            uint headerSize = ReadUInt32();
+            if (Diag.DiagOn) Console.WriteLine("headerSize = " + Hex.Int(headerSize));
+            uint checkSum = ReadUInt32();
+            if (Diag.DiagOn) Console.WriteLine("checkSum = " + Hex.Int(checkSum));
+            verInfo.subSystem = (SubSystem)ReadUInt16();
+            if (Diag.DiagOn) Console.WriteLine("subSystem = " + Hex.Short((int)verInfo.subSystem));
+            verInfo.DLLFlags = ReadUInt16();
+            if (Diag.DiagOn) Console.WriteLine("DLLFlags = " + Hex.Short(verInfo.DLLFlags));
+            ulong stackReserve = x64 ? ReadUInt64() : ReadUInt32(); //  if (ReadUInt32() != FileImage.StackReserveSize) InputError();
+            ulong stackCommit = x64 ? ReadUInt64() : ReadUInt32(); // if (ReadUInt32() != FileImage.StackCommitSize) InputError();
+            ulong heapReserve = x64 ? ReadUInt64() : ReadUInt32(); // if (ReadUInt32() != FileImage.HeapReserveSize) InputError();
+            ulong heapCommit = x64 ? ReadUInt64() : ReadUInt32(); // if (ReadUInt32() != FileImage.HeapCommitSize) InputError();
+            ReadUInt32(); // if (ReadUInt32() != 0) InputError(); // LoaderFlags
+            uint numdict = ReadUInt32();
+            if (numdict != FileImage.NumDataDirectories) InputError();
+            /* Data Directories */
+            DataDirectoryRVA = new uint[FileImage.NumDataDirectories];
+            DataDirectorySize = new uint[FileImage.NumDataDirectories];
+            for (int i = 0; i < FileImage.NumDataDirectories; i++)
+            {
+                DataDirectoryRVA[i] = ReadUInt32();
+                DataDirectorySize[i] = ReadUInt32();
+            }
+            if (Diag.DiagOn)
+            {
+                Console.WriteLine("RVA = " + Hex.Int(DataDirectoryRVA[1]) + "  Size = " + Hex.Int(DataDirectorySize[1]) + "  Import Table");
+                Console.WriteLine("RVA = " + Hex.Int(DataDirectoryRVA[2]) + "  Size = " + Hex.Int(DataDirectorySize[2]) + "  Resource Table");
+                Console.WriteLine("RVA = " + Hex.Int(DataDirectoryRVA[5]) + "  Size = " + Hex.Int(DataDirectorySize[5]) + "  Base Relocation Table");
+                Console.WriteLine("RVA = " + Hex.Int(DataDirectoryRVA[12]) + "  Size = " + Hex.Int(DataDirectorySize[12]) + "  IAT");
+                Console.WriteLine("RVA = " + Hex.Int(DataDirectoryRVA[14]) + "  Size = " + Hex.Int(DataDirectorySize[14]) + "  CLI Header");
+            }
+        }
+
+        private void ReadSectionHeaders()
+        {
+            if (Diag.DiagOn) Console.WriteLine("Sections");
+            inputSections = new Section[numSections];
+            for (int i = 0; i < numSections; i++)
+            {
+                inputSections[i] = new Section(this);
+            }
+        }
+
+        private void ReadCLIHeader()
+        {
+            BaseStream.Seek(GetOffset(DataDirectoryRVA[cliIx]), SeekOrigin.Begin);
+            uint cliSize = ReadUInt32();
+            verInfo.cliMajVer = ReadUInt16(); // check
+            verInfo.cliMinVer = ReadUInt16(); // check
+            metaDataRVA = ReadUInt32();
+            metaDataSize = ReadUInt32();
+            //Console.WriteLine("Meta Data at rva " + PEConsts.Hex(metaDataRVA) + "  size = " + PEConsts.Hex(metaDataSize));
+            verInfo.corFlags = (CorFlags)ReadUInt32();
+            entryPoint = ReadUInt32();
+            resourcesRVA = ReadUInt32();
+            resourcesSize = ReadUInt32();
+            strongNameRVA = ReadUInt32();
+            strongNameSize = ReadUInt32();
+            ReadZeros(8); // CodeManagerTable
+            vFixupsRVA = ReadUInt32();
+            vFixupsSize = ReadUInt32();
+            ReadZeros(16); // ExportAddressTableJumps/ManagedNativeHeader
+        }
+
+        private String ReadStreamName()
+        {
+            char[] strName = new char[9];
+            strName[0] = (char)ReadByte();
+            char ch = (char)ReadByte();
+            int i = 1;
+            while (ch != '\0') { strName[i++] = ch; ch = (char)ReadByte(); }
+            strName[i++] = '\0';
+            if (i % 4 != 0)
+            {
+                for (int j = 4 - i % 4; j > 0; j--) ReadByte();
+            }
+            return new String(strName, 0, i - 1);
+        }
+
+        private void ReadMetaData()
+        {
+            if (Diag.DiagOn) Console.WriteLine("MetaData at RVA = " + Hex.Int(metaDataRVA) + " and offset = " + Hex.Int(GetOffset(metaDataRVA)));
+            BaseStream.Seek(GetOffset(metaDataRVA), SeekOrigin.Begin);
+            uint sig = ReadUInt32();              // check
+            verInfo.mdMajVer = ReadUInt16();           // check
+            verInfo.mdMinVer = ReadUInt16();           // check
+            ReadZeros(4);
+            int verStrLen = ReadInt32();
+            int end = -1;
+            char[] verString = new char[verStrLen + 1];
+            for (int i = 0; i < verStrLen; i++)
+            {
+                verString[i] = (char)ReadByte();
+                if ((verString[i] == 0) && (end == -1)) end = i;
+            }
+            verString[verStrLen] = (char)0; // check
+            if (end == -1) end = verStrLen;
+            verInfo.netVerString = new string(verString, 0, end);
+            verInfo.SetVersionFromString();
+
+            // Beware of unknown netVerString values here ... Needs a better fix (kjg 31-Oct-2007)
+            GenericParam.extraField = verInfo.netVersion < NetVersion.Whidbey41;
+            if (Diag.DiagOn && GenericParam.extraField)
+            {
+                Console.WriteLine("Version = " + verInfo.netVerString + " has extra field for GenericParam");
+            }
+            int alignNum = 0;
+            if ((verStrLen % 4) != 0) alignNum = 4 - (verStrLen % 4);
+            ReadZeros(alignNum);
+            flags = ReadUInt16(); // check
+            int numStreams = ReadUInt16();
+            streamOffsets = new uint[numStreams];
+            streamSizes = new uint[numStreams];
+            streamNames = new String[numStreams];
+            if (Diag.DiagOn)
+                Console.WriteLine("MetaData Streams");
+            for (int i = 0; i < numStreams; i++)
+            {
+                streamOffsets[i] = ReadUInt32();
+                streamSizes[i] = ReadUInt32();
+                streamNames[i] = ReadStreamName();
+                if (Diag.DiagOn)
+                    Console.WriteLine("  " + streamNames[i] + "  Offset = " + Hex.Int(streamOffsets[i]) + "  Size = " + Hex.Int(streamSizes[i]));
+            }
+            uint tildeIx = 0;
+            for (uint i = 0; i < numStreams; i++)
+            {
+                String nam = streamNames[i];
+                if (MetaData.tildeName.CompareTo(nam) == 0) tildeIx = i;
+                else
+                {
+                    uint streamoff = GetOffset(metaDataRVA + streamOffsets[i]);
+                    if (Diag.DiagOn) Console.WriteLine("getting stream bytes at offset " + Hex.Int(streamoff));
+                    BaseStream.Seek(GetOffset(metaDataRVA + streamOffsets[i]), SeekOrigin.Begin);
+                    long streamStart = BaseStream.Position;
+                    byte[] strBytes = ReadBytes((int)streamSizes[i]);
+                    if (MetaData.stringsName.CompareTo(nam) == 0)
+                    {
+                        strings = new MetaDataInStream(strBytes);
+                    }
+                    else if (MetaData.userstringName.CompareTo(nam) == 0)
+                    {
+                        userstring = new MetaDataStringStream(strBytes);
+                    }
+                    else if (MetaData.blobName.CompareTo(nam) == 0)
+                    {
+                        blobStreamStartOffset = streamStart;
+                        blob = new MetaDataInStream(strBytes);
+                    }
+                    else if (MetaData.guidName.CompareTo(nam) == 0)
+                    {
+                        guid = new MetaDataInStream(strBytes);
+                    }
+                    else if (nam.CompareTo("#-") == 0)
+                    {
+                        tildeIx = i;
+                        //throw new Exception("Illegal uncompressed data stream #-");
+                    }
+                    else
+                    {
+                        Console.WriteLine("Unknown stream - " + nam);
+                    }
+                }
+            }
+            // go to beginning of tilde stream
+            BaseStream.Seek(GetOffset(metaDataRVA + streamOffsets[tildeIx]), SeekOrigin.Begin);
+            ReadTildeStreamStart();
+        }
+
+        private void SetUpTableInfo()
+        {
+            md.CalcElemSize();
+            tableStarts = new long[MetaData.NumMetaDataTables];
+            long currentPos = BaseStream.Position;
+            for (int ix = 0; ix < MetaData.NumMetaDataTables; ix++)
+            {
+                tableStarts[ix] = currentPos;
+                currentPos += tableLengths[ix] * md.elemSize[ix];
+            }
+        }
+
+        private void ReadTildeStreamStart()
+        {
+            if (Diag.DiagOn) Console.WriteLine("Reading meta data tables at offset = " + Hex.Int((int)BaseStream.Position));
+            // pre:  at beginning of tilde stream
+            ReadZeros(4);  // reserved
+            verInfo.tsMajVer = ReadByte();  // check
+            verInfo.tsMinVer = ReadByte();  // check
+            byte heapSizes = ReadByte();
+            if (heapSizes != 0)
+            {
+                md.largeStrings = (heapSizes & 0x01) != 0;
+                md.largeGUID = (heapSizes & 0x02) != 0;
+                md.largeBlob = (heapSizes & 0x04) != 0;
+            }
+            if (Diag.DiagOn)
+            {
+                if (md.largeStrings) Console.WriteLine("LARGE strings index");
+                if (md.largeGUID) Console.WriteLine("LARGE GUID index");
+                if (md.largeBlob) Console.WriteLine("LARGE blob index");
+            }
+            int res = ReadByte(); // check if 1
+            ulong valid = ReadUInt64();
+            ulong sorted = this.ReadUInt64();
+            if (Diag.DiagOn) Console.WriteLine("Valid = " + Hex.Long(valid));
+            for (int i = 0; i < MetaData.NumMetaDataTables; i++)
+            {
+                if ((valid & FileImage.bitmasks[i]) != 0)
+                {
+                    tableLengths[i] = ReadUInt32();
+                    tables[i] = new TableRow[tableLengths[i]];
+                    md.largeIx[i] = tableLengths[i] > MetaData.maxSmlIxSize;
+                    if (Diag.DiagOn)
+                        Console.WriteLine("Table Ix " + Hex.Short(i) + " has length " + tableLengths[i]);
+                }
+                else tableLengths[i] = 0;
+            }
+            if (tableLengths[0] != 1) this.MetaDataError("Module table has more than one entry");
+            for (int i = 0; i < MetaData.CIxTables.Length; i++)
+            {
+                for (int j = 0; j < MetaData.CIxTables[i].Length; j++)
+                {
+                    if (Diag.DiagOn) Console.WriteLine("CIxTables " + i + " " + j + " tableLength = " + tableLengths[MetaData.CIxTables[i][j]] + "  Max = " + MetaData.CIxMaxMap[i]);
+                    md.lgeCIx[i] = md.lgeCIx[i] ||
+                        (tableLengths[MetaData.CIxTables[i][j]] > MetaData.CIxMaxMap[i]);
+                }
+                if (Diag.DiagOn) if (md.lgeCIx[i]) Console.WriteLine("LARGE CIx " + i);
+            }
+        }
+
+        private void SetThisScope()
+        {
+            if (refsOnly)
+                thisScope = Module.ReadModuleRef(this);
+            else
+                ((PEFile)thisScope).Read(this);
+            tables[(int)MDTable.Module][0] = thisScope;
+            if (tableLengths[(int)MDTable.Assembly] > 0)
+            {
+                SetElementPosition(MDTable.Assembly, 1);
+                if (refsOnly)
+                {
+                    ModuleRef thisMod = (ModuleRef)thisScope;
+                    thisScope = Assembly.ReadAssemblyRef(this);
+                    //if ((thisMod != null) && (thisMod.ismscorlib) && (thisScope != null)) {
+                    //  ((AssemblyRef)thisScope).CopyVersionInfoToMSCorLib();
+                    //  thisScope = MSCorLib.mscorlib;
+                    //}
+                    tables[(int)MDTable.Assembly][0] = thisScope;
+                }
+                else
+                {
+                    Assembly.Read(this, tables[(int)MDTable.Assembly], (PEFile)thisScope);
+                    ((PEFile)thisScope).SetThisAssembly((Assembly)tables[(int)MDTable.Assembly][0]);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Read the Module metadata for this PE file.
+        /// If reading refs only, then thisModule is the ModuleRef 
+        /// If reading defs then pefile is the Module 
+        /// </summary>
+        /*    private void GetThisPEFileScope() {
+              if (refsOnly) {
+                thisModuleRef = Module.ReadModuleRef(this);
+              } else { 
+                pefile.Read(this);
+                tables[(int)MDTable.Module][0] = pefile;
+              }
+            }
+
+            private AssemblyRef GetThisAssembly(bool atPos) {
+              if (tableLengths[(int)MDTable.Assembly] == 0) return null;
+              if (!atPos)
+                BaseStream.Position = tableStarts[(int)MDTable.Assembly];
+              if (refsOnly) 
+                tables[(int)MDTable.Assembly][0] = Assembly.ReadAssemblyRef(this);
+              else 
+                Assembly.Read(this,tables[(int)MDTable.Assembly],pefile);
+              return (AssemblyRef)tables[(int)MDTable.Assembly][0];
+            }
+        */
+        /*
+        private ReferenceScope ReadRefsOnDemand() {
+          ModuleRef thisModule;
+          SetUpTableInfo();
+          ResolutionScope mod;
+
+          AssemblyRef thisAssembly = GetThisAssemblyRef();
+          SetElementPosition(MDTable.Module,0);
+          ReadZeros(2);
+          name = buff.GetString();
+          mvid = buff.GetGUID();
+          ModuleRef thisMod = ModuleRef.GetModuleRef(name);
+          if (thisMod == null) {
+            thisMod = new ModuleRef(name);
+            Module.AddToList(thisMod);
+          } else {
+          }
+          if (thisModule == null) {
+            thisModule = new ModuleRef(name);
+            thisModule.readAsDef = true;
+            if (mod != null) ((Module)mod).refOf = thisModule;
+            else Module.AddToList(thisModule);
+          } else {
+            if (thisModule.readAsDef) return thisModule;
+            return Merge(thisModule);
+          }
+          ReferenceScope thisScope = thisAssembly;
+          if (thisScope == null) thisScope = thisModule;
+          ClassRef defClass = ReadDefaultClass();
+          thisScope.SetDefaultClass(defClass);
+          ClassDef.GetClassRefNames(this,thisScope);
+      
+          return null;
+        }
+        */
+
+        private void ReadMetaDataTableRefs()
+        {
+            SetUpTableInfo();
+            SetThisScope();
+            // ReadAssemblyRefs
+            SetElementPosition(MDTable.AssemblyRef, 1);
+            if (tableLengths[(int)MDTable.AssemblyRef] > 0)
+                AssemblyRef.Read(this, tables[(int)MDTable.AssemblyRef]);
+            // Read File Table (for ModuleRefs)
+            //SetElementPosition(MDTable.File,1);
+            if (tableLengths[(int)MDTable.File] > 0)
+                FileRef.Read(this, tables[(int)MDTable.File]);
+            // Read Exported Classes
+            //SetElementPosition(MDTable.ExportedType,1);
+            if (tableLengths[(int)MDTable.ExportedType] > 0)
+                ExternClass.GetClassRefs(this, tables[(int)MDTable.ExportedType]);
+            // Read ModuleRefs
+            if (tableLengths[(int)MDTable.ModuleRef] > 0)
+            {
+                BaseStream.Position = tableStarts[(int)MDTable.ModuleRef];
+                ModuleRef.Read(this, tables[(int)MDTable.ModuleRef], true);
+            }
+            uint[] parIxs = new uint[tableLengths[(int)MDTable.TypeDef]];
+            BaseStream.Position = tableStarts[(int)MDTable.NestedClass];
+            MapElem.ReadNestedClassInfo(this, tableLengths[(int)MDTable.NestedClass], parIxs);
+            BaseStream.Position = tableStarts[(int)MDTable.TypeRef];
+            // Read ClassRefs
+            if (tableLengths[(int)MDTable.TypeRef] > 0)
+                ClassRef.Read(this, tables[(int)MDTable.TypeRef], true);
+            // Read ClassDefs and fields and methods
+            ClassDef.GetClassRefs(this, tables[(int)MDTable.TypeDef], (ReferenceScope)thisScope, parIxs);
+            for (int i = 0; i < tableLengths[(int)MDTable.ExportedType]; i++)
+            {
+                ((ClassRef)tables[(int)MDTable.ExportedType][i]).ResolveParent(this, true);
+            }
+        }
+
+        internal void SetElementPosition(MDTable tabIx, uint ix)
+        {
+            BaseStream.Position = tableStarts[(int)tabIx] + (md.elemSize[(int)tabIx] * (ix - 1));
+        }
+
+        internal void ReadMethodImpls(ClassDef theClass, uint classIx)
+        {
+            SetElementPosition(MDTable.InterfaceImpl, 0);
+            for (int i = 0; (i < tableLengths[(int)MDTable.MethodImpl]); i++)
+            {
+                uint clIx = GetIndex(MDTable.TypeDef);
+                uint bodIx = GetCodedIndex(CIx.MethodDefOrRef);
+                uint declIx = GetCodedIndex(CIx.MethodDefOrRef);
+                if (clIx == classIx)
+                {
+                    MethodImpl mImpl = new MethodImpl(this, theClass, bodIx, declIx);
+                    theClass.AddMethodImpl(mImpl);
+                    tables[(int)MDTable.MethodImpl][i] = mImpl;
+                }
+            }
+        }
+
+        internal void InsertInTable(MDTable tabIx, uint ix, MetaDataElement elem)
+        {
+            tables[(int)tabIx][ix - 1] = elem;
+        }
+
+        private void CheckForRefMerges()
+        {
+            if (tableLengths[(int)MDTable.TypeRef] > 0)
+            {
+                for (int i = 0; i < tableLengths[(int)MDTable.TypeRef]; i++)
+                {
+                    ((ClassRef)tables[(int)MDTable.TypeRef][i]).ResolveParent(this, false);
+                }
+            }
+            if (tableLengths[(int)MDTable.MemberRef] > 0)
+            {
+                for (int i = 0; i < tableLengths[(int)MDTable.MemberRef]; i++)
+                {
+                    Member memb = (Member)tables[(int)MDTable.MemberRef][i];
+                    tables[(int)MDTable.MemberRef][i] = memb.ResolveParent(this);
+                }
+            }
+        }
+
+        internal void ReplaceSig(Signature sig, Type sigType)
+        {
+            tables[(int)MDTable.StandAloneSig][sig.Row - 1] = sigType;
+        }
+
+        internal void GetGenericParams(MethodDef meth)
+        {
+            if (tables[(int)MDTable.GenericParam] != null)
+            {
+                for (int j = 0; j < tables[(int)MDTable.GenericParam].Length; j++)
+                {
+                    ((GenericParam)tables[(int)MDTable.GenericParam][j]).CheckParent(meth, this);
+                }
+            }
+        }
+
+        private void ReadMetaDataTables()
+        {
+            ((PEFile)thisScope).Read(this);
+            tables[(int)MDTable.Module][0] = thisScope;
+            for (int ix = 1; ix < MetaData.NumMetaDataTables; ix++)
+            {
+                if (tableLengths[ix] > 0)
+                {
+                    switch (ix)
+                    {
+                        case ((int)MDTable.Assembly):
+                            Assembly.Read(this, tables[ix], (PEFile)thisScope);
+                            break;
+                        case ((int)MDTable.AssemblyOS):
+                        case ((int)MDTable.AssemblyProcessor):
+                        case ((int)MDTable.AssemblyRefOS):
+                        case ((int)MDTable.AssemblyRefProcessor):
+                            // ignore
+                            Console.WriteLine("Got uncompressed table " + (MDTable)ix);
+                            BaseStream.Seek(tableLengths[ix] * md.elemSize[ix], SeekOrigin.Current);
+                            break;
+                        case ((int)MDTable.AssemblyRef):
+                            AssemblyRef.Read(this, tables[ix]); break;
+                        //case 0x25 : AssemblyRefOS.Read(this,tables[ix]); break;
+                        //case 0x24 : AssemblyRefProcessor.Read(this,tables[ix]); break;
+                        case ((int)MDTable.ClassLayout):
+                            ClassLayout.Read(this, tables[ix]); break;
+                        case ((int)MDTable.Constant):
+                            ConstantElem.Read(this, tables[ix]); break;
+                        case ((int)MDTable.CustomAttribute):
+                            CustomAttribute.Read(this, tables[ix]); break;
+                        case ((int)MDTable.DeclSecurity):
+                            DeclSecurity.Read(this, tables[ix]); break;
+                        case ((int)MDTable.Event):
+                            Event.Read(this, tables[ix]); break;
+                        case ((int)MDTable.EventMap):
+                            MapElem.Read(this, tables[ix], MDTable.EventMap); break;
+                        case ((int)MDTable.ExportedType):
+                            ExternClass.Read(this, tables[ix]); break;
+                        case ((int)MDTable.Field):
+                            FieldDef.Read(this, tables[ix]); break;
+                        case ((int)MDTable.FieldLayout):
+                            FieldLayout.Read(this, tables[ix]); break;
+                        case ((int)MDTable.FieldMarshal):
+                            FieldMarshal.Read(this, tables[ix]); break;
+                        case ((int)MDTable.FieldRVA):
+                            FieldRVA.Read(this, tables[ix]); break;
+                        case ((int)MDTable.File):
+                            FileRef.Read(this, tables[ix]); break;
+                        case ((int)MDTable.GenericParam):
+                            GenericParam.Read(this, tables[ix]); break;
+                        case ((int)MDTable.GenericParamConstraint):
+                            GenericParamConstraint.Read(this, tables[ix]); break;
+                        case ((int)MDTable.ImplMap):
+                            ImplMap.Read(this, tables[ix]); break;
+                        case ((int)MDTable.InterfaceImpl):
+                            InterfaceImpl.Read(this, tables[ix]); break;
+                        case ((int)MDTable.ManifestResource):
+                            ManifestResource.Read(this, tables[ix]); break;
+                        case ((int)MDTable.MemberRef):
+                            Member.ReadMember(this, tables[ix]); break;
+                        case ((int)MDTable.Method):
+                            MethodDef.Read(this, tables[ix]); break;
+                        case ((int)MDTable.MethodImpl):
+                            MethodImpl.Read(this, tables[ix]); break;
+                        case ((int)MDTable.MethodSemantics):
+                            MethodSemantics.Read(this, tables[ix]); break;
+                        case ((int)MDTable.MethodSpec):
+                            MethodSpec.Read(this, tables[ix]); break;
+                        case ((int)MDTable.ModuleRef):
+                            ModuleRef.Read(this, tables[ix], false); break;
+                        case ((int)MDTable.NestedClass):
+                            MapElem.Read(this, tables[ix], MDTable.NestedClass);
+                            tables[ix] = null;
+                            break;
+                        case ((int)MDTable.Param):
+                            Param.Read(this, tables[ix]); break;
+                        case ((int)MDTable.Property):
+                            Property.Read(this, tables[ix]); break;
+                        case ((int)MDTable.PropertyMap):
+                            MapElem.Read(this, tables[ix], MDTable.PropertyMap); break;
+                        case ((int)MDTable.StandAloneSig):
+                            Signature.Read(this, tables[ix]); break;
+                        case ((int)MDTable.TypeDef):
+                            ClassDef.Read(this, tables[ix], ((PEFile)thisScope).isMSCorLib());
+                            break;
+                        case ((int)MDTable.TypeRef):
+                            ClassRef.Read(this, tables[ix], false); break;
+                        case ((int)MDTable.TypeSpec):
+                            TypeSpec.Read(this, tables[ix]); break;
+                        default: throw (new PEFileException("Unknown MetaData Table Type"));
+                    }
+                }
+            }
+            CheckForRefMerges();
+            for (int ix = 0; ix < MetaData.NumMetaDataTables; ix++)
+            {
+                if ((tables[ix] != null) && (ix != (int)MDTable.TypeSpec) &&
+                    (ix != (int)MDTable.MethodSpec))
+                {  // resolve type/method specs when referenced
+                    for (int j = 0; j < tables[ix].Length; j++)
+                    {
+                        //tables[ix][j].Row = (uint)j+1;
+                        // KJG fix 2005:02:23
+                        //   Everett ILASM leaves gaps in table[10][x] ... 
+                        //   so protect with a null test.
+                        //
+                        // ((MetaDataElement)tables[ix][j]).Resolve(this); // old line ...
+                        //
+                        if (tables[ix][j] != null)
+                        {
+                            ((MetaDataElement)tables[ix][j]).Resolve(this);
+                        }
+                        else
+                        {
+                            Console.WriteLine();
+                        }
+                    }
+                }
+            }
+            if (tableLengths[(int)MDTable.Assembly] > 0)
+                ((PEFile)thisScope).SetThisAssembly((Assembly)tables[(int)MDTable.Assembly][0]);
+            ((PEFile)thisScope).SetDefaultClass((ClassDef)tables[(int)MDTable.TypeDef][0]);
+            for (int j = 1; j < tables[(int)MDTable.TypeDef].Length; j++)
+            {
+                ((PEFile)thisScope).AddToClassList((ClassDef)tables[(int)MDTable.TypeDef][j]);
+            }
+            if (tableLengths[(int)MDTable.ManifestResource] > 0)
+            {
+                for (int j = 0; j < tables[(int)MDTable.ManifestResource].Length; j++)
+                {
+                    ((PEFile)thisScope).AddToResourceList((ManifestResource)tables[(int)MDTable.ManifestResource][j]);
+                }
+            }
+            // We must protect the following code, since it seems possible
+            // that "entryPoint" is a random value if isDLL is false, 
+            // leading to an index out of bounds error in some cases.
+            if (!verInfo.isDLL && entryPoint != 0)
+            {
+                MetaDataElement ep = GetTokenElement(entryPoint);
+                if (ep is MethodDef)
+                    ((MethodDef)ep).DeclareEntryPoint();
+                else
+                    ((ModuleFile)ep).SetEntryPoint();
+            }
+        }
+
+        internal uint GetIndex(MDTable tabIx)
+        {
+            if (md.largeIx[(int)tabIx]) return ReadUInt32();
+            return ReadUInt16();
+        }
+
+        internal uint GetCodedIndex(CIx codedIx)
+        {
+            if (md.lgeCIx[(int)codedIx]) return ReadUInt32();
+            return ReadUInt16();
+        }
+
+        internal uint GetTableSize(MDTable tabIx)
+        {
+            return (uint)tableLengths[(int)tabIx];
+        }
+
+        internal byte[] GetResource(uint offset)
+        {
+            BaseStream.Position = GetOffset(resourcesRVA) + offset;
+            uint resSize = ReadUInt32();
+            return ReadBytes((int)resSize);
+        }
+
+        internal MetaDataElement GetTokenElement(uint token)
+        {
+            uint tabIx = (token & FileImage.TableMask) >> 24;
+            uint elemIx = (token & FileImage.ElementMask) - 1;
+            MetaDataElement elem = (MetaDataElement)tables[tabIx][(int)elemIx];
+            if ((elem != null) && (elem.unresolved))
+            {
+                elem.Resolve(this);
+                elem = (MetaDataElement)tables[tabIx][(int)elemIx];
+            }
+            return elem;
+        }
+
+        internal MetaDataElement GetElement(MDTable tabIx, uint ix)
+        {
+            if (ix == 0) return null;
+            MetaDataElement elem = (MetaDataElement)tables[(int)tabIx][(int)ix - 1];
+            if ((elem != null) && (elem.unresolved))
+            {
+                elem.Resolve(this);
+                elem = (MetaDataElement)tables[(int)tabIx][(int)ix - 1];
+            }
+            return elem;
+        }
+
+        internal MetaDataElement GetCodedElement(CIx code, uint ix)
+        {
+            uint mask = (uint)MetaData.CIxBitMasks[MetaData.CIxShiftMap[(uint)code]];
+            int tabIx = MetaData.CIxTables[(int)code][(ix & mask)];
+            ix >>= MetaData.CIxShiftMap[(uint)code];
+            if (ix == 0) return null;
+            MetaDataElement elem = (MetaDataElement)tables[tabIx][(int)ix - 1];
+            if ((elem != null) && (elem.unresolved))
+            {
+                elem.Resolve(this);
+                elem = (MetaDataElement)tables[tabIx][(int)ix - 1];
+            }
+            return elem;
+        }
+
+        internal uint MakeCodedIndex(CIx code, MDTable tab, uint ix)
+        {
+            ix <<= MetaData.CIxShiftMap[(uint)code];
+            ix &= (uint)tab;
+            return ix;
+        }
+
+        internal MDTable CodedTable(CIx code, uint ix)
+        {
+            uint mask = (uint)MetaData.CIxBitMasks[MetaData.CIxShiftMap[(uint)code]];
+            return (MDTable)MetaData.CIxTables[(int)code][(ix & mask)];
+        }
+
+        internal uint CodedIndex(CIx code, uint ix)
+        {
+            ix >>= MetaData.CIxShiftMap[(uint)code];
+            return ix;
+        }
+
+        internal byte[] GetBlob()
+        {
+            /* pre:  buffer is at correct position to read blob index */
+            uint ix;
+            if (md.largeBlob) ix = ReadUInt32();
+            else ix = ReadUInt16();
+            return blob.GetBlob(ix);
+        }
+
+        internal byte[] GetBlob(uint ix)
+        {
+            return blob.GetBlob(ix);
+        }
+
+        internal uint GetBlobIx()
+        {
+            /* pre:  buffer is at correct position to read blob index */
+            //if (Diag.CADiag) Console.WriteLine("Getting blob index at " + BaseStream.Position);
+            if (md.largeBlob) return ReadUInt32();
+            return ReadUInt16();
+        }
+
+        internal byte FirstBlobByte(uint ix)
+        {
+            blob.GoToIndex(ix);
+            uint blobSize = blob.ReadCompressedNum();
+            return blob.ReadByte();
+        }
+
+        internal Constant GetBlobConst(int constType)
+        {
+            uint ix;
+            if (md.largeBlob) ix = ReadUInt32();
+            else ix = ReadUInt16();
+            blob.GoToIndex(ix);
+            uint blobSize = blob.ReadCompressedNum();
+            if (constType == (int)ElementType.String)
+                return new StringConst(blob.ReadBytes((int)blobSize));
+            return ReadConst(constType, blob);
+        }
+
+        /*
+        internal Constant ReadConstBlob(int constType, uint blobIx) {
+          blob.GoToIndex(blobIx);
+          Console.WriteLine("Reading constant blob at index " + blobIx );
+          uint blobSize = blob.ReadCompressedNum();
+          Console.WriteLine("Got constant blob size of " + blobSize);
+          return ReadConst(constType);
+        }
+        */
+
+        internal static Constant ReadConst(int constType, BinaryReader blob)
+        {
+            switch (constType)
+            {
+                case ((int)ElementType.Boolean):
+                    return new BoolConst(blob.ReadByte() != 0);
+                case ((int)ElementType.Char):
+                    return new CharConst(blob.ReadChar());
+                case ((int)ElementType.I1):
+                    return new IntConst(blob.ReadSByte());
+                case ((int)ElementType.U1):
+                    return new UIntConst(blob.ReadByte());
+                case ((int)ElementType.I2):
+                    return new IntConst(blob.ReadInt16());
+                case ((int)ElementType.U2):
+                    return new UIntConst(blob.ReadUInt16());
+                case ((int)ElementType.I4):
+                    return new IntConst(blob.ReadInt32());
+                case ((int)ElementType.U4):
+                    return new UIntConst(blob.ReadUInt32());
+                case ((int)ElementType.I8):
+                    return new IntConst(blob.ReadInt64());
+                case ((int)ElementType.U8):
+                    return new UIntConst(blob.ReadUInt64());
+                case ((int)ElementType.R4):
+                    return new FloatConst(blob.ReadSingle());
+                case ((int)ElementType.R8):
+                    return new DoubleConst(blob.ReadDouble());
+                case ((int)ElementType.ClassType):
+                    return new ClassTypeConst(blob.ReadString());  //GetBlobString()); 
+                case ((int)ElementType.String):
+                    return new StringConst(blob.ReadString());  //GetBlobString()); 
+                case ((int)ElementType.Class):
+                    return new ClassTypeConst(blob.ReadString());  //GetBlobString()); 
+                //uint junk = blob.ReadUInt32();  // need to read name??
+                //return new NullRefConst();
+                case ((int)ElementType.ValueType):  // only const value type is enum??
+                    return new IntConst(blob.ReadInt32());
+
+                default: return null;
+            }
+        }
+
+        internal string GetBlobString()
+        {
+            uint ix;
+            if (md.largeBlob) ix = ReadUInt32();
+            else ix = ReadUInt16();
+            return blob.GetBlobString(ix);
+        }
+
+        internal string GetString()
+        {
+            uint ix;
+            if (md.largeStrings) ix = ReadUInt32();
+            else ix = ReadUInt16();
+            return strings.GetString(ix);
+        }
+
+        internal string GetString(uint ix)
+        {
+            return strings.GetString(ix);
+        }
+
+        internal uint GetStringIx()
+        {
+            if (md.largeStrings) return ReadUInt32();
+            else return ReadUInt16();
+        }
+
+        internal uint GetGUIDIx()
+        {
+            /* pre:  buffer is at correct position to read GUID index */
+            if (md.largeGUID) return ReadUInt32();
+            return ReadUInt16();
+        }
+
+        public Guid GetGUID()
+        {
+            uint ix;
+            if (md.largeGUID) ix = ReadUInt32();
+            else ix = ReadUInt16();
+            return new Guid(guid.GetBlob(((ix - 1) * 16), 16));
+        }
+
+        public string GetUserString()
+        {
+            uint ix;
+            if (md.largeUS) ix = ReadUInt32();
+            else ix = ReadUInt16();
+            return userstring.GetUserString(ix);
+        }
+
+        internal bool IsFieldSig(uint blobIx)
+        {
+            blob.GoToIndex(blobIx);
+            uint blobSize = blob.ReadCompressedNum();
+            byte fldByte = blob.ReadByte();
+            return fldByte == Field.FieldTag;
+        }
+
+        internal MethSig ReadMethSig(Method thisMeth, uint blobIx)
+        {
+            blob.GoToIndex(blobIx);
+            uint blobSize = blob.ReadCompressedNum();
+            return ReadMethSig(thisMeth, false);
+        }
+
+        internal MethSig ReadMethSig(Method thisMeth, string name, uint blobIx)
+        {
+            blob.GoToIndex(blobIx);
+            uint blobSize = blob.ReadCompressedNum();
+            MethSig mSig = ReadMethSig(thisMeth, false);
+            mSig.name = name;
+            return mSig;
+        }
+
+        private MethSig ReadMethSig(Method currMeth, bool firstByteRead)
+        {
+            //Class currClass = null;
+            //if (currMeth != null) currClass = (Class)currMeth.GetParent();
+            MethSig meth = new MethSig(null);
+            if (!firstByteRead)
+            {
+                byte firstByte = blob.ReadByte();
+                if (firstByte == Field.FieldTag)
+                    return null;
+                meth.callConv = (CallConv)firstByte;
+            }
+            if ((meth.callConv & CallConv.Generic) != 0)
+            {
+                meth.numGenPars = blob.ReadCompressedNum();
+                if (currMeth is MethodRef)
+                {
+                    ((MethodRef)currMeth).MakeGenericPars(meth.numGenPars);
+                } //else if (currMeth is MethodDef) {
+                //GetGenericParams((MethodDef)currMeth);
+                //}
+            }
+            uint parCount = blob.ReadCompressedNum();
+            if (Diag.DiagOn) Console.WriteLine("Method sig has " + parCount + " parameters");
+            meth.retType = GetBlobType();//currClass,currMeth);
+            if (meth.retType == null)
+                System.Diagnostics.Debug.Assert(meth.retType != null);
+            int optParStart = -1;
+            ArrayList pTypes = new ArrayList();
+            for (int i = 0; i < parCount; i++)
+            {
+                Type pType = GetBlobType();//currClass,currMeth);
+                if (pType == sentinel)
+                {
+                    optParStart = i;
+                    pType = GetBlobType();//currClass,currMeth);
+                }
+                if (Diag.DiagOn) if (pType == null) Console.WriteLine("Param type is null");
+                pTypes.Add(pType);
+            }
+            if (optParStart > -1)
+            {
+                meth.numPars = (uint)optParStart;
+                meth.numOptPars = parCount - meth.numPars;
+                meth.optParTypes = new Type[meth.numOptPars];
+                for (int i = 0; i < meth.numOptPars; i++)
+                {
+                    meth.optParTypes[i] = (Type)pTypes[i + optParStart];
+                }
+            }
+            else
+                meth.numPars = parCount;
+            meth.parTypes = new Type[meth.numPars];
+            for (int i = 0; i < meth.numPars; i++)
+            {
+                meth.parTypes[i] = (Type)pTypes[i];
+            }
+            return meth;
+        }
+
+        internal Type[] ReadMethSpecSig(uint blobIx)
+        { //ClassDef currClass, Method currMeth, uint blobIx) {
+            blob.GoToIndex(blobIx);
+            uint blobSize = blob.ReadCompressedNum();
+            if (blob.ReadByte() != MethodSpec.GENERICINST)
+                throw new Exception("Not a MethodSpec signature");
+            return GetListOfType(); //currClass,currMeth);
+        }
+
+        internal Type GetFieldType(uint blobIx)
+        {
+            //Console.WriteLine("Getting field type");
+            blob.GoToIndex(blobIx);
+            uint blobSize = blob.ReadCompressedNum();
+            byte fldByte = blob.ReadByte();
+            if (fldByte != 0x6)
+                throw new Exception("Expected field signature");
+            //if ((currClass != null) && (currClass is ClassRef))
+            //  currClass = null;
+            return GetBlobType(); //currClass,null);
+        }
+
+        internal Type GetBlobType(uint blobIx)
+        { //Class currClass, Method currMeth, uint blobIx) {
+            blob.GoToIndex(blobIx);
+            uint blobSize = blob.ReadCompressedNum();
+            return GetBlobType(); //currClass,currMeth);
+        }
+
+        private Type[] GetListOfType()
+        { //Class currClass, Method currMeth) {
+            uint numPars = blob.ReadCompressedNum();
+            Type[] gPars = new Type[numPars];
+            for (int i = 0; i < numPars; i++)
+            {
+                gPars[i] = GetBlobType(); //currClass,currMeth);
+            }
+            return gPars;
+        }
+
+        private Type GetBlobType()
+        { //Class currClass, Method currMeth) {
+            byte typeIx = blob.ReadByte();
+            if (Diag.DiagOn) Console.WriteLine("Getting blob type " + (ElementType)typeIx);
+            if (typeIx < PrimitiveType.primitives.Length)
+                return PrimitiveType.primitives[typeIx];
+            switch (typeIx)
+            {
+                case ((int)ElementType.Ptr):
+                    return new UnmanagedPointer(GetBlobType()); //currClass,currMeth)); 
+                case ((int)ElementType.ByRef):
+                    return new ManagedPointer(GetBlobType()); //currClass,currMeth)); 
+                case ((int)ElementType.ValueType):
+                    //Console.WriteLine("Reading value type");
+                    uint vcIx = blob.ReadCompressedNum();
+                    Class vClass = (Class)GetCodedElement(CIx.TypeDefOrRef, vcIx);
+                    vClass.MakeValueClass();
+                    return vClass;
+                case ((int)ElementType.Class):
+                    return (Class)GetCodedElement(CIx.TypeDefOrRef, blob.ReadCompressedNum());
+                case ((int)ElementType.Array):
+                    Type elemType = GetBlobType(); //currClass,currMeth);
+                    int rank = (int)blob.ReadCompressedNum();
+                    int numSizes = (int)blob.ReadCompressedNum();
+                    int[] sizes = null;
+                    int[] hiBounds = null;
+                    if (numSizes > 0)
+                    {
+                        sizes = new int[numSizes];
+                        hiBounds = new int[numSizes];
+                        for (int i = 0; i < numSizes; i++)
+                            sizes[i] = (int)blob.ReadCompressedNum();
+                    }
+                    int numLoBounds = (int)blob.ReadCompressedNum();
+                    int[] loBounds = null;
+                    // 
+                    // We have the constraints: 
+                    //     0 <= numSizes <= numLoBounds <= rank
+                    //                          
+                    if (numLoBounds > 0)
+                    {
+                        loBounds = new int[numLoBounds];
+                        for (int i = 0; i < numLoBounds; i++)
+                            loBounds[i] = blob.ReadCompressedInt();
+                        if (numSizes > 0)
+                            for (int i = 0; i < numSizes; i++)
+                                hiBounds[i] = loBounds[i] + sizes[i] - 1;
+                    }
+                    if (numLoBounds == 0) // Implies numSizes == 0 also 
+                        return new BoundArray(elemType, rank);
+                    else 
+                        return new BoundArray(elemType, rank, loBounds, hiBounds);
+
+                case ((int)ElementType.TypedByRef):
+                    return PrimitiveType.TypedRef;
+                case ((int)ElementType.I):
+                    return PrimitiveType.IntPtr;
+                case ((int)ElementType.U):
+                    return PrimitiveType.UIntPtr;
+                case ((int)ElementType.FnPtr):
+                    MethSig mSig = ReadMethSig(null, false);
+                    return new MethPtrType(mSig);
+                case ((int)ElementType.Object):
+                    return PrimitiveType.Object;
+                case ((int)ElementType.SZArray):
+                    return new ZeroBasedArray(GetBlobType()); //currClass,currMeth));
+                case ((int)ElementType.CmodReqd):
+                case ((int)ElementType.CmodOpt):
+                    Class modType = (Class)GetCodedElement(CIx.TypeDefOrRef, blob.ReadCompressedNum());
+                    return new CustomModifiedType(GetBlobType(), (CustomModifier)typeIx, modType);
+                case ((int)ElementType.Sentinel):
+                    return sentinel;
+                case ((int)ElementType.Pinned):
+                    return pinned;
+                case ((int)ElementType.GenericInst):
+                    Class instType = (Class)GetBlobType();
+                    Class scopeSave = currentClassScope;
+                    if (genInstNestLevel > 0)
+                    {
+                        currentClassScope = instType;
+                    }
+                    genInstNestLevel++;
+                    ClassSpec newClassSpec = new ClassSpec(instType, GetListOfType());
+                    genInstNestLevel--;
+                    if (genInstNestLevel > 0)
+                    {
+                        currentClassScope = scopeSave;
+                    }
+                    return newClassSpec;
+                case ((int)ElementType.Var):
+                    if (currentClassScope == null)
+                    {
+                        //Console.WriteLine("GenericParam with currClass == null");
+                        return GenericParam.AnonClassPar(blob.ReadCompressedNum());
+                        //throw new Exception("No current class set");
+                    }
+                    return currentClassScope.GetGenPar(blob.ReadCompressedNum());
+                case ((int)ElementType.MVar):
+                    if (currentMethodScope == null)
+                    {
+                        //Console.WriteLine("GenericParam with currMeth == null");
+                        return GenericParam.AnonMethPar(blob.ReadCompressedNum());
+                        //throw new Exception("No current method set");
+                    }
+                    return currentMethodScope.GetGenericParam((int)blob.ReadCompressedNum());
+                default: break;
+            }
+            return null;
+        }
+
+        internal NativeType GetBlobNativeType(uint blobIx)
+        {
+            blob.GoToIndex(blobIx);
+            uint blobSize = blob.ReadCompressedNum();
+            return GetBlobNativeType();
+        }
+
+        internal NativeType GetBlobNativeType()
+        {
+            byte typeIx = blob.ReadByte();
+            if (typeIx == (byte)NativeTypeIx.Array)
+            {
+                return new NativeArray(GetBlobNativeType(), blob.ReadCompressedNum(),
+                    blob.ReadCompressedNum(), blob.ReadCompressedNum());
+            }
+            else
+                return NativeType.GetNativeType(typeIx);
+        }
+
+        internal Local[] ReadLocalSig(uint sigIx)
+        { //Class currClass, Method currMeth, uint sigIx) {
+            blob.GoToIndex(sigIx);
+            uint blobSize = blob.ReadCompressedNum();
+            if (blob.ReadByte() != LocalSig.LocalSigByte) InputError();
+            uint count = blob.ReadCompressedNum();
+            Local[] locals = new Local[count];
+            for (uint i = 0; i < count; i++)
+            {
+                Type lType = GetBlobType(); //currClass,currMeth);
+                bool pinnedLocal = lType == pinned;
+                if (pinnedLocal) lType = GetBlobType(); //currClass,currMeth);
+                locals[i] = new Local("loc" + i, lType, pinnedLocal);
+            }
+            return locals;
+        }
+
+        internal void ReadPropertySig(uint sigIx, Property prop)
+        {
+            blob.GoToIndex(sigIx);
+            uint blobSize = blob.ReadCompressedNum();
+            if ((blob.ReadByte() & Property.PropertyTag) != Property.PropertyTag) InputError();
+            uint count = blob.ReadCompressedNum();
+            Type[] pars = new Type[count];
+            prop.SetPropertyType(GetBlobType()); //prop.GetParent(),null));
+            for (int i = 0; i < count; i++)
+                pars[i] = GetBlobType(); //prop.GetParent(),null);
+            prop.SetPropertyParams(pars);
+        }
+
+        internal DataConstant GetDataConstant(uint rva, Type constType)
+        {
+            BaseStream.Seek(GetOffset(rva), SeekOrigin.Begin);
+            if (constType is PrimitiveType)
+            {
+                switch (constType.GetTypeIndex())
+                {
+                    case ((int)ElementType.I1): return new IntConst(ReadByte());
+                    case ((int)ElementType.I2): return new IntConst(ReadInt16());
+                    case ((int)ElementType.I4): return new IntConst(ReadInt32());
+                    case ((int)ElementType.I8): return new IntConst(ReadInt64());
+                    case ((int)ElementType.R4): return new FloatConst(ReadSingle());
+                    case ((int)ElementType.R8): return new DoubleConst(ReadDouble());
+                    case ((int)ElementType.String): return new StringConst(ReadString());
+                }
+            }
+            else if (constType is ManagedPointer)
+            {
+                uint dataRVA = ReadUInt32();
+                Type baseType = ((ManagedPointer)constType).GetBaseType();
+                return new AddressConstant(GetDataConstant(dataRVA, baseType));
+            } // need to do repeated constant??
+            return null;
+        }
+
+        internal ModuleFile GetFileDesc(string name)
+        {
+            if (tables[(int)MDTable.File] == null) return null;
+            for (int i = 0; i < tables[(int)MDTable.File].Length; i++)
+            {
+                FileRef fr = (FileRef)tables[(int)MDTable.File][i];
+                if (fr.Name() == name)
+                {
+                    if (fr is ModuleFile) return (ModuleFile)fr;
+                    fr = new ModuleFile(fr.Name(), fr.GetHash());
+                    tables[(int)MDTable.File][i] = fr;
+                    return (ModuleFile)fr;
+                }
+            }
+            return null;
+        }
+
+        /*
+        private long GetOffset(int rva) {
+          for (int i=0; i < inputSections.Length; i++) {
+            long offs = inputSections[i].GetOffset(rva);
+            if (offs > 0) return offs;
+          }
+          return 0;
+        }
+
+        public bool ReadPadding(int boundary) {
+          while ((Position % boundary) != 0) {
+            if (buffer[index++] != 0) { return false; }
+          }
+          return true;
+        }
+
+        public String ReadName() {
+          int len = NAMELEN;
+          char [] nameStr = new char[NAMELEN];
+          char ch = (char)ReadByte();
+          int i=0;
+          for (; (i < NAMELEN) && (ch != '\0'); i++) {
+            nameStr[i] = ch;
+            ch = (char)ReadByte();
+          }
+          return new String(nameStr,0,i);
+        }
+
+        internal String ReadString() {
+          char [] str = new char[STRLEN];
+          int i=0;
+          char ch = (char)ReadByte();
+          for (; ch != '\0'; i++) {
+            str[i] = ch;
+            ch = (char)ReadByte();
+          }
+          return new String(str,0,i);
+        }
+
+        public long GetPos() {
+          return BaseStream.Position;
+        }
+
+        public void SetPos(int ix) {
+          BaseStream.Position = ix;
+        }
+    */
+        /*
+        public void SetToRVA(int rva) {
+          index = PESection.GetOffset(rva);
+    //      Console.WriteLine("Setting buffer to rva " + PEConsts.Hex(rva) + " = index " + PEConsts.Hex(index));
+    //      Console.WriteLine("Setting buffer to rva " + rva + " = index " + index);
+        }
+
+        public byte[] GetBuffer() {
+          return buffer;
+        }
+    */
+        private CILInstruction[] DoByteCodes(uint len, MethodDef thisMeth)
+        {
+            uint pos = 0;
+            ArrayList instrList = new ArrayList();
+            //int instrIx = 0;
+            while (pos < len)
+            {
+                uint offset = pos;
+                uint opCode = ReadByte();
+                pos++;
+                IType iType = IType.op;
+                if (opCode == 0xFE)
+                {
+                    uint ix = ReadByte();
+                    pos++;
+                    opCode = (opCode << 8) + ix;
+                    iType = FileImage.longInstrMap[ix];
+                }
+                else
+                    iType = FileImage.instrMap[opCode];
+                if (Diag.DiagOn) Console.WriteLine("Got instruction type " + iType);
+                CILInstruction nextInstr = null;
+                if (iType == IType.specialOp)
+                {
+                    pos += 4;
+                    if (Diag.DiagOn) Console.WriteLine("Got instruction " + Hex.Byte((int)opCode));
+                    switch (opCode)
+                    {
+                        case ((int)SpecialOp.ldc_i8):
+                            nextInstr = new LongInstr((SpecialOp)opCode, ReadInt64());
+                            pos += 4; break;
+                        case ((int)SpecialOp.ldc_r4):
+                            nextInstr = new FloatInstr((SpecialOp)opCode, ReadSingle());
+                            break;
+                        case ((int)SpecialOp.ldc_r8):
+                            nextInstr = new DoubleInstr((SpecialOp)opCode, ReadDouble());
+                            pos += 4; break;
+                        case ((int)SpecialOp.calli):
+                            nextInstr = new SigInstr((SpecialOp)opCode, (CalliSig)GetTokenElement(ReadUInt32()));
+                            break;
+                        case ((int)SpecialOp.Switch): // switch
+                            uint count = ReadUInt32();
+                            int[] offsets = new int[count];
+                            for (uint i = 0; i < count; i++)
+                                offsets[i] = ReadInt32();
+                            pos += (4 * count);
+                            nextInstr = new SwitchInstr(offsets);
+                            break;
+                        case ((int)SpecialOp.ldstr): // ldstr
+                            uint strIx = ReadUInt32();
+                            strIx = strIx & FileImage.ElementMask;
+                            nextInstr = new StringInstr((SpecialOp)opCode, userstring.GetUserString(strIx));
+                            break;
+                        case ((int)MethodOp.ldtoken):
+                            MetaDataElement elem = GetTokenElement(ReadUInt32());
+                            if (elem is Method)
+                                nextInstr = new MethInstr((MethodOp)opCode, (Method)elem);
+                            else if (elem is Field)
+                                nextInstr = new FieldInstr((FieldOp)opCode, (Field)elem);
+                            else
+                                nextInstr = new TypeInstr((TypeOp)opCode, (Type)elem);
+                            break;
+                    }
+                }
+                else if (iType == IType.branchOp)
+                {
+                    if (Diag.DiagOn) Console.WriteLine("Got instruction " + Hex.Byte((int)opCode));
+                    if ((opCode < 0x38) || (opCode == 0xDE))
+                    { // br or leave.s
+                        nextInstr = new BranchInstr(opCode, ReadSByte());
+                        pos++;
+                    }
+                    else
+                    {
+                        nextInstr = new BranchInstr(opCode, ReadInt32());
+                        pos += 4;
+                    }
+                }
+                else
+                {
+                    if (Diag.DiagOn) Console.Write(Hex.Byte((int)opCode));
+                    switch (iType)
+                    {
+                        case (IType.op):
+                            if (Diag.DiagOn) Console.WriteLine("Got instruction " + (Op)opCode);
+                            nextInstr = new Instr((Op)opCode); break;
+                        case (IType.methOp):
+                            if (Diag.DiagOn) Console.WriteLine("Got instruction " + (MethodOp)opCode);
+                            nextInstr = new MethInstr((MethodOp)opCode, (Method)GetTokenElement(ReadUInt32()));
+                            pos += 4;
+                            break;
+                        case (IType.typeOp):
+                            if (Diag.DiagOn) Console.WriteLine("Got instruction " + (TypeOp)opCode);
+                            uint ttok = ReadUInt32();
+                            Type typeToken = (Type)GetTokenElement(ttok);
+                            if (typeToken is GenericParTypeSpec)
+                                typeToken = ((GenericParTypeSpec)typeToken).GetGenericParam(thisMeth);
+                            nextInstr = new TypeInstr((TypeOp)opCode, typeToken);
+                            pos += 4;
+                            break;
+                        case (IType.fieldOp):
+                            if (Diag.DiagOn) Console.WriteLine("Got instruction " + (FieldOp)opCode);
+                            nextInstr = new FieldInstr((FieldOp)opCode, (Field)GetTokenElement(ReadUInt32()));
+                            pos += 4;
+                            break;
+                        case (IType.int8Op):
+                            nextInstr = new IntInstr((IntOp)opCode, ReadSByte());
+                            pos++;
+                            break;
+                        case (IType.uint8Op):
+                            nextInstr = new UIntInstr((IntOp)opCode, ReadByte());
+                            pos++;
+                            break;
+                        case (IType.uint16Op):
+                            nextInstr = new UIntInstr((IntOp)opCode, ReadUInt16());
+                            pos++;
+                            break;
+                        case (IType.int32Op):
+                            nextInstr = new IntInstr((IntOp)opCode, ReadInt32());
+                            pos += 4;
+                            break;
+                    }
+                }
+                if (nextInstr != null) nextInstr.Resolve();
+                instrList.Add(nextInstr);
+            }
+            CILInstruction[] instrs = new CILInstruction[instrList.Count];
+            for (int i = 0; i < instrs.Length; i++)
+            {
+                instrs[i] = (CILInstruction)instrList[i];
+            }
+            return instrs;
+        }
+
+        public void ReadByteCodes(MethodDef meth, uint rva)
+        {
+            if (rva == 0) return;
+            BaseStream.Seek(GetOffset(rva), SeekOrigin.Begin);
+            CILInstructions instrs = meth.CreateCodeBuffer();
+            uint formatByte = ReadByte();
+            uint format = formatByte & 0x3;
+            if (Diag.DiagOn) Console.WriteLine("code header format = " + Hex.Byte((int)formatByte));
+            uint size = 0;
+            if (format == CILInstructions.TinyFormat)
+            {
+                size = formatByte >> 2;
+                if (Diag.DiagOn) Console.WriteLine("Tiny Format, code size = " + size);
+                instrs.SetAndResolveInstructions(DoByteCodes(size, meth));
+            }
+            else if (format == CILInstructions.FatFormat)
+            {
+                uint headerSize = ReadByte();
+                bool initLocals = (formatByte & CILInstructions.InitLocals) != 0;
+                bool moreSects = (formatByte & CILInstructions.MoreSects) != 0;
+                meth.SetMaxStack((int)ReadUInt16());
+                size = ReadUInt32();
+                if (Diag.DiagOn) Console.WriteLine("Fat Format, code size = " + size);
+                uint locVarSig = ReadUInt32();
+                CILInstruction[] instrList = this.DoByteCodes(size, meth);
+                while (moreSects)
+                {
+                    // find next 4 byte boundary
+                    long currPos = BaseStream.Position;
+                    if (currPos % 4 != 0)
+                    {
+                        long pad = 4 - (currPos % 4);
+                        for (int p = 0; p < pad; p++)
+                            ReadByte();
+                    }
+                    uint flags = ReadByte();
+                    //while (flags == 0) flags = ReadByte();  // maximum of 3 to get 4 byte boundary??
+                    moreSects = (flags & CILInstructions.SectMoreSects) != 0;
+                    bool fatSect = (flags & CILInstructions.SectFatFormat) != 0;
+                    if ((flags & CILInstructions.EHTable) == 0)
+                        throw new Exception("Section not an Exception Handler Table");
+                    int sectLen = ReadByte() + (ReadByte() << 8) + (ReadByte() << 16);
+                    int numClauses = sectLen - 4;
+                    if (fatSect)
+                        numClauses /= 24;
+                    else
+                        numClauses /= 12;
+                    for (int i = 0; i < numClauses; i++)
+                    {
+                        EHClauseType eFlag;
+                        if (fatSect) eFlag = (EHClauseType)ReadUInt32();
+                        else eFlag = (EHClauseType)ReadUInt16();
+                        uint tryOff = 0, tryLen = 0, hOff = 0, hLen = 0;
+                        if (fatSect)
+                        {
+                            tryOff = ReadUInt32();
+                            tryLen = ReadUInt32();
+                            hOff = ReadUInt32();
+                            hLen = ReadUInt32();
+                        }
+                        else
+                        {
+                            tryOff = ReadUInt16();
+                            tryLen = ReadByte();
+                            hOff = ReadUInt16();
+                            hLen = ReadByte();
+                        }
+                        EHClause ehClause = new EHClause(eFlag, tryOff, tryLen, hOff, hLen);
+                        if (eFlag == EHClauseType.Exception)
+                            ehClause.ClassToken(GetTokenElement(ReadUInt32()));
+                        else
+                            ehClause.FilterOffset(ReadUInt32());
+                        instrs.AddEHClause(ehClause);
+                    }
+                }
+                if (locVarSig != 0)
+                {
+                    LocalSig lSig = (LocalSig)GetTokenElement(locVarSig);
+                    lSig.Resolve(this, meth);
+                    meth.AddLocals(lSig.GetLocals(), initLocals);
+                }
+                instrs.SetAndResolveInstructions(instrList);
+            }
+            else
+            {
+                Console.WriteLine("byte code format error");
+            }
+        }
+
+    }
+
+
+
+}

PERWAPI/PEResourceClasses.cs

@@ -0,0 +1,184 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+
+
+namespace QUT.PERWAPI
+{
+    public abstract class PEResourceElement
+    {
+
+        private int id;
+        private string name;
+
+        public PEResourceElement() { }
+
+        public int Id
+        {
+            get { return id; }
+            set { id = value; }
+        }
+
+        public string Name
+        {
+            get { return name; }
+            set { name = value; }
+        }
+
+        protected internal abstract uint Size();
+
+        protected internal abstract void Write(BinaryWriter dest, uint RVA);
+    }
+
+    public class PEResourceDirectory : PEResourceElement
+    {
+        public PEResourceDirectory() { }
+
+        private uint date = 0;
+        private ushort majver = 1;
+        private ushort minver = 0;
+
+        public uint Date { get { return date; } set { date = value; } }
+        public ushort MajVer { get { return majver; } set { majver = value; } }
+        public ushort MinVer { get { return minver; } set { minver = value; } }
+
+        private ArrayList subitems = new ArrayList();
+
+        public PEResourceElement this[int i] { get { return (PEResourceElement)subitems[i]; } }
+
+        public int Count() { return subitems.Count; }
+
+        public bool HasData()
+        {
+            return subitems.Count > 0;
+        }
+
+        public void AddElement(PEResourceElement el)
+        {
+            subitems.Add(el);
+        }
+        private uint subsize, namesize, dirsize, numnamed;
+        protected internal override uint Size()
+        {
+            namesize = 0;
+            numnamed = 0;
+            subsize = 0;
+            for (int i = 0; i < subitems.Count; i++)
+            {
+                PEResourceElement el = (PEResourceElement)subitems[i];
+                subsize += el.Size();
+                if (el.Name != null)
+                {
+                    namesize += 2 + (uint)el.Name.Length * 2;
+                    numnamed++;
+                }
+            }
+            dirsize = (uint)subitems.Count * 8 + 16;
+            return dirsize + namesize + subsize;
+        }
+
+        protected internal override void Write(BinaryWriter dest, uint RVA)
+        {
+            Size();
+            dest.Flush();
+            uint startnameoffset = (uint)dest.BaseStream.Position + (uint)dirsize;
+            uint curritemoffset = startnameoffset + (uint)namesize;
+            dest.Write((uint)0); // characteristics
+            dest.Write(date); // datetime
+            dest.Write(majver);
+            dest.Write(minver);
+            dest.Write((ushort)numnamed);
+            dest.Write((ushort)(subitems.Count - numnamed));
+
+            uint currnameoffset = startnameoffset;
+            for (int i = 0; i < subitems.Count; i++)
+            {
+                PEResourceElement el = (PEResourceElement)subitems[i];
+                if (el.Name != null)
+                {
+                    dest.Write((uint)(currnameoffset | 0x80000000));
+                    if (el is PEResourceDirectory)
+                        dest.Write((uint)(curritemoffset | 0x80000000));
+                    else
+                        dest.Write((uint)curritemoffset);
+                    currnameoffset += 2 + (uint)el.Name.Length * 2;
+                }
+                curritemoffset += el.Size();
+            }
+            curritemoffset = startnameoffset + namesize;
+            for (int i = 0; i < subitems.Count; i++)
+            {
+                PEResourceElement el = (PEResourceElement)subitems[i];
+                if (el.Name == null)
+                {
+                    dest.Write(el.Id);
+                    if (el is PEResourceDirectory)
+                        dest.Write((uint)(curritemoffset | 0x80000000));
+                    else
+                        dest.Write((uint)curritemoffset);
+                }
+                curritemoffset += el.Size();
+            }
+            for (int i = 0; i < subitems.Count; i++)
+            {
+                PEResourceElement el = (PEResourceElement)subitems[i];
+                string s = el.Name;
+                if (s != null)
+                {
+                    dest.Write((ushort)s.Length);
+                    byte[] b = System.Text.Encoding.Unicode.GetBytes(s);
+                    dest.Write(b);
+                }
+            }
+            for (int i = 0; i < subitems.Count; i++)
+            {
+                PEResourceElement el = (PEResourceElement)subitems[i];
+                el.Write(dest, RVA);
+            }
+
+        }
+    }
+
+    public class PEResourceData : PEResourceElement
+    {
+        public PEResourceData() { }
+        int codepage = 0;
+        byte[] data;
+
+        public int CodePage { get { return codepage; } set { codepage = value; } }
+
+        public byte[] Data { get { return data; } set { data = value; } }
+
+        protected internal override uint Size()
+        {
+            return 16 + (uint)Data.Length;
+        }
+
+        protected internal override void Write(BinaryWriter dest, uint RVA)
+        {
+            dest.Flush();
+            dest.Write((uint)(dest.BaseStream.Position + 16) + RVA);
+            dest.Write((uint)data.Length);
+            dest.Write((uint)codepage);
+            dest.Write((uint)0);
+            dest.Write(data);
+        }
+    }
+}

PERWAPI/PEWriter.cs

@@ -0,0 +1,620 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Diagnostics;
+using System.Collections;
+
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    // Class to Write PE File
+    /**************************************************************************/
+
+    internal class PEWriter : BinaryWriter
+    {
+        private Section text, sdata, rsrc = null;
+        ArrayList data;
+        BinaryWriter reloc = new BinaryWriter(new MemoryStream());
+        uint dateStamp = 0, codeStart = 0;
+        uint numSections = 2; // always have .text  and .reloc sections
+        internal PEFileVersionInfo verInfo;
+        //internal bool delaySign;
+        uint entryPointOffset, entryPointPadding, imageSize, headerSize, headerPadding, entryPointToken = 0;
+        uint relocOffset, relocRVA, relocSize, relocPadding, relocTide, hintNameTableOffset, resourcesSize = 0;
+        uint metaDataOffset, runtimeEngineOffset, initDataSize = 0, resourcesOffset, importTablePadding;
+        uint importTableOffset, importLookupTableOffset, totalImportTableSize, entryPointReloc = 0; //, delaySignOffset;
+        uint debugOffset = 0, debugSize = 0, debugRVA = 0;
+        long debugBytesStartOffset = 0;
+        MetaDataOut metaData;
+        char[] runtimeEngine = FileImage.runtimeEngineName.ToCharArray(), hintNameTable;
+        bool closeStream = true;
+        int debugBytesSize = 25; // NOTE: I don't know that this should be 25 but the debug bytes size seems to be 25 plus the size of the PDB filename. AKB 06-01-2007
+        internal PDBWriter pdbWriter;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        internal PEWriter(PEFileVersionInfo verInfo, string fileName, MetaDataOut md, bool writePDB)
+            : base(new FileStream(fileName, FileMode.Create))
+        {
+            InitPEWriter(verInfo, md, writePDB, fileName);
+            TimeSpan tmp = System.IO.File.GetCreationTime(fileName).Subtract(FileImage.origin);
+            dateStamp = Convert.ToUInt32(tmp.TotalSeconds);
+        }
+
+        internal PEWriter(PEFileVersionInfo verInfo, Stream str, MetaDataOut md)
+            : base(str)
+        {
+            // NOTE: Can not write a PDB file if using a stream.
+            InitPEWriter(verInfo, md, false, null);
+            TimeSpan tmp = DateTime.Now.Subtract(FileImage.origin);
+            dateStamp = Convert.ToUInt32(tmp.TotalSeconds);
+            closeStream = false;
+        }
+
+
+
+        /*----------------------------- Writing -----------------------------------------*/
+
+        private void InitPEWriter(PEFileVersionInfo verInfo, MetaDataOut md, bool writePDB, string fileName)
+        {
+            this.verInfo = verInfo;
+            if (!verInfo.fromExisting)
+                verInfo.lMajor = MetaData.LMajors[(int)verInfo.netVersion];
+            if (verInfo.isDLL)
+            {
+                hintNameTable = FileImage.dllHintNameTable.ToCharArray();
+                if (!verInfo.fromExisting) verInfo.characteristics = FileImage.dllCharacteristics;
+            }
+            else
+            {
+                hintNameTable = FileImage.exeHintNameTable.ToCharArray();
+                if (!verInfo.fromExisting) verInfo.characteristics = FileImage.exeCharacteristics;
+            }
+            text = new Section(FileImage.textName, 0x60000020);     // IMAGE_SCN_CNT  CODE, EXECUTE, READ
+            //			rsrc = new Section(rsrcName,0x40000040);     // IMAGE_SCN_CNT  INITIALIZED_DATA, READ
+            metaData = md;
+            metaData.InitMetaDataOut(this);
+
+            // Check if we should include a PDB file
+            if (writePDB)
+            {
+
+                // Work out the PDB filename from the PE files filename
+                if ((fileName == null) || (fileName == "")) fileName = "default";
+
+                // Setup the PDB Writer object
+                pdbWriter = new PDBWriter(fileName);
+
+                // Set the amount of space required for the debug information
+                debugBytesSize += pdbWriter.PDBFilename.Length;
+
+            }
+
+        }
+
+        private uint GetNextSectStart(uint rva, uint tide)
+        {
+            if (tide < FileImage.SectionAlignment) return rva + FileImage.SectionAlignment;
+            return rva + ((tide / FileImage.SectionAlignment) + 1) * FileImage.SectionAlignment;
+        }
+
+        private void BuildTextSection()
+        {
+            // .text layout
+            //    IAT (single entry 8 bytes for pure CIL)
+            //    CLIHeader (72 bytes)
+            //    CIL instructions for all methods (variable size)
+            //    Strong Name Signature
+            //    MetaData 
+            //    ManagedResources
+            //    ImportTable (40 bytes)
+            //    ImportLookupTable(8 bytes) (same as IAT for standard CIL files)
+            //    Hint/Name Tables with entry "_CorExeMain" for .exe file and "_CorDllMain" for .dll (14 bytes)
+            //    ASCII string "mscoree.dll" referenced in ImportTable (+ padding = 16 bytes)
+            //    Entry Point  (0xFF25 followed by 4 bytes 0x400000 + RVA of .text)
+            codeStart = FileImage.IATSize + FileImage.CLIHeaderSize;
+            if (Diag.DiagOn) Console.WriteLine("Code starts at " + Hex.Int(codeStart));
+            metaData.BuildMetaData();
+            // strongNameSig = metaData.GetStrongNameSig();
+            metaDataOffset = FileImage.IATSize + FileImage.CLIHeaderSize + metaData.CodeSize();
+            if (pdbWriter != null)
+            {
+                debugSize = 0x1C; // or size of debugBytes??
+                debugOffset = metaDataOffset;
+                metaDataOffset += (uint)debugBytesSize + debugSize + NumToAlign((uint)debugBytesSize, 4);
+            }
+            resourcesOffset = metaDataOffset + metaData.Size();
+            resourcesSize = metaData.GetResourcesSize();
+            importTableOffset = resourcesOffset + resourcesSize;
+            importTablePadding = NumToAlign(importTableOffset, 16);
+            importTableOffset += importTablePadding;
+            importLookupTableOffset = importTableOffset + FileImage.ImportTableSize;
+            hintNameTableOffset = importLookupTableOffset + FileImage.IATSize;
+            runtimeEngineOffset = hintNameTableOffset + (uint)hintNameTable.Length;
+            entryPointOffset = runtimeEngineOffset + (uint)runtimeEngine.Length;
+            totalImportTableSize = entryPointOffset - importTableOffset;
+            if (Diag.DiagOn)
+            {
+                Console.WriteLine("total import table size = " + totalImportTableSize);
+                Console.WriteLine("entrypoint offset = " + Hex.Int(entryPointOffset));
+            }
+            entryPointPadding = NumToAlign(entryPointOffset, 4) + 2;
+            entryPointOffset += entryPointPadding;
+            entryPointReloc = entryPointOffset + 2;
+            text.IncTide(entryPointOffset + 6);
+            // The following lines may have some benefit for speed,
+            // but can increase the PE file size by up to 10k in
+            // some circumstances.  Can be commented out safely.
+            if (text.Tide() > 8 * FileImage.maxFileAlign)
+                verInfo.fileAlign = FileImage.maxFileAlign;
+            else if (text.Tide() > 2 * FileImage.maxFileAlign)
+                verInfo.fileAlign = FileImage.midFileAlign;
+
+            text.SetSize(NumToAlign(text.Tide(), verInfo.fileAlign));
+            if (Diag.DiagOn)
+            {
+                Console.WriteLine("text size = " + text.Size() + " text tide = " + text.Tide() + " text padding = " + text.Padding());
+                Console.WriteLine("metaDataOffset = " + Hex.Int(metaDataOffset));
+                Console.WriteLine("importTableOffset = " + Hex.Int(importTableOffset));
+                Console.WriteLine("importLookupTableOffset = " + Hex.Int(importLookupTableOffset));
+                Console.WriteLine("hintNameTableOffset = " + Hex.Int(hintNameTableOffset));
+                Console.WriteLine("runtimeEngineOffset = " + Hex.Int(runtimeEngineOffset));
+                Console.WriteLine("entryPointOffset = " + Hex.Int(entryPointOffset));
+                Console.WriteLine("entryPointPadding = " + Hex.Int(entryPointPadding));
+            }
+        }
+
+        internal void BuildRelocSection()
+        {
+            // do entry point reloc
+            uint relocPage = entryPointReloc / Section.relocPageSize;
+            uint pageOff = relocPage * Section.relocPageSize;
+            reloc.Write(text.RVA() + pageOff);
+            reloc.Write(12);
+            uint fixUpOff = entryPointReloc - pageOff;
+            reloc.Write((ushort)((0x3 << 12) | fixUpOff));
+            reloc.Write((ushort)0);
+            // text.DoRelocs(reloc);
+            if (sdata != null) sdata.DoRelocs(reloc);
+            if (rsrc != null) rsrc.DoRelocs(reloc);
+            relocTide = (uint)reloc.Seek(0, SeekOrigin.Current);
+            //reloc.Write((uint)0);
+            if (Diag.DiagOn) Console.WriteLine("relocTide = " + relocTide);
+            relocPadding = NumToAlign(relocTide, verInfo.fileAlign);
+            relocSize = relocTide + relocPadding;
+            imageSize = relocRVA + FileImage.SectionAlignment;
+            initDataSize += relocSize;
+        }
+
+        private void CalcOffsets()
+        {
+            if (sdata != null) numSections++;
+            if (rsrc != null) numSections++;
+            headerSize = FileImage.fileHeaderSize + (numSections * FileImage.sectionHeaderSize);
+            headerPadding = NumToAlign(headerSize, verInfo.fileAlign);
+            headerSize += headerPadding;
+            uint offset = headerSize;
+            uint rva = FileImage.SectionAlignment;
+            text.SetOffset(offset);
+            text.SetRVA(rva);
+            if (pdbWriter != null) debugRVA = rva + debugOffset;
+            offset += text.Size();
+            rva = GetNextSectStart(rva, text.Tide());
+            // Console.WriteLine("headerSize = " + headerSize);
+            // Console.WriteLine("headerPadding = " + headerPadding);
+            // Console.WriteLine("textOffset = " + Hex.Int(text.Offset()));
+            if (sdata != null)
+            {
+                sdata.SetOffset(offset);
+                sdata.SetRVA(rva);
+                for (int i = 0; i < data.Count; i++)
+                {
+                    DataConstant cVal = (DataConstant)data[i];
+                    cVal.DataOffset = sdata.Tide();
+                    sdata.IncTide(cVal.GetSize());
+                }
+                sdata.SetSize(NumToAlign(sdata.Tide(), verInfo.fileAlign));
+                offset += sdata.Size();
+                rva = GetNextSectStart(rva, sdata.Tide());
+                initDataSize += sdata.Size();
+            }
+            if (rsrc != null)
+            {
+                //Console.WriteLine("Resource section is not null");
+                rsrc.SetSize(NumToAlign(rsrc.Tide(), verInfo.fileAlign));
+                rsrc.SetOffset(offset);
+                rsrc.SetRVA(rva);
+                offset += rsrc.Size();
+                rva = GetNextSectStart(rva, rsrc.Tide());
+                initDataSize += rsrc.Size();
+            }
+            relocOffset = offset;
+            relocRVA = rva;
+        }
+
+        internal void MakeFile(PEFileVersionInfo verInfo)
+        {
+            this.verInfo = verInfo;
+            if (this.verInfo.isDLL) hintNameTable = FileImage.dllHintNameTable.ToCharArray();
+            else hintNameTable = FileImage.exeHintNameTable.ToCharArray();
+
+            BuildTextSection();
+            CalcOffsets();
+            BuildRelocSection();
+            // now write it out
+            WriteHeader();
+            WriteSections();
+            Flush();
+            if (closeStream) Close();
+            if (pdbWriter != null)
+            {
+
+                // Write the PDB file
+                pdbWriter.WritePDBFile();
+
+                // Check to make sure the DebugInfo is the length we expected.
+                if (pdbWriter.DebugInfo.Length != debugBytesSize)
+                    throw new Exception("DebugInfo for the new PDB file is incompatible with the PE file.  This is most likely an internal error.  Please consult your vendor if you continue to have this problem.");
+
+                // Write the debug info to the PE file
+                using (FileStream fs = new FileStream(pdbWriter.PEFilename, FileMode.Open, FileAccess.ReadWrite))
+                {
+                    using (BinaryWriter bw = new BinaryWriter(fs))
+                    {
+                        // Get to the DebugInfo section
+                        bw.Seek((int)debugBytesStartOffset, SeekOrigin.Begin);
+                        bw.Write(pdbWriter.DebugInfo, 0, pdbWriter.DebugInfo.Length);
+                    }
+                }
+
+            }
+        }
+
+        private void WriteHeader()
+        {
+            Write(FileImage.DOSHeader);
+            // Console.WriteLine("Writing PEHeader at offset " + Seek(0,SeekOrigin.Current));
+            WritePEHeader();
+            // Console.WriteLine("Writing text section header at offset " + Hex.Long(Seek(0,SeekOrigin.Current)));
+            text.WriteHeader(this, relocRVA);
+            if (sdata != null) sdata.WriteHeader(this, relocRVA);
+            if (rsrc != null) rsrc.WriteHeader(this, relocRVA);
+            // Console.WriteLine("Writing reloc section header at offset " + Seek(0,SeekOrigin.Current));
+            WriteRelocSectionHeader();
+            // Console.WriteLine("Writing padding at offset " + Seek(0,SeekOrigin.Current));
+            WriteZeros(headerPadding);
+        }
+
+        private void WriteSections()
+        {
+            // Console.WriteLine("Writing text section at offset " + Seek(0,SeekOrigin.Current));
+            WriteTextSection();
+            if (sdata != null) WriteSDataSection();
+            if (rsrc != null) WriteRsrcSection();
+            WriteRelocSection();
+        }
+
+        private void WriteIAT()
+        {
+            Write(text.RVA() + hintNameTableOffset);
+            Write(0);
+        }
+
+        private void WriteImportTables()
+        {
+            // Import Table
+            WriteZeros(importTablePadding);
+            //Console.WriteLine("Writing import tables at offset " + Hex.Long(Seek(0,SeekOrigin.Current)));
+            //Console.WriteLine("Should be at offset " + Hex.Long(importTableOffset + text.Offset()));
+            Write(importLookupTableOffset + text.RVA());
+            WriteZeros(8);
+            Write(runtimeEngineOffset + text.RVA());
+            Write(text.RVA());    // IAT is at the beginning of the text section
+            WriteZeros(20);
+            // Import Lookup Table
+            WriteIAT();                // lookup table and IAT are the same
+            // Hint/Name Table
+            // Console.WriteLine("Writing hintname table at " + Hex.Long(Seek(0,SeekOrigin.Current)));
+            Write(hintNameTable);
+            Write(FileImage.runtimeEngineName.ToCharArray());
+        }
+
+        private void WriteTextSection()
+        {
+            WriteIAT();
+            WriteCLIHeader();
+            if (Diag.DiagOn)
+                Console.WriteLine("Writing code at " + Hex.Long(Seek(0, SeekOrigin.Current)));
+            metaData.WriteByteCodes(this);
+            if (Diag.DiagOn)
+                Console.WriteLine("Finished writing code at " + Hex.Long(Seek(0, SeekOrigin.Current)));
+
+            WriteDebugInfo();
+            metaData.WriteMetaData(this);
+            metaData.WriteResources(this);
+            WriteImportTables();
+            WriteZeros(entryPointPadding);
+            Write((ushort)0x25FF);
+            Write(FileImage.ImageBase + text.RVA());
+            WriteZeros(text.Padding());
+        }
+
+        /// <summary>
+        /// Write out the debug infro required for PDB files to the PE file.
+        /// </summary>
+        private void WriteDebugInfo()
+        {
+            if (pdbWriter != null)
+            {                  // WINNT.h IMAGE_DEBUG_DIRECTORY
+                WriteZeros(4);                        // Characteristics
+                Write(dateStamp);                     // Date stamp
+                WriteZeros(4);                        // Major Version, Minor Version
+                Write(2);                             // Type  (Code View???)
+                Write(debugBytesSize);             // Size of Data
+                WriteZeros(4);                        // Address of Raw Data
+                Write(text.Offset() + debugOffset + debugSize);     // Pointer to Raw Data
+
+                if (Diag.DiagOn)
+                    Debug.WriteLine("Debug Bytes Offset: " + BaseStream.Length.ToString());
+
+                // Remember where the debug bytes need to be written to
+                debugBytesStartOffset = BaseStream.Length;
+
+                // For now don't write the real debug bytes. 
+                // Just fill the space so we can come and write them later.
+                // Write(debugBytes);
+                WriteZeros((uint)debugBytesSize);
+
+                WriteZeros(NumToAlign((uint)debugBytesSize, 4));
+            }
+        }
+
+
+        private void WriteCLIHeader()
+        {
+            Write(FileImage.CLIHeaderSize);       // Cb
+            Write(verInfo.cliMajVer);            // Major runtime version
+            Write(verInfo.cliMinVer);            // Minor runtime version
+            Write(text.RVA() + metaDataOffset);
+            if (Diag.DiagOn) Console.WriteLine("MetaDataOffset = " + metaDataOffset);
+            Write(metaData.Size());
+            Write((uint)verInfo.corFlags);
+            Write(entryPointToken);
+            if (resourcesSize > 0)
+            {  // managed resources
+                Write(text.RVA() + resourcesOffset);
+                Write(resourcesSize);
+            }
+            else
+            {
+                WriteZeros(8);
+            }
+            WriteZeros(8);                     // Strong Name stuff here!! NYI
+            WriteZeros(8);                     // CodeManagerTable
+            WriteZeros(8);                     // VTableFixups NYI
+            WriteZeros(16);                    // ExportAddressTableJumps, ManagedNativeHeader
+        }
+
+        private void WriteSDataSection()
+        {
+            long pos = BaseStream.Position;
+            for (int i = 0; i < data.Count; i++)
+            {
+                ((DataConstant)data[i]).Write(this);
+            }
+            pos = BaseStream.Position - pos;
+            WriteZeros(NumToAlign((uint)pos, verInfo.fileAlign));
+        }
+
+        private void WriteRsrcSection()
+        {
+            Console.WriteLine("Trying to write rsrc section !!!");
+        }
+
+        private void WriteRelocSection()
+        {
+            // Console.WriteLine("Writing reloc section at " + Seek(0,SeekOrigin.Current) + " = " + relocOffset);
+            MemoryStream str = (MemoryStream)reloc.BaseStream;
+            Write(str.ToArray());
+            WriteZeros(NumToAlign((uint)str.Position, verInfo.fileAlign));
+        }
+
+        internal void SetEntryPoint(uint entryPoint)
+        {
+            entryPointToken = entryPoint;
+        }
+
+        internal void AddInitData(DataConstant cVal)
+        {
+            if (sdata == null)
+            {
+                sdata = new Section(FileImage.sdataName, 0xC0000040);   // IMAGE_SCN_CNT  INITIALIZED_DATA, READ, WRITE
+                data = new ArrayList();
+            }
+            data.Add(cVal);
+            //cVal.DataOffset = sdata.Tide();
+            //sdata.IncTide(cVal.GetSize());
+        }
+
+        internal void WriteZeros(uint numZeros)
+        {
+            for (int i = 0; i < numZeros; i++)
+            {
+                Write((byte)0);
+            }
+        }
+
+        internal void WritePEHeader()
+        {
+            Write((ushort)0x014C);  // Machine - always 0x14C for Managed PE Files (allow others??)
+            Write((ushort)numSections);
+            Write(dateStamp);
+            WriteZeros(8); // Pointer to Symbol Table and Number of Symbols (always zero for ECMA CLI files)
+            Write((ushort)0x00E0);  // Size of Optional Header
+            Write(verInfo.characteristics);
+            // PE Optional Header
+            Write((ushort)0x010B);   // Magic
+            Write(verInfo.lMajor);        // LMajor pure-IL = 6   C++ = 7
+            Write(verInfo.lMinor);
+            Write(text.Size());
+            Write(initDataSize);
+            Write(0);                // Check other sections here!!
+            Write(text.RVA() + entryPointOffset);
+            Write(text.RVA());
+            uint dataBase = 0;
+            if (sdata != null) dataBase = sdata.RVA();
+            else if (rsrc != null) dataBase = rsrc.RVA();
+            else dataBase = relocRVA;
+            Write(dataBase);
+            Write(FileImage.ImageBase);
+            Write(FileImage.SectionAlignment);
+            Write(verInfo.fileAlign);
+            Write(verInfo.osMajor);
+            Write(verInfo.osMinor);
+            Write(verInfo.userMajor);
+            Write(verInfo.userMinor);
+            Write(verInfo.subSysMajor);     // OS Major
+            Write(verInfo.subSysMinor);
+            WriteZeros(4);           // Reserved
+            Write(imageSize);
+            Write(headerSize);
+            Write((int)0);           // File Checksum
+            Write((ushort)verInfo.subSystem);
+            Write(verInfo.DLLFlags);
+            Write(FileImage.StackReserveSize);
+            Write(FileImage.StackCommitSize);
+            Write(FileImage.HeapReserveSize);
+            Write(FileImage.HeapCommitSize);
+            Write(FileImage.LoaderFlags);
+            Write(FileImage.NumDataDirectories);  // Data Directories
+            WriteZeros(8);                  // Export Table
+            Write(importTableOffset + text.RVA());
+            Write(totalImportTableSize);
+            WriteZeros(24);            // Resource, Exception and Certificate Tables
+            Write(relocRVA);
+            Write(relocTide);
+            Write(debugRVA);
+            Write(debugSize);
+            WriteZeros(40);            // Copyright, Global Ptr, TLS, Load Config and Bound Import Tables
+            Write(text.RVA());         // IATRVA - IAT is at start of .text Section
+            Write(FileImage.IATSize);
+            WriteZeros(8);             // Delay Import Descriptor
+            Write(text.RVA() + FileImage.IATSize); // CLIHeader immediately follows IAT
+            Write(FileImage.CLIHeaderSize);
+            WriteZeros(8);             // Reserved
+        }
+
+        internal void WriteRelocSectionHeader()
+        {
+            Write(FileImage.relocName.ToCharArray());
+            Write(relocTide);
+            Write(relocRVA);
+            Write(relocSize);
+            Write(relocOffset);
+            WriteZeros(12);
+            Write(FileImage.relocFlags);
+        }
+
+        private void Align(MemoryStream str, int val)
+        {
+            if ((str.Position % val) != 0)
+            {
+                for (int i = val - (int)(str.Position % val); i > 0; i--)
+                {
+                    str.WriteByte(0);
+                }
+            }
+        }
+
+        private uint Align(uint val, uint alignVal)
+        {
+            if ((val % alignVal) != 0)
+            {
+                val += alignVal - (val % alignVal);
+            }
+            return val;
+        }
+
+        private uint NumToAlign(uint val, uint alignVal)
+        {
+            if ((val % alignVal) == 0) return 0;
+            return alignVal - (val % alignVal);
+        }
+
+        internal void StringsIndex(uint ix)
+        {
+            if (metaData.largeStrings) Write(ix);
+            else Write((ushort)ix);
+        }
+
+        internal void GUIDIndex(uint ix)
+        {
+            if (metaData.largeGUID) Write(ix);
+            else Write((ushort)ix);
+        }
+
+        internal void USIndex(uint ix)
+        {
+            if (metaData.largeUS) Write(ix);
+            else Write((ushort)ix);
+        }
+
+        internal void BlobIndex(uint ix)
+        {
+            if (metaData.largeBlob) Write(ix);
+            else Write((ushort)ix);
+        }
+
+        internal void WriteIndex(MDTable tabIx, uint ix)
+        {
+            if (metaData.LargeIx(tabIx)) Write(ix);
+            else Write((ushort)ix);
+        }
+
+        internal void WriteCodedIndex(CIx code, MetaDataElement elem)
+        {
+            metaData.WriteCodedIndex(code, elem, this);
+        }
+
+        internal void WriteCodeRVA(uint offs)
+        {
+            Write(text.RVA() + codeStart + offs);
+        }
+
+        internal void WriteDataRVA(uint offs)
+        {
+            Write(sdata.RVA() + offs);
+        }
+
+        internal void Write3Bytes(uint val)
+        {
+            byte b3 = (byte)((val & FileImage.iByteMask[2]) >> 16);
+            byte b2 = (byte)((val & FileImage.iByteMask[1]) >> 8); ;
+            byte b1 = (byte)(val & FileImage.iByteMask[0]);
+            Write(b1);
+            Write(b2);
+            Write(b3);
+        }
+
+    }
+
+
+
+}

PERWAPI/Properties/AssemblyInfo.cs

@@ -0,0 +1,33 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("QUT.PERWAPI")]
+[assembly: AssemblyDescription("PE-file Reader/Writer")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("QUT")]
+[assembly: AssemblyProduct("PERWAPI")]
+[assembly: AssemblyCopyright("Diane Corney; QUT")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("0ea1c1f2-9d75-4cdb-bcc1-f334cd9c92ba")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("1.1.2.40")]
+[assembly: AssemblyFileVersion("1.1.2.40")]

PERWAPI/SectionClass.cs

@@ -0,0 +1,208 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+
+
+namespace QUT.PERWAPI
+{
+
+    /**************************************************************************/
+    // PE File Section Descriptor
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a Section in a PEFile  eg .text, .sdata
+    /// </summary>
+    internal class Section
+    {
+        internal static readonly uint relocPageSize = 4096;  // 4K pages for fixups
+
+        char[] name;
+        string nameString;
+        uint offset = 0, tide = 0, size = 0, rva = 0, relocTide = 0, numRelocs = 0;
+        uint relocOff = 0, relocRVA = 0, lineRVA = 0, numLineNums = 0;
+        uint flags = 0, padding = 0;
+        uint[] relocs;
+        //bool relocsDone = false;
+
+        internal Section(string sName, uint sFlags)
+        {
+            nameString = sName;
+            name = sName.ToCharArray();
+            flags = sFlags;
+        }
+
+        internal Section(PEReader input)
+        {
+            name = new char[8];
+            for (int i = 0; i < name.Length; i++)
+                name[i] = (char)input.ReadByte();
+            nameString = new String(name);
+            tide = input.ReadUInt32();
+            rva = input.ReadUInt32();
+            size = input.ReadUInt32();
+            offset = input.ReadUInt32();
+            relocRVA = input.ReadUInt32();
+            lineRVA = input.ReadUInt32();
+            numRelocs = input.ReadUInt16();
+            numLineNums = input.ReadUInt16();
+            flags = input.ReadUInt32();
+            if (Diag.DiagOn)
+            {
+                Console.WriteLine("  " + nameString + " RVA = " + Hex.Int(rva) + "  vSize = " + Hex.Int(tide));
+                Console.WriteLine("        FileOffset = " + Hex.Int(offset) + "  aSize = " + Hex.Int(size));
+            }
+        }
+
+        internal bool ContainsRVA(uint rvaPos)
+        {
+            return (rva <= rvaPos) && (rvaPos <= rva + tide);
+        }
+        internal uint GetOffset(uint inRVA)
+        {
+            uint offs = 0;
+            if ((rva <= inRVA) && (inRVA <= rva + tide))
+                offs = offset + (inRVA - rva);
+            return offs;
+        }
+        internal uint Tide() { return tide; }
+
+        internal void IncTide(uint incVal) { tide += incVal; }
+
+        internal uint Padding() { return padding; }
+
+        internal uint Size() { return size; }
+
+        internal void SetSize(uint pad)
+        {
+            padding = pad;
+            size = tide + padding;
+        }
+
+        internal uint RVA() { return rva; }
+
+        internal void SetRVA(uint rva) { this.rva = rva; }
+
+        internal uint Offset() { return offset; }
+
+        internal void SetOffset(uint offs) { offset = offs; }
+
+        internal void DoBlock(BinaryWriter reloc, uint page, int start, int end)
+        {
+            //Console.WriteLine("rva = " + rva + "  page = " + page);
+            if (Diag.DiagOn) Console.WriteLine("writing reloc block at " + reloc.BaseStream.Position);
+            reloc.Write(rva + page);
+            uint blockSize = (uint)(((end - start + 1) * 2) + 8);
+            reloc.Write(blockSize);
+            if (Diag.DiagOn) Console.WriteLine("Block size = " + blockSize);
+            for (int j = start; j < end; j++)
+            {
+                //Console.WriteLine("reloc offset = " + relocs[j]);
+                reloc.Write((ushort)((0x3 << 12) | (relocs[j] - page)));
+            }
+            reloc.Write((ushort)0);
+            if (Diag.DiagOn) Console.WriteLine("finished reloc block at " + reloc.BaseStream.Position);
+        }
+
+        internal void DoRelocs(BinaryWriter reloc)
+        {
+            if (relocTide > 0)
+            {
+                // align block to 32 bit boundary
+                relocOff = (uint)reloc.Seek(0, SeekOrigin.Current);
+                if ((relocOff % 32) != 0)
+                {
+                    uint padding = 32 - (relocOff % 32);
+                    for (int i = 0; i < padding; i++)
+                        reloc.Write((byte)0);
+                    relocOff += padding;
+                }
+                uint block = (relocs[0] / relocPageSize + 1) * relocPageSize;
+                int start = 0;
+                for (int i = 1; i < relocTide; i++)
+                {
+                    if (relocs[i] >= block)
+                    {
+                        DoBlock(reloc, block - relocPageSize, start, i);
+                        start = i;
+                        block = (relocs[i] / relocPageSize + 1) * relocPageSize;
+                    }
+                }
+                DoBlock(reloc, block - relocPageSize, start, (int)relocTide);
+            }
+        }
+
+
+        internal void AddReloc(uint offs)
+        {
+            if (Diag.DiagOn) Console.WriteLine("Adding a reloc to " + nameString + " section");
+            int pos = 0;
+            if (relocs == null)
+            {
+                relocs = new uint[5];
+            }
+            else
+            {
+                if (relocTide >= relocs.Length)
+                {
+                    uint[] tmp = relocs;
+                    relocs = new uint[tmp.Length + 5];
+                    for (int i = 0; i < relocTide; i++)
+                    {
+                        relocs[i] = tmp[i];
+                    }
+                }
+                while ((pos < relocTide) && (relocs[pos] < offs)) pos++;
+                for (int i = pos; i < relocTide; i++)
+                {
+                    relocs[i + 1] = relocs[i];
+                }
+            }
+            relocs[pos] = offs;
+            relocTide++;
+            if (Diag.DiagOn) Console.WriteLine("relocTide = " + relocTide);
+        }
+
+        internal void WriteHeader(BinaryWriter output, uint relocRVA)
+        {
+            if (Diag.DiagOn) Console.WriteLine("relocTide = " + relocTide);
+            output.Write(name);
+            output.Write(tide);                 // Virtual size
+            output.Write(rva);                  // Virtual address
+            output.Write(size);                 // SizeOfRawData
+            output.Write(offset);               // PointerToRawData
+            if (relocTide > 0)
+            {
+                output.Write(relocRVA + relocOff);
+            }
+            else
+            {
+                if (Diag.DiagOn) Console.WriteLine(nameString + " section has no relocs");
+                output.Write(0);
+            }                                   // PointerToRelocations
+            output.Write(0);                    // PointerToLineNumbers
+            output.Write((ushort)relocTide);    // NumberOfRelocations
+            output.Write((ushort)0);            // NumberOfLineNumbers
+            output.Write(flags);                // Characteristics
+        }
+
+    }
+
+
+}

PERWAPI/SourceFile.cs

@@ -0,0 +1,80 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+
+
+namespace QUT.PERWAPI
+{
+    /**************************************************************************/
+    /// <summary>
+    /// Descriptor for a file containing a managed resource
+    /// </summary>
+    public class SourceFile
+    {
+        static ArrayList sourceFiles = new ArrayList();
+        internal string name;
+        internal Guid language, vendor, document;
+
+        /*-------------------- Constructors ---------------------------------*/
+
+        private SourceFile(string name, Guid lang, Guid vend, Guid docu)
+        {
+            this.name = name;
+            language = lang;
+            vendor = vend;
+            document = docu;
+            sourceFiles.Add(this);
+        }
+
+        private bool GuidsMatch(Guid lang, Guid vend, Guid docu)
+        {
+            if (language != lang) return false;
+            if (vendor != vend) return false;
+            if (document != docu) return false;
+            return true;
+        }
+
+        internal bool Match(SourceFile file)
+        {
+            if (file == null) return false;
+            if (this == file) return true;
+            if (name != file.name) return false;
+            return GuidsMatch(file.language, file.vendor, file.document);
+        }
+
+        public static SourceFile GetSourceFile(string name, Guid lang, Guid vend, Guid docu)
+        {
+            for (int i = 0; i < sourceFiles.Count; i++)
+            {
+                SourceFile sFile = (SourceFile)sourceFiles[i];
+                if ((sFile.name == name) && sFile.GuidsMatch(lang, vend, docu))
+                    return sFile;
+            }
+            return new SourceFile(name, lang, vend, docu);
+        }
+
+        public string Name
+        {
+            get { return name; }
+        }
+
+    }
+
+}

PERWAPI/Utils.cs

@@ -0,0 +1,342 @@
+/*  
+ * PERWAPI - An API for Reading and Writing PE Files
+ * 
+ * Copyright (c) Diane Corney, Queensland University of Technology, 2004.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the PERWAPI Copyright as included with this
+ * distribution in the file PERWAPIcopyright.rtf.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY as is explained in the copyright notice.
+ *
+ * The author may be contacted at d.corney@qut.edu.au
+ * 
+ * Version Date:  26/01/07
+ */
+
+using System;
+
+namespace QUT.PERWAPI
+{
+
+    /// <summary>
+    /// Diagnostic
+    /// </summary>
+    public class Diag
+    {
+        /// <summary>
+        /// Flag for diagnostic output.
+        /// </summary>
+        public static bool DiagOn = false;
+    }
+
+    public static class BlobUtil
+    {
+        public static byte[] CompressInt(int val)
+        {
+            // This code is based on a revised version of the
+            // ECMA-335 spec which clarifies the encoding of 
+            // array lower bounds. (kjg 2008-Feb-22 )
+            //
+            uint uVal = ((uint)val) << 1;
+            uint sign = (val < 0 ? (uint)1 : 0);
+
+            if (-64 <= val && val <= 63)
+            {
+                uVal = uVal & 0x7f | sign;
+                return new byte[] { (byte)uVal };
+            }
+            else if (-8192 <= val && val <= 8191)
+            {
+                uVal = uVal & 0x3fff | 0x8000 | sign;
+                return new byte[] { (byte)(uVal >> 8), (byte)uVal };
+            }
+            else if (-268435456 <= val && val <= 268435455)
+            {
+                uVal = uVal & 0x1fffffff | 0xc0000000 | sign;
+                return new byte[] { 
+                    (byte)(uVal >> 24), 
+                    (byte)(uVal >> 16), 
+                    (byte)(uVal >> 8), 
+                    (byte)uVal };
+            }
+            else 
+                throw new OverflowException("Value cannot be compressed");
+        }
+
+        public static byte[] CompressUInt(uint val)
+        {
+            if (val > 0x1fffffff)
+                throw new OverflowException("Value cannot be compressed");
+            return CompressNum(val);
+        }
+
+        private static byte[] CompressNum(uint num)
+        {
+            byte[] rslt = null;            
+            if (num <= 0x7f)
+            {
+                rslt = new byte[1]; 
+                rslt[0] = (byte)num;
+            }
+            else if (num <= 0x3fff)
+            {
+                rslt = new byte[2];
+                rslt[0] = (byte)((num >> 8) | 0x80);
+                rslt[1] = (byte)(num & 0xff);
+            }
+            else
+            {
+                rslt = new byte[4];
+                rslt[0] = (byte)((num >> 24) | 0xc0);
+                rslt[1] = (byte)((num >> 16) & 0xff);
+                rslt[2] = (byte)((num >> 8) & 0xff);
+                rslt[3] = (byte)(num & 0xff);
+            }
+            return rslt;
+        }
+    }
+
+
+    /// <summary>
+    /// Facilities for outputting hexadecimal strings
+    /// </summary>
+    public class Hex
+    {
+        readonly static char[] hexDigit = {'0','1','2','3','4','5','6','7',
+                                              '8','9','A','B','C','D','E','F'};
+        readonly static uint[] iByteMask = { 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000 };
+        readonly static ulong[] lByteMask = {0x00000000000000FF, 0x000000000000FF00, 
+                                                0x0000000000FF0000, 0x00000000FF000000,
+                                                0x000000FF00000000, 0x0000FF0000000000,
+                                                0x00FF000000000000, 0xFF00000000000000 };
+        readonly static uint nibble0Mask = 0x0000000F;
+        readonly static uint nibble1Mask = 0x000000F0;
+
+        /// <summary>
+        /// Derives a hexademical string for a byte value
+        /// </summary>
+        /// <param name="b">the byte value</param>
+        /// <returns>hex string for the byte value</returns>
+        public static String Byte(int b)
+        {
+            char[] str = new char[2];
+            uint num = (uint)b;
+            uint b1 = num & nibble0Mask;
+            uint b2 = (num & nibble1Mask) >> 4;
+            str[0] = hexDigit[b2];
+            str[1] = hexDigit[b1];
+            return new String(str);
+        }
+
+        /// <summary>
+        /// Derives a hexademical string for a short value
+        /// </summary>
+        /// <param name="b">the short value</param>
+        /// <returns>hex string for the short value</returns>
+        public static String Short(int b)
+        {
+            char[] str = new char[4];
+            uint num1 = (uint)b & iByteMask[0];
+            uint num2 = ((uint)b & iByteMask[1]) >> 8;
+            uint b1 = num1 & nibble0Mask;
+            uint b2 = (num1 & nibble1Mask) >> 4;
+            uint b3 = num2 & nibble0Mask;
+            uint b4 = (num2 & nibble1Mask) >> 4;
+            str[0] = hexDigit[b4];
+            str[1] = hexDigit[b3];
+            str[2] = hexDigit[b2];
+            str[3] = hexDigit[b1];
+            return new String(str);
+        }
+
+        /// <summary>
+        /// Derives a hexademical string for an int value
+        /// </summary>
+        /// <param name="val">the int value</param>
+        /// <returns>hex string for the int value</returns>
+        public static String Int(int val)
+        {
+            char[] str = new char[8];
+            uint num = (uint)val;
+            int strIx = 7;
+            for (int i = 0; i < iByteMask.Length; i++)
+            {
+                uint b = num & iByteMask[i];
+                b >>= (i * 8);
+                uint b1 = b & nibble0Mask;
+                uint b2 = (b & nibble1Mask) >> 4;
+                str[strIx--] = hexDigit[b1];
+                str[strIx--] = hexDigit[b2];
+            }
+            return new String(str);
+        }
+
+        /// <summary>
+        /// Derives a hexademical string for an unsigned int value
+        /// </summary>
+        /// <param name="num">the unsigned int value</param>
+        /// <returns>hex string for the unsigned int value</returns>
+        public static String Int(uint num)
+        {
+            char[] str = new char[8];
+            int strIx = 7;
+            for (int i = 0; i < iByteMask.Length; i++)
+            {
+                uint b = num & iByteMask[i];
+                b >>= (i * 8);
+                uint b1 = b & nibble0Mask;
+                uint b2 = (b & nibble1Mask) >> 4;
+                str[strIx--] = hexDigit[b1];
+                str[strIx--] = hexDigit[b2];
+            }
+            return new String(str);
+        }
+
+        /// <summary>
+        /// Derives a hexademical string for a long value
+        /// </summary>
+        /// <param name="lnum">the long value</param>
+        /// <returns>hex string for the long value</returns>
+        public static String Long(long lnum)
+        {
+            ulong num = (ulong)lnum;
+            return Long(num);
+        }
+
+        /// <summary>
+        /// Derives a hexademical string for an unsigned long value
+        /// </summary>
+        /// <param name="num">the unsigned long value</param>
+        /// <returns>hex string for the unsigned long value</returns>
+        public static String Long(ulong num)
+        {
+            char[] str = new char[16];
+            int strIx = 15;
+            for (int i = 0; i < lByteMask.Length; i++)
+            {
+                ulong b = num & lByteMask[i];
+                b >>= (i * 8);
+                ulong b1 = b & nibble0Mask;
+                ulong b2 = (b & nibble1Mask) >> 4;
+                str[strIx--] = hexDigit[b1];
+                str[strIx--] = hexDigit[b2];
+            }
+            return new String(str);
+        }
+
+    }
+
+    /// <summary>
+    /// Exception for features yet to be implemented
+    /// </summary>
+    public class NotYetImplementedException : System.Exception
+    {
+        /// <summary>
+        /// constructor
+        /// </summary>
+        /// <param name="msg"></param>
+        public NotYetImplementedException(string msg) : base(msg + " Not Yet Implemented") { }
+    }
+
+    /// <summary>
+    /// Error in a type signature
+    /// </summary>
+    public class TypeSignatureException : System.Exception
+    {
+        /// <summary>
+        /// constructor
+        /// </summary>
+        /// <param name="msg"></param>
+        public TypeSignatureException(string msg) : base(msg) { }
+    }
+
+    /// <summary>
+    /// Error with a CIL instruction
+    /// </summary>
+    public class InstructionException : System.Exception
+    {
+        IType iType;
+        uint op;
+
+        internal InstructionException(IType iType, uint op)
+        {
+            this.iType = iType;
+            this.op = op;
+        }
+
+        internal string AddMethodName(string name)
+        {
+            string istr = " ";
+            switch (iType)
+            {
+                case (IType.fieldOp): istr += (FieldOp)op; break;
+                case (IType.methOp): istr += (MethodOp)op; break;
+                case (IType.specialOp): istr += (SpecialOp)op; break;
+                case (IType.typeOp): istr += (TypeOp)op; break;
+                default: break;
+            }
+            return "NullPointer in instruction" + istr + " for method " + name;
+        }
+
+    }
+
+    /// <summary>
+    /// Error with descriptor types
+    /// </summary>
+    public class DescriptorException : System.Exception
+    {
+
+        /// <summary>
+        /// exception
+        /// </summary>
+        /// <param name="msg"></param>
+        public DescriptorException(string msg)
+            :
+            base("Descriptor for " + msg + " already exists") { }
+
+        /// <summary>
+        /// exception
+        /// </summary>
+        public DescriptorException()
+            :
+            base("Descriptor is a Def when a Ref is required") { }
+
+    }
+
+    /// <summary>
+    /// Error for invalid PE file
+    /// </summary>
+    public class PEFileException : System.Exception
+    {
+        /// <summary>
+        /// PEFile exception constructor
+        /// </summary>
+        /// <param name="msg"></param>
+        public PEFileException(string msg) : base("Error in PE File:  " + msg) { }
+    }
+
+    /// <summary>
+    /// When the maximum stack depth could not be found dynamically.
+    /// </summary>
+    public class CouldNotFindMaxStackDepth : System.Exception
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public CouldNotFindMaxStackDepth() : base("Not able to find the maximum stack depth.") { }
+    }
+
+    /// <summary>
+    /// When the stack depth is not valid for the current position.
+    /// </summary>
+    public class InvalidStackDepth : System.Exception
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public InvalidStackDepth(string msg) : base("Invalid stack depth reached: " + msg) { }
+    }
+
+}

SymbolRW/IUnmanaged.cs

@@ -0,0 +1,528 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.ComTypes;
+using System.Diagnostics.SymbolStore;
+
+namespace QUT.Symbols {
+  #region HelperInterfaces
+  /// <summary>
+  /// This is really just a hook to hang the GUID on,
+  /// so that we can pass "typeof(IMetadataImport)" 
+  /// to Marshal.GetComInterfaceForObject()
+  /// </summary>
+  [
+  ComVisible(true),
+  InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+  Guid("7DAC8207-D3AE-4c75-9B67-92801A497D44")
+  ]
+  public interface IMetadataImport {
+    void Dummy();
+  }
+
+  /// <summary>
+  /// Helper interface for the managed reader.
+  /// This is based on the interface of the same name
+  /// defined in the C++ header file corsym.h
+  /// </summary>
+  [
+      ComImport,
+      ComVisible(false),
+      InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+      Guid("B62B923C-B500-3158-A543-24F307A8B7E1")
+  ]
+  interface ISymUnmanagedMethod {
+    void GetToken(out SymbolToken pToken);
+
+    void GetSequencePointCount(out int retVal); // used by PERWAPI
+
+    void GetRootScope( // used by PERWAPI
+        [MarshalAs(UnmanagedType.Interface)] out ISymUnmanagedScope retVal);
+
+    void GetScopeFromOffset(
+        int offset,
+        [MarshalAs(UnmanagedType.Interface)] out ISymUnmanagedScope retVal);
+
+    void GetOffset(
+        ISymUnmanagedDocument document,
+        int line,
+        int column,
+        out int retVal);
+
+    void GetRanges(
+        ISymUnmanagedDocument document,
+        int line,
+        int column,
+        int cRanges,
+        out int pcRanges,
+        [In, Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 3)] int[] ranges);
+
+    void GetParameters(
+        int cParams,
+        out int pcParams,
+        [In, Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] ISymUnmanagedVariable[] parms);
+
+    void GetNamespace(
+        [MarshalAs(UnmanagedType.Interface)] out ISymUnmanagedNamespace retVal);
+
+    void GetSourceStartEnd(
+        ISymUnmanagedDocument[] docs,
+        [In, Out, MarshalAs(UnmanagedType.LPArray)] int[] lines,
+        [In, Out, MarshalAs(UnmanagedType.LPArray)] int[] columns,
+        out Boolean retVal);
+
+    void GetSequencePoints( // used by PERWAPI
+        int cPoints,
+        out int pcPoints,
+        [In, Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] int[] offsets,
+        [In, Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] ISymUnmanagedDocument[] documents,
+        [In, Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] int[] lines,
+        [In, Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] int[] columns,
+        [In, Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] int[] endLines,
+        [In, Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] int[] endColumns);
+  }
+
+
+  /// <summary>
+  /// This definition is a hook for the COM interface.
+  /// We use [PreserveSig] to call the bare function
+  /// returning an HRESULT.  We only need GetReaderForFile()
+  /// which is in the first slot of the vtable.
+  /// 
+  /// The definition is in C++ header corsym.h
+  /// </summary>
+  [
+  ComImport,
+  ComVisible(false),
+  InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+  Guid("AA544d42-28CB-11d3-bd22-0000f80849bd")
+  ]
+  internal interface ISymUnmanagedBinder {
+    [PreserveSig]
+    int GetReaderForFile(
+        IntPtr importer,
+        [MarshalAs(UnmanagedType.LPWStr)] string filename,
+        [MarshalAs(UnmanagedType.LPWStr)] string dummyPath,
+        [MarshalAs(UnmanagedType.Interface)] out object retVal);
+  }
+
+  /// <summary>
+  /// This interface is a minimal cover of  the interface
+  /// of the same name defined in C++ header corsym.h
+  /// </summary>
+  [
+  ComImport,
+  ComVisible(false),
+  InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+  Guid("B4CE6286-2A6B-3712-A3B7-1EE1DAD467B5")
+  ]
+  internal interface ISymUnmanagedReader {
+    void GetDocument(
+        [MarshalAs(UnmanagedType.LPWStr)] String url,
+        Guid language,
+        Guid languageVendor,
+        Guid documentType,
+        [MarshalAs(UnmanagedType.Interface)] out ISymUnmanagedDocument retVal);
+
+    void GetDocuments(
+        int cDocs,
+        out int pcDocs,
+        [In, Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] ISymUnmanagedDocument[] pDocs);
+
+    [PreserveSig]
+    int GetUserEntryPoint(out SymbolToken EntryPoint);
+
+    [PreserveSig]
+    int GetMethod(
+        SymbolToken methodToken,
+        [MarshalAs(UnmanagedType.Interface)] out ISymUnmanagedMethod retVal);
+
+    [PreserveSig]
+    int GetMethodByVersion(
+        SymbolToken methodToken,
+        int version,
+        [MarshalAs(UnmanagedType.Interface)] out ISymUnmanagedMethod retVal);
+
+    void GetVariables(
+        SymbolToken parent,
+        int cVars,
+        out int pcVars,
+        [In, Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] ISymUnmanagedVariable[] vars);
+
+    void GetGlobalVariablesDummy();
+
+    void GetMethodFromDocumentPosition(
+        ISymUnmanagedDocument document,
+        int line,
+        int column,
+        [MarshalAs(UnmanagedType.Interface)] out ISymUnmanagedMethod retVal);
+
+    void GetSymAttributeDummy();
+    void GetNamespacesDummy();
+
+    void Initialize(
+        IntPtr importer,
+        [MarshalAs(UnmanagedType.LPWStr)] string filename,
+        [MarshalAs(UnmanagedType.LPWStr)] string searchPath,
+        IStream stream);
+
+    void UpdateSymbolStoreDummy();
+    void ReplaceSymbolStoreDummy();
+    void GetSymbolStoreFileNameDummy();
+    void GetMethodsFromDocumentPositionDummy();
+    void GetDocumentVersionDummy();
+    void GetMethodVersionDummy();
+  }
+
+  /// <summary>
+  /// A minimal subset of the COM IMetaDataDispenser interface
+  /// </summary>
+  [
+  ComVisible(true),
+  InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+  Guid("809c652e-7396-11d2-9771-00a0c9b4d50c")
+  ]
+  internal interface IMetaDataDispenserSubset {
+    void DefineScope_Dummy(); // Put here to index vtable correctly
+
+    void OpenScope(
+        [In, MarshalAs(UnmanagedType.LPWStr)] string szScope,
+        [In] int dwOpenFlags,
+        [In] ref Guid riid,
+        [MarshalAs(UnmanagedType.IUnknown)] out object pUnk);
+  }
+
+
+  /// <summary>
+  /// This interface is defined in C++ header corsym.h
+  /// </summary>
+  [
+      ComImport,
+      ComVisible(false),
+      InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+      Guid("9F60EEBE-2D9A-3F7C-BF58-80BC991C60BB")
+ ]
+  internal interface ISymUnmanagedVariable {
+    void GetName(
+        int cchName,
+        out int pcchName,
+        [MarshalAs(UnmanagedType.LPWStr)] StringBuilder szName);
+
+    void GetAttributes(out int pRetVal);
+
+    void GetSignature(
+        int cSig,
+        out int pcSig,
+        [In, Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] byte[] sig);
+
+    void GetAddressKind(out int pRetVal);
+
+    void GetAddressField1(out int pRetVal);
+
+    void GetAddressField2(out int pRetVal);
+
+    void GetAddressField3(out int pRetVal);
+
+    void GetStartOffset(out int pRetVal);
+
+    void GetEndOffset(out int pRetVal);
+  }
+
+  /// <summary>
+  /// This interface defined in C++ header file CorSym.h
+  /// </summary>
+  [
+      ComImport,
+      ComVisible(false),
+      InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+      Guid("40DE4037-7C81-3E1E-B022-AE1ABFF2CA08"),
+ ]
+  internal interface ISymUnmanagedDocument // needed by PERWAPI
+  {
+    void GetURL(
+        int cchUrl,
+        out int pcchUrl,
+        [MarshalAs(UnmanagedType.LPWStr)] StringBuilder szUrl);
+
+    void GetDocumentType(ref Guid pRetVal);
+
+    void GetLanguage(ref Guid pRetVal);
+
+    void GetLanguageVendor(ref Guid pRetVal);
+
+    void GetCheckSumAlgorithmId(ref Guid pRetVal);
+
+    void GetCheckSum(
+        int cData,
+        out int pcData,
+        [In, Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] byte[] data);
+
+    void FindClosestLine(
+        int line,
+        out int pRetVal);
+
+    void HasEmbeddedSource(out Boolean pRetVal);
+
+    void GetSourceLength(out int pRetVal);
+
+    void GetSourceRange(
+        int startLine,
+        int startColumn,
+        int endLine,
+        int endColumn,
+        int cSourceBytes,
+        out int pcSourceBytes,
+        [In, Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 4)] byte[] source);
+
+  };
+
+  // =====================================================================================
+
+  /// <summary>
+  /// This interface defined in C++ header file CorSym.h
+  /// </summary>
+  [
+  ComImport,
+  ComVisible(false),
+  InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+  Guid("68005D0F-B8E0-3B01-84D5-A11A94154942")
+  ]
+  internal interface ISymUnmanagedScope // needed by PERWAPI
+  {
+    void GetMethod(
+        [MarshalAs(UnmanagedType.Interface)] out ISymUnmanagedMethod pRetVal);
+
+    void GetParent(
+        [MarshalAs(UnmanagedType.Interface)] out ISymUnmanagedScope pRetVal);
+
+    void GetChildren(
+        int cChildren,
+        out int pcChildren,
+        [In, Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] ISymUnmanagedScope[] children);
+
+    void GetStartOffset(out int pRetVal);
+
+    void GetEndOffset(out int pRetVal);
+
+    void GetLocalCount(out int pRetVal);
+
+    void GetLocals(
+        int cLocals,
+        out int pcLocals,
+        [In, Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] ISymUnmanagedVariable[] locals);
+
+    void GetNamespaces(
+        int cNameSpaces,
+        out int pcNameSpaces,
+        [In, Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] ISymUnmanagedNamespace[] namespaces);
+  };
+
+
+  /// <summary>
+  /// This interface defined in C++ header file CorSym.h
+  /// </summary>
+  [
+  ComImport,
+  ComVisible(false),
+  InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+  Guid("0DFF7289-54F8-11d3-BD28-0000F80849BD")
+  ]
+  internal interface ISymUnmanagedNamespace {
+    void GetName(
+        int cchName,
+        out int pcchName,
+        [MarshalAs(UnmanagedType.LPWStr)] StringBuilder szName);
+
+    void GetNamespaces(
+        int cNameSpaces,
+        out int pcNameSpaces,
+        [In, Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] ISymUnmanagedNamespace[] namespaces);
+
+    void GetVariables(
+        int cVars,
+        out int pcVars,
+        [In, Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] ISymUnmanagedVariable[] pVars);
+  }
+
+  #endregion // Helper Interfaces
+
+  #region SymbolWriterExtras
+
+  /// <summary>
+  /// This interface is a minimal cover of  the interface
+  /// of the same name defined in C++ header corsym.h
+  /// </summary>
+  [
+  ComImport,
+  ComVisible(false),
+  InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+  Guid("0B97726E-9E6D-4f05-9A26-424022093CAA")
+  ]
+  internal interface ISymUnmanagedWriter2 {
+    void DefineDocument( // used
+        [MarshalAs(UnmanagedType.LPWStr)] string url,
+        ref Guid language,
+        ref Guid languageVendor,
+        ref Guid documentType,
+        [MarshalAs(UnmanagedType.Interface)] out ISymUnmanagedDocumentWriter RetVal);
+
+    void SetUserEntryPoint(SymbolToken entryMethod); // used
+
+    void OpenMethod(SymbolToken method); // used
+
+    void CloseMethod(); // used
+
+    void OpenScope(int startOffset, out int pRetVal); // used
+
+    void CloseScope(int endOffset); // used
+
+    void SetScopeRange(int scopeID, int startOffset, int endOffset);
+
+    void DefineLocalVariable(
+        [MarshalAs(UnmanagedType.LPWStr)] string name,
+        int attributes, int cSig,
+        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 2)] byte[] signature,
+        int addressKind,
+        int addr1,
+        int addr2,
+        int addr3,
+        int startOffset,
+        int endOffset);
+
+    void DefineParameter(
+        [MarshalAs(UnmanagedType.LPWStr)] string name,
+        int attributes,
+        int sequence,
+        int addressKind,
+        int addr1,
+        int addr2,
+        int addr3);
+
+    void DefineField(
+        SymbolToken parent,
+        [MarshalAs(UnmanagedType.LPWStr)] string name,
+        int attributes, int cSig,
+        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 3)] byte[] signature,
+        int addressKind,
+        int addr1,
+        int addr2,
+        int addr3);
+
+    void DefineGlobalVariable(
+        [MarshalAs(UnmanagedType.LPWStr)] string name,
+        int attributes, int cSig,
+        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 2)] byte[] signature,
+        int addressKind,
+        int addr1,
+        int addr2,
+        int addr3);
+
+    void Close(); // used
+
+    void SetSymAttribute(
+        SymbolToken parent,
+        [MarshalAs(UnmanagedType.LPWStr)] string name,
+        int cData,
+        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 2)] byte[] data);
+
+    void OpenNamespace([MarshalAs(UnmanagedType.LPWStr)] string name);
+
+    void CloseNamespace();
+
+    void UsingNamespace([MarshalAs(UnmanagedType.LPWStr)] string fullName);
+
+    void SetMethodSourceRange(
+        ISymUnmanagedDocumentWriter startDoc,
+        int startLine, int startColumn,
+        ISymUnmanagedDocumentWriter endDoc,
+        int endLine,
+        int endColumn);
+
+    void Initialize( // used
+        IntPtr emitter,
+        [MarshalAs(UnmanagedType.LPWStr)] string filename,
+        IStream stream,
+        bool fullBuild);
+
+    void GetDebugInfo( // used
+        out ImageDebugDirectory iDD,
+        int cData,
+        out int pcData,
+        [In, Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] byte[] data);
+
+    void DefineSequencePoints( // used
+        ISymUnmanagedDocumentWriter document,
+        int spCount,
+        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] int[] offsets,
+        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] int[] lines,
+        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] int[] columns,
+        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] int[] endLines,
+        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] int[] endColumns);
+
+    void RemapToken(SymbolToken oldToken, SymbolToken newToken);
+
+    void Initialize2(
+        IntPtr emitter,
+        [MarshalAs(UnmanagedType.LPWStr)] string tempfilename,
+        IStream stream,
+        bool fullBuild, [
+        MarshalAs(UnmanagedType.LPWStr)] string finalfilename);
+
+    void DefineConstant(
+        [MarshalAs(UnmanagedType.LPWStr)] string name,
+        object value,
+        int cSig,
+        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 2)] byte[] signature);
+
+    void Abort();
+
+    void DefineLocalVariable2( // used
+        [MarshalAs(UnmanagedType.LPWStr)] string name,
+        int attributes,
+        SymbolToken sigToken,
+        int addressKind,
+        int addr1,
+        int addr2,
+        int addr3,
+        int startOffset,
+        int endOffset);
+
+    void DefineGlobalVariable2(
+        [MarshalAs(UnmanagedType.LPWStr)] string name,
+        int attributes,
+        SymbolToken sigToken,
+        int addressKind,
+        int addr1,
+        int addr2,
+        int addr3);
+
+    void DefineConstant2(
+        [MarshalAs(UnmanagedType.LPWStr)] string name,
+        object value,
+        SymbolToken sigToken);
+  }
+
+  /// <summary>
+  /// This interface is a minimal cover of  the interface
+  /// of the same name defined in C++ header corsym.h
+  /// </summary>
+  [
+  ComImport,
+  ComVisible(false),
+  Guid("B01FAFEB-C450-3A4D-BEEC-B4CEEC01E006"),
+  InterfaceType(ComInterfaceType.InterfaceIsIUnknown)
+  ]
+  internal interface ISymUnmanagedDocumentWriter {
+    void SetSource(
+        int sourceSize,
+        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] byte[] source);
+
+    void SetCheckSum(
+        Guid algorithmId,
+        int checkSumSize,
+        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] byte[] checkSum);
+  }
+
+  #endregion // SymbolWriterExtras
+}

SymbolRW/Properties/AssemblyInfo.cs

@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("SymbolWriter")]
+[assembly: AssemblyDescription("Symbol File Reader/Writer for PERWAPI")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Software Automata")]
+[assembly: AssemblyProduct("SymbolWriter")]
+[assembly: AssemblyCopyright("Copyright © Software Automata 2008")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("1f17f882-cfb0-433a-8f81-61d589c63fdd")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.1.2.10")]
+[assembly: AssemblyFileVersion("1.1.2.10")]

SymbolRW/SymboRW.sln

@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SymbolRW", "SymbolRW.csproj", "{2BC469D1-46DA-4FBF-A431-6B1344BBCD23}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2BC469D1-46DA-4FBF-A431-6B1344BBCD23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2BC469D1-46DA-4FBF-A431-6B1344BBCD23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2BC469D1-46DA-4FBF-A431-6B1344BBCD23}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2BC469D1-46DA-4FBF-A431-6B1344BBCD23}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

SymbolRW/SymbolRW.csproj

@@ -0,0 +1,60 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{2BC469D1-46DA-4FBF-A431-6B1344BBCD23}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>QUT.Symbols</RootNamespace>
+    <AssemblyName>QUT.SymbolRW</AssemblyName>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>QUTgpTools.pfx</AssemblyOriginatorKeyFile>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="IUnmanaged.cs" />
+    <Compile Include="SymbolReader.cs" />
+    <Compile Include="SymbolWriter.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Utilities.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="QUTgpTools.pfx" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

SymbolRW/SymbolReader.cs

@@ -0,0 +1,797 @@
+//
+//  This code is the managed pdb reader interface for PERWAPI.
+//  Written by John Gough, April 2007. 
+//  Copyright(c) 2007-2010 John Gough, and Queensland University of Technology
+//
+//  NOTES:
+//  Q: Where does this code come from?
+//  A: At the heart of the code is some COM interop that accesses the
+//     facilities of mscoree.dll.  Unfortunately, the type library for
+//     this component is incomplete, and does not cover the symbol store
+//     functionality.  There is some MIDL, and the C++ header files
+//     cor.h and corsym.h.  From here comes the guid values, for 
+//     example, and critically the order of the interface methods.
+//     The managed interfaces, such as ISymbolReader, are defined in 
+//     [mscorlib]System.Diagnostics.SymbolStore.
+//
+//     This file provides managed wrappers for the unmanaged interfaces.
+//     These wrappers implement the managed interfaces. 
+//     Not all methods are implemented. Those that are not will throw 
+//     NotImplementedException.
+//
+//     Some of the functionality currently not used by PERWAPI is left
+//     unimplemented, and throws a NotImplementedException if called.
+//
+//  THANKS:
+//  Wayne Kelly, whose SimpleWriter, in C++ pointed the way.
+//  Adam Nathan, whose ".NET and COM" tells you more than you want to know
+//  Microsoft's Iron Python and MDBG samples answered remaining questions
+//
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.ComTypes;
+using System.Diagnostics.SymbolStore;
+
+namespace QUT.Symbols {
+  public class SymbolReader : ISymbolReader {
+    private ISymUnmanagedReader private_reader;
+
+    /// <summary>
+    /// Constructor for SymbolReader.
+    /// Just creates a reference to the unmanaged reader
+    /// from the COM world.  This Reader only implements
+    /// the method(s) required by PERWAPI.
+    /// </summary>
+    /// <param name="filename"></param>
+    public SymbolReader(string filename) {
+      object ppb = null;
+      object pUnk = null;
+      object pBnd = null;
+      IntPtr importer = IntPtr.Zero;
+      object retVal = null;
+
+      try {
+        OLE32.CoCreateInstance(ref XGuid.dispenserClassID, null, 1, ref XGuid.dispenserIID, out ppb);
+        OLE32.CoCreateInstance(ref XGuid.binderCLSID, null, 1, ref XGuid.binderIID, out pBnd);
+
+        // Get the metadata dispenser from mscoree.dll
+        Util.ComCheck(ppb != null, "Failed to create metadata dispenser");
+
+        ((IMetaDataDispenserSubset)ppb).OpenScope(filename, 0, ref XGuid.importerIID, out pUnk);
+        Util.ComCheck(pUnk != null, "Failed to open scope");
+
+        importer = Marshal.GetComInterfaceForObject(pUnk, typeof(IMetadataImport));
+        ((ISymUnmanagedBinder)pBnd).GetReaderForFile(importer, filename, null, out retVal);
+        private_reader = (ISymUnmanagedReader)retVal;
+      }
+      catch (Exception x) {
+        Console.WriteLine(x.Message);
+      }
+      finally {
+        if (importer != IntPtr.Zero)
+          Marshal.Release(importer);
+      }
+    }
+
+    // ============================================================================
+    // ========================== ISymbolReader Methods ===========================
+    // ============================================================================
+
+    /// <summary>
+    /// This is the only SymbolReader method required by PERWAPI
+    /// at this stage.
+    /// </summary>
+    /// <param name="tok">The metadata token</param>
+    /// <returns>The SymbolMethod object for the token</returns>
+    public ISymbolMethod GetMethod(SymbolToken tok) {
+      // MIDL is ...
+      //[PreserveSig]
+      //int GetMethod(
+      //    SymbolToken methodToken,
+      //    [MarshalAs(UnmanagedType.Interface)] out ISymUnmanagedMethod retVal);
+      ISymUnmanagedMethod unMeth = null;
+      int hr = private_reader.GetMethod(tok, out unMeth);
+      if (hr == OLE32.hr_E_FAIL)  // could be empty method
+        return null;
+      else                  // any other abnormal HRESULT
+        Marshal.ThrowExceptionForHR(hr);
+      // All ok ...
+      return new SymbolMethod(unMeth);
+    }
+
+    // This one not used by PERWAPI yet.
+    public ISymbolMethod GetMethod(SymbolToken tok, int ver) {
+      ISymUnmanagedMethod unMeth = null;
+      int hr = private_reader.GetMethodByVersion(tok, ver, out unMeth);
+      if (hr == OLE32.hr_E_FAIL)  // could be empty method
+        return null;
+      else                  // any other abnormal HRESULT
+        Marshal.ThrowExceptionForHR(hr);
+      // All ok ...
+      return new SymbolMethod(unMeth);
+    }
+
+    /// <summary>
+    /// Gets user entry point for a reader.
+    /// Returns null if reader is attached to a PE-file
+    /// that does not have an entry point.
+    /// </summary>
+    public SymbolToken UserEntryPoint {
+      get {
+        SymbolToken retVal;
+        int hr = private_reader.GetUserEntryPoint(out retVal);
+        if (hr == OLE32.hr_E_FAIL)
+          return new SymbolToken(0);
+        else
+          Marshal.ThrowExceptionForHR(hr);
+        return retVal;
+      }
+    }
+
+    #region unimplemented methods
+    // Summary:
+    //     Gets a document specified by the language, vendor, and type.
+    //
+    // Parameters:
+    //   url:
+    //     The URL that identifies the document.
+    //
+    //   documentType:
+    //     The type of the document. You can specify this parameter as System.Guid.Empty.
+    //
+    //   languageVendor:
+    //     The identity of the vendor for the document language. You can specify this
+    //     parameter as System.Guid.Empty.
+    //
+    //   language:
+    //     The document language. You can specify this parameter as System.Guid.Empty.
+    //
+    // Returns:
+    //     The specified document.
+    public ISymbolDocument GetDocument(
+        string url,
+        Guid language,
+        Guid languageVendor,
+        Guid documentType) {
+      throw new NotImplementedException("No QUT.SymbolReader.GetDocument");
+    }
+
+    //
+    // Summary:
+    //     Gets an array of all documents defined in the symbol store.
+    //
+    // Returns:
+    //     An array of all documents defined in the symbol store.
+    public ISymbolDocument[] GetDocuments() {
+      throw new NotImplementedException("No QUT.SymbolReader.GetDocuments");
+    }
+
+    //
+    // Summary:
+    //     Gets all global variables in the module.
+    //
+    // Returns:
+    //     An array of all variables in the module.
+    public ISymbolVariable[] GetGlobalVariables() {
+      throw new NotImplementedException("No QUT.SymbolReader.GetGetGlobalVariables");
+    }
+
+
+    //
+    // Summary:
+    //     Gets the namespaces that are defined in the global scope within the current
+    //     symbol store.
+    //
+    // Returns:
+    //     The namespaces defined in the global scope within the current symbol store.
+    public ISymbolNamespace[] GetNamespaces() {
+      throw new NotImplementedException("No QUT.SymbolReader.GetNamespaces");
+    }
+
+    //
+    // Summary:
+    //     Gets an attribute value when given the attribute name.
+    //
+    // Parameters:
+    //   name:
+    //     The attribute name.
+    //
+    //   parent:
+    //     The metadata token for the object for which the attribute is requested. 
+    //
+    // Returns:
+    //     The value of the attribute.
+    public byte[] GetSymAttribute(SymbolToken parent, string name) {
+      throw new NotImplementedException("No QUT.SymbolReader.GetSymAttribute");
+    }
+    #endregion unimplemented methods
+
+    /// <summary>
+    /// Gets the method that contains a specified position of the document
+    /// </summary>
+    /// <param name="document">The document object</param>
+    /// <param name="line">Source line number</param>
+    /// <param name="column">Source column number</param>
+    /// <returns>The chosen method</returns>
+    public ISymbolMethod GetMethodFromDocumentPosition(ISymbolDocument doc, int line, int column) {
+      ISymUnmanagedMethod unMeth = null;
+      private_reader.GetMethodFromDocumentPosition(
+          ((SymbolDocument)doc).WrappedDoc, line, column, out unMeth);
+      return new SymbolMethod(unMeth);
+    }
+
+    public ISymbolVariable[] GetVariables(SymbolToken parent) {
+      int varNm = 0;
+      private_reader.GetVariables(parent, 0, out varNm, null);
+      ISymUnmanagedVariable[] unVars = new ISymUnmanagedVariable[varNm];
+      SymbolVariable[] retVal = new SymbolVariable[varNm];
+      private_reader.GetVariables(parent, varNm, out varNm, unVars);
+      for (int i = 0; i < varNm; i++)
+        retVal[i] = new SymbolVariable(unVars[i]);
+      return retVal;
+    }
+  }
+  // ============================ End of SymbolReader ===========================
+
+  /// <summary>
+  /// This is the managed wrapper for the unmanaged
+  /// Method descriptor.  This implements the interface
+  /// System.Diagnostics.SymbolStore.ISymbolMethod
+  /// </summary>
+  public class SymbolMethod : ISymbolMethod {
+    private const int INVALID = -1;
+    private ISymUnmanagedMethod private_method;
+
+    internal SymbolMethod(ISymUnmanagedMethod unMeth) {
+      private_method = unMeth;
+    }
+
+    /// <summary>
+    /// Gets the root scope of the method
+    /// </summary>
+    public ISymbolScope RootScope { // Needed by PERWAPI
+      get {
+        ISymUnmanagedScope retVal = null;
+        private_method.GetRootScope(out retVal);
+        return new SymbolScope(retVal);
+      }
+    }
+
+    /// <summary>
+    /// Gets the sequence point count for the method
+    /// </summary>
+    public int SequencePointCount { // Needed by PERWAPI
+      get {
+        int retVal = 0;
+        private_method.GetSequencePointCount(out retVal);
+        return retVal;
+      }
+    }
+
+    /// <summary>
+    /// Gets the symbol token for the method
+    /// </summary>
+    public SymbolToken Token {
+      get {
+        SymbolToken tok;
+        private_method.GetToken(out tok);
+        return tok;
+      }
+    }
+
+    /// <summary>
+    /// Gets the namespace for the method
+    /// </summary>
+    /// <returns>The namespace object</returns>
+    public ISymbolNamespace GetNamespace() {
+      ISymUnmanagedNamespace retVal = null;
+      private_method.GetNamespace(out retVal);
+      return new SymbolNamespace(retVal);
+    }
+
+    /// <summary>
+    /// Gets the parameters of the method
+    /// </summary>
+    /// <returns>The method parameters</returns>
+    public ISymbolVariable[] GetParameters() {
+      int pNum = 0;
+
+      // Call GetParameters just to get pNum
+      private_method.GetParameters(0, out pNum, null);
+      ISymUnmanagedVariable[] unVars = new ISymUnmanagedVariable[pNum];
+      ISymbolVariable[] manVars = new ISymbolVariable[pNum];
+
+      // Now call again to get the real information
+      private_method.GetParameters(pNum, out pNum, unVars);
+      for (int i = 0; i < pNum; i++)
+        manVars[i] = new SymbolVariable(unVars[i]);
+      return manVars;
+    }
+
+    #region unimplemented methods
+    public int[] GetRanges(ISymbolDocument document, int line, int column) {
+      throw new NotImplementedException("No QUT.SymbolMethod.GetRanges");
+    }
+
+    public ISymbolScope GetScope(int offset) {
+      throw new NotImplementedException("No QUT.SymbolMethod.GetScope");
+    }
+
+    public int GetOffset(
+        ISymbolDocument document,
+        int line,
+        int column) {
+      throw new NotImplementedException("No QUT.SymbolMethod.GetOffset");
+    }
+
+    private void GetAndCheckLength(int[] arr, ref int num) {
+      if (arr != null) {
+        if (num == INVALID)
+          num = arr.Length;
+        else
+          Util.ArgCheck(num == arr.Length, "Invalid arg to GetSequencePoints");
+      }
+    }
+
+    public bool GetSourceStartEnd(ISymbolDocument[] docs, int[] lines, int[] columns) {
+      throw new NotImplementedException("No QUT.SymbolMethod.GetSourceStartEnd");
+    }
+    #endregion unimplemented methods
+
+    /// <summary>
+    /// Gets the sequence points defined for this method
+    /// </summary>
+    /// <param name="offsets">array of IL offsets</param>
+    /// <param name="documents">array of documents</param>
+    /// <param name="lines">start line number array</param>
+    /// <param name="columns">start column number array</param>
+    /// <param name="endLines">end line number array</param>
+    /// <param name="endColumns">start line number array</param>
+    public void GetSequencePoints( // This method needed by PERWAPI
+        int[] offsets,
+        ISymbolDocument[] documents,
+        int[] lines,
+        int[] columns,
+        int[] endLines,
+        int[] endColumns) {
+      int spCount = INVALID;
+      GetAndCheckLength(offsets, ref spCount);
+      GetAndCheckLength(lines, ref spCount);
+      GetAndCheckLength(columns, ref spCount);
+      GetAndCheckLength(endLines, ref spCount);
+      GetAndCheckLength(endColumns, ref spCount);
+      if (spCount == INVALID)
+        spCount = 0;
+
+      int dcCount = documents.Length;
+      ISymUnmanagedDocument[] unDocs = new ISymUnmanagedDocument[dcCount];
+      private_method.GetSequencePoints(
+          dcCount, out spCount, offsets, unDocs, lines, columns, endLines, endColumns);
+      for (int i = 0; i < dcCount; i++)
+        documents[i] = new SymbolDocument(unDocs[i]);
+      return;
+    }
+  }
+  // ============================ End of SymbolMethod ===========================
+
+  /// <summary>
+  /// This class is a managed wrapper for the unmanaged
+  /// Scope descriptor.  The defintions for ISymbolScope
+  /// come from metadata.
+  /// </summary>
+  public class SymbolScope : ISymbolScope {
+    private ISymUnmanagedScope private_scope;
+
+    internal SymbolScope(ISymUnmanagedScope unScope) {
+      private_scope = unScope;
+    }
+
+    /// <summary>
+    /// Returns the end offset of the wrapped scope
+    /// </summary>
+    public int EndOffset {
+      get {
+        int offset;
+        private_scope.GetEndOffset(out offset);
+        return offset;
+      }
+    }
+
+    /// <summary>
+    /// Returns the method that contains the current lexical scope
+    /// </summary>
+    public ISymbolMethod Method {
+      get {
+        ISymUnmanagedMethod unMeth = null;
+        private_scope.GetMethod(out unMeth);
+        return new SymbolMethod(unMeth);
+      }
+    }
+
+    /// <summary>
+    /// Returns the parent lexical scope of the current scope
+    /// </summary>
+    public ISymbolScope Parent {
+      get {
+        ISymUnmanagedScope unScope = null;
+        private_scope.GetParent(out unScope);
+        return new SymbolScope(unScope);
+      }
+    }
+
+    /// <summary>
+    /// Returns the start offset of the current lexical scope
+    /// </summary>
+    public int StartOffset {
+      get {
+        int offset;
+        private_scope.GetStartOffset(out offset);
+        return offset;
+      }
+    }
+
+    /// <summary>
+    /// Returns the child lexical scopes of the current lexical scope.
+    /// </summary>
+    /// <returns></returns>
+    public ISymbolScope[] GetChildren() {
+      int chNum = 0;
+      private_scope.GetChildren(0, out chNum, null);
+      ISymUnmanagedScope[] unScps = new ISymUnmanagedScope[chNum];
+      ISymbolScope[] manScps = new ISymbolScope[chNum];
+
+      private_scope.GetChildren(chNum, out chNum, unScps);
+      for (int i = 0; i < chNum; i++)
+        manScps[i] = new SymbolScope(unScps[i]);
+      return manScps;
+    }
+
+    /// <summary>
+    /// Gets the local variables within the current lexical scope
+    /// </summary>
+    /// <returns>The local variables of the current scope</returns>
+    public ISymbolVariable[] GetLocals() {
+      int lcNum = 0;
+      private_scope.GetLocals(0, out lcNum, null);
+      ISymUnmanagedVariable[] unVars = new ISymUnmanagedVariable[lcNum];
+      ISymbolVariable[] manVars = new ISymbolVariable[lcNum];
+
+      private_scope.GetLocals(lcNum, out lcNum, unVars);
+      for (int i = 0; i < lcNum; i++)
+        manVars[i] = new SymbolVariable(unVars[i]);
+      return manVars;
+    }
+
+    /// <summary>
+    /// Gets the namespaces that are used within the current scope
+    /// </summary>
+    /// <returns>The namespaces that are used within the current scope</returns>
+    public ISymbolNamespace[] GetNamespaces() {
+      int nmNum = 0;
+      private_scope.GetNamespaces(0, out nmNum, null);
+      ISymUnmanagedNamespace[] unNams = new ISymUnmanagedNamespace[nmNum];
+      ISymbolNamespace[] manNams = new ISymbolNamespace[nmNum];
+
+      private_scope.GetNamespaces(nmNum, out nmNum, unNams);
+      for (int i = 0; i < nmNum; i++)
+        manNams[i] = new SymbolNamespace(unNams[i]);
+      return manNams;
+
+    }
+  }
+  // ============================ End of SymbolScope ===========================
+
+  /// <summary>
+  /// Managed wrapper for ISymUnmanagedNamespace
+  /// </summary>
+  public class SymbolNamespace : ISymbolNamespace {
+    private ISymUnmanagedNamespace private_namespace;
+
+    internal SymbolNamespace(ISymUnmanagedNamespace unNmsp) {
+      private_namespace = unNmsp;
+    }
+
+    // Summary:
+    //     Gets the current namespace.
+    //
+    // Returns:
+    //     The current namespace.
+    public string Name {
+      get {
+        StringBuilder bldr;
+        int nmLen = 0;
+        private_namespace.GetName(0, out nmLen, null);
+        bldr = new StringBuilder(nmLen);
+        private_namespace.GetName(nmLen, out nmLen, bldr);
+        return bldr.ToString();
+      }
+    }
+
+    // Summary:
+    //     Gets the child members of the current namespace.
+    //
+    // Returns:
+    //     The child members of the current namespace.
+    public ISymbolNamespace[] GetNamespaces() {
+      throw new NotImplementedException("No QUT.SymbolNamespace.GetNamespaces");
+    }
+    //
+    // Summary:
+    //     Gets all the variables defined at global scope within the current namespace.
+    //
+    // Returns:
+    //     The variables defined at global scope within the current namespace.
+    public ISymbolVariable[] GetVariables() {
+      throw new NotImplementedException("No QUT.SymbolNamespace.GetVariables");
+    }
+  }
+  // ============================ End of SymbolReader ===========================
+
+  /// <summary>
+  /// Managed wrapper for ISymUnmanagedDocument
+  /// </summary>
+  public class SymbolDocument : ISymbolDocument {
+    private ISymUnmanagedDocument private_document;
+
+    /// <summary>
+    /// Constructor for SymbolDocument
+    /// </summary>
+    /// <param name="unDoc"></param>
+    internal SymbolDocument(ISymUnmanagedDocument unDoc) {
+      private_document = unDoc;
+    }
+
+    /// <summary>
+    /// Gets the wrapped document
+    /// </summary>
+    internal ISymUnmanagedDocument WrappedDoc {
+      get { return private_document; }
+    }
+
+    /// <summary>
+    /// Returns a GUID identifying the checksum algorithm.
+    /// Returns Guid.Zero if there is no checksum.
+    /// </summary>
+    public Guid CheckSumAlgorithmId {
+      get {
+        Guid retVal = new Guid();
+        private_document.GetCheckSumAlgorithmId(ref retVal);
+        return retVal;
+      }
+    }
+
+    /// <summary>
+    /// Gets the document type guid
+    /// </summary>
+    public Guid DocumentType {
+      get {
+        Guid retVal = new Guid();
+        private_document.GetDocumentType(ref retVal);
+        return retVal;
+      }
+    }
+
+    /// <summary>
+    /// Value is true if document is stored in the symbol store, otherwise false.
+    /// </summary>
+    public bool HasEmbeddedSource {
+      get {
+        bool retVal = false;
+        private_document.HasEmbeddedSource(out retVal);
+        return retVal;
+      }
+    }
+
+    /// <summary>
+    /// Gets the language guid
+    /// </summary>
+    public Guid Language {
+      get {
+        Guid retVal = new Guid();
+        private_document.GetLanguage(ref retVal);
+        return retVal;
+      }
+    }
+
+    /// <summary>
+    /// Gets the language vendor guid
+    /// </summary>
+    public Guid LanguageVendor {
+      get {
+        Guid retVal = new Guid();
+        private_document.GetLanguageVendor(ref retVal);
+        return retVal;
+      }
+    }
+
+    /// <summary>
+    /// Gets the source length of the current document
+    /// </summary>
+    public int SourceLength {
+      get {
+        int retVal = 0;
+        private_document.GetSourceLength(out retVal);
+        return retVal;
+      }
+    }
+
+    /// <summary>
+    /// Gets the URL of the current document
+    /// </summary>
+    public string URL {
+      get {
+        int strLen;
+        private_document.GetURL(0, out strLen, null);
+        StringBuilder retVal = new StringBuilder(strLen);
+        private_document.GetURL(strLen, out strLen, retVal);
+        return retVal.ToString();
+      }
+    }
+
+
+    /// <summary>
+    /// Gets the closest line that has a sequence point
+    /// </summary>
+    /// <param name="line">A line in the document</param>
+    /// <returns>The closest line with a sequence point</returns>
+    public int FindClosestLine(int line) {
+      int retVal;
+      private_document.FindClosestLine(line, out retVal);
+      return retVal;
+    }
+
+    #region unimplemented methods
+    /// <summary>
+    /// Gets the checksum
+    /// </summary>
+    /// <returns>The checksum</returns>
+    public byte[] GetCheckSum() {
+      throw new NotImplementedException("No QUT.SymbolDocument.GetCheckSum");
+    }
+
+    //
+    // Summary:
+    //     Gets the embedded document source for the specified range.
+    //
+    // Parameters:
+    //   startLine:
+    //     The starting line in the current document.
+    //
+    //   endLine:
+    //     The ending line in the current document.
+    //
+    //   startColumn:
+    //     The starting column in the current document.
+    //
+    //   endColumn:
+    //     The ending column in the current document.
+    //
+    // Returns:
+    //     The document source for the specified range.
+    public byte[] GetSourceRange(int startLine, int startColumn, int endLine, int endColumn) {
+      throw new NotImplementedException("No QUT.SymbolDocument.GetSourceRange");
+    }
+    #endregion unimplemented methods
+  }
+  // ========================== End of SymbolDocument ===========================
+
+  /// <summary>
+  /// Managed wrapper for ISymUnmanagedVariable
+  /// </summary>
+  public class SymbolVariable : ISymbolVariable {
+    private ISymUnmanagedVariable private_variable;
+
+    internal SymbolVariable(ISymUnmanagedVariable unVar) {
+      private_variable = unVar;
+    }
+
+    /// <summary>
+    /// Gets the first address of the variable
+    /// </summary>
+    public int AddressField1 {
+      get {
+        int retVal;
+        private_variable.GetAddressField1(out retVal);
+        return retVal;
+      }
+    }
+
+    /// <summary>
+    /// Gets the second address of the variable
+    /// </summary>
+    public int AddressField2 {
+      get {
+        int retVal;
+        private_variable.GetAddressField2(out retVal);
+        return retVal;
+      }
+    }
+
+    /// <summary>
+    /// Gets the third address of the variable
+    /// </summary>
+    public int AddressField3 {
+      get {
+        int retVal;
+        private_variable.GetAddressField3(out retVal);
+        return retVal;
+      }
+    }
+
+    /// <summary>
+    /// Gets the type of the address. The result is a
+    /// System.Diagnostics.SymbolStore.SymAddressKind
+    /// enumeration value.
+    /// </summary>
+    public SymAddressKind AddressKind {
+      get {
+        int retVal;
+        private_variable.GetAddressKind(out retVal);
+        return (SymAddressKind)retVal;
+      }
+    }
+
+    /// <summary>
+    /// Gets the variable attributes
+    /// </summary>
+    public object Attributes {
+      get {
+        int retVal;
+        private_variable.GetAttributes(out retVal);
+        return retVal;
+      }
+    }
+
+    /// <summary>
+    /// Gets the end offset of the variable
+    /// </summary>
+    public int EndOffset {
+      get {
+        int retVal;
+        private_variable.GetEndOffset(out retVal);
+        return retVal;
+      }
+    }
+
+    /// <summary>
+    /// Gets the name of the variable
+    /// </summary>
+    public string Name {
+      get {
+        StringBuilder bldr;
+        int nmLen = 0;
+        private_variable.GetName(0, out nmLen, null);
+        bldr = new StringBuilder(nmLen);
+        private_variable.GetName(nmLen, out nmLen, bldr);
+        return bldr.ToString();
+      }
+    }
+
+    /// <summary>
+    /// Gets the start offset of the variable
+    /// </summary>
+    public int StartOffset {
+      get {
+        int retVal;
+        private_variable.GetStartOffset(out retVal);
+        return retVal;
+      }
+    }
+
+    /// <summary>
+    /// Gets the variable signature
+    /// </summary>
+    /// <returns>The signature blob</returns>
+    public byte[] GetSignature() {
+      int sgLen;
+      private_variable.GetSignature(0, out sgLen, null);
+      byte[] retVal = new byte[sgLen];
+      private_variable.GetSignature(sgLen, out sgLen, retVal);
+      return retVal;
+    }
+  }
+  // ========================== End of SymbolVariable ===========================
+}

SymbolRW/SymbolWriter.cs

@@ -0,0 +1,122 @@
+//
+//  This code is the managed pdb writer interface for PERWAPI.
+//  Written by John Gough, January 2008. 
+//  Copyright(c) 2007-2010 John Gough, and Queensland University of Technology
+//
+//  NOTES:
+//  Q: Where does this code come from?
+//  A: At the heart of the code is some COM interop that accesses the
+//     facilities of mscoree.dll.  Unfortunately, the type library for
+//     this component is incomplete, and does not cover the symbol store
+//     functionality.  There is some MIDL, and the C++ header files
+//     cor.h and corsym.h.  From here comes the guid values, for 
+//     example, and critically the order of the interface methods.
+//     The managed interfaces, such as ISymbolReader, are defined in 
+//     [mscorlib]System.Diagnostics.SymbolStore.
+//
+//     This file provides managed wrappers for the unmanaged interfaces.
+//     These wrappers implement the managed interfaces. 
+//     Not all methods are implemented. Those that are not will throw 
+//     NotImplementedException.
+//
+//     Some of the functionality currently not used by PERWAPI is left
+//     unimplemented, and throws a NotImplementedException if called.
+//
+//  THANKS:
+//  Wayne Kelly, whose SimpleWriter, in C++ pointed the way.
+//  Adam Nathan, whose ".NET and COM" tells you more than you want to know
+//  Microsoft's Iron Python and MDBG samples answered remaining questions
+//
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.ComTypes;
+using System.Diagnostics.SymbolStore;
+
+namespace QUT.Symbols {
+  public class SymbolWriter {
+    private ISymUnmanagedWriter2 writer;
+
+    public SymbolWriter(string binaryFile, string pdbFile) {
+      object dispenser = null;
+      object pUnknown = null;
+      IntPtr importer = IntPtr.Zero;
+      object writer2 = null;
+
+      try {
+        OLE32.CoCreateInstance(ref XGuid.dispenserClassID, null, 1, ref XGuid.dispenserIID, out dispenser);
+        ((IMetaDataDispenserSubset)dispenser).OpenScope(binaryFile, 0, ref XGuid.importerIID, out pUnknown);
+        importer = Marshal.GetComInterfaceForObject(pUnknown, typeof(IMetadataImport));
+
+        OLE32.CoCreateInstance(ref XGuid.symWriterClassID, null, 1, ref XGuid.symWriterIID, out writer2);
+        writer = (ISymUnmanagedWriter2)writer2;
+        writer.Initialize(importer, pdbFile, null, true);
+      }
+      catch (Exception x) {
+        Console.WriteLine(x.Message);
+      }
+      finally {
+        if (importer != IntPtr.Zero)
+          Marshal.Release(importer);
+      }
+    }
+
+    public object DefineDocument(string url, ref Guid language, ref Guid vendor, ref Guid docType) {
+      ISymUnmanagedDocumentWriter docWriter;
+      writer.DefineDocument(url, ref language, ref vendor, ref docType, out docWriter);
+      return (object)docWriter;
+    }
+
+    public void SetUserEntryPoint(SymbolToken tok) {
+      writer.SetUserEntryPoint(tok);
+    }
+
+    public void DefineSequencePoints(
+        object doc,
+        int[] offsets, int[] lines, int[] cols, int[] endLines, int[] endCols) {
+      ISymUnmanagedDocumentWriter pDoc = (ISymUnmanagedDocumentWriter)doc;
+      writer.DefineSequencePoints(pDoc, offsets.Length, offsets, lines, cols, endLines, endCols);
+    }
+
+    public void DefineLocalVariable2(
+        string name,
+        int attr, SymbolToken tok, int addrKind, int addr1, int addr2, int addr3, int startOfst, int endOfst) {
+      writer.DefineLocalVariable2(name, attr, tok, addrKind, addr1, addr2, addr3, startOfst, endOfst);
+    }
+
+    public int OpenScope(int startOffset) {
+      int rslt;
+      writer.OpenScope(startOffset, out rslt);
+      return rslt;
+    }
+
+    public void CloseScope(int endOffset) {
+      writer.CloseScope(endOffset);
+    }
+
+    public void OpenMethod(SymbolToken tok) {
+      writer.OpenMethod(tok);
+    }
+
+    public void CloseMethod() {
+      writer.CloseMethod();
+    }
+
+    public byte[] GetDebugInfo() {
+      int length;
+      byte[] info = null;
+      ImageDebugDirectory idd;
+
+      writer.GetDebugInfo(out idd, 0, out length, null);
+      info = new byte[length];
+      writer.GetDebugInfo(out idd, length, out length, info);
+      return info;
+    }
+
+    public void Close() {
+      writer.Close();
+    }
+  }
+}

SymbolRW/Utilities.cs

@@ -0,0 +1,84 @@
+//
+//  This code is the managed pdb reader interface for PERWAPI.
+//  Written by John Gough, April 2007. 
+//  Copyright(c) 2007-2008 John Gough, and Queensland University of Technology
+//
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.ComTypes;
+using System.Diagnostics.SymbolStore;
+
+namespace QUT.Symbols {
+  #region Utility Classes
+  /// <summary>
+  /// PInvoke hook to call COM CoCreateInstance.
+  /// Plus any useful constants...
+  /// </summary>
+  internal static class OLE32 {
+    internal const int hr_E_FAIL = unchecked((int)0x80004005);
+
+    [DllImport("ole32.dll")]
+    internal static extern int CoCreateInstance(
+        [In] ref Guid rclsid,
+        [In, MarshalAs(UnmanagedType.IUnknown)] object pUnkOuter,
+        [In] uint dwClsContext,
+        [In] ref Guid riid,
+        [MarshalAs(UnmanagedType.Interface)] out object ppv);
+  }
+
+  /// <summary>
+  /// Some external guids, defined in cor.h, mainly
+  /// </summary>
+  internal static class XGuid {
+    // This guid is the CLSID of the metadata dispenser object in mscoree.dll
+    internal static Guid dispenserClassID = new Guid("{E5CB7A31-7512-11d2-89CE-0080C792E5D8}");
+    // This guid is the IID of the IMetaDataDispenser interface defined in cor.h
+    internal static Guid dispenserIID = new Guid("{809c652e-7396-11d2-9771-00a0c9b4d50c}");
+    // This guid is the IID of the IMetaDataImport interface in cor.h
+    internal static Guid importerIID = new Guid("{7DAC8207-D3AE-4c75-9B67-92801A497D44}");
+    // This guid is the UUID for CorSymBinder_SxS, defined in corsym.h
+    internal static Guid binderCLSID = new Guid("{0A29FF9E-7F9C-4437-8B11-F424491E3931}");
+    internal static Guid binderIID = new Guid("{28AD3D43-B601-4d26-8A1B-25F9165AF9D7}");
+    // This guid is the CLSID for CLSID_CorSymWriter_SxS, defined in corsym.h
+    internal static Guid symWriterClassID = new Guid("0AE2DEB0-F901-478b-BB9F-881EE8066788");
+    internal static Guid symWriterIID = new Guid("0B97726E-9E6D-4f05-9A26-424022093CAA");
+  }
+
+  [StructLayout(LayoutKind.Sequential)]
+  public struct ImageDebugDirectory {
+    private int Characteristics;
+    private int TimeDateStamp;
+    private short MajorVersion;
+    private short MinorVersion;
+    private int Type;
+    private int SizeOfData;
+    private int AddressOfRawData;
+    private int PointerToRawData;
+    // public override string ToString();
+  }
+
+  /// <summary>
+  /// Some static helper methods
+  /// </summary>
+  internal static class Util {
+    internal static void ComCheck(bool test, string message) {
+      if (!test)
+        throw new COMException(message);
+    }
+
+    internal static void ComCheckHR(int hr, string message) {
+      if (hr == OLE32.hr_E_FAIL)
+        throw new COMException(message);
+    }
+
+    internal static void ArgCheck(bool test, string message) {
+      if (!test)
+        throw new ArgumentException(message);
+    }
+  }
+
+  #endregion // Utility Classes
+
+}