2005-01-31 Zoltan Varga <vargaz@freemail.hu>
[mono.git] / mcs / class / corlib / System.Reflection.Emit / ILGenerator.cs
index c6e1c7b47a6caa2ee8c8167a30b847e1c05750de..b99186888fde6e57f31ef2f1b953d679ecf54171 100644 (file)
@@ -1,4 +1,27 @@
 
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 //
 // System.Reflection.Emit/ILGenerator.cs
 //
@@ -12,7 +35,6 @@ using System;
 using System.Collections;
 using System.Diagnostics.SymbolStore;
 using System.Runtime.InteropServices;
-using Mono.CSharp.Debugger;
 
 namespace System.Reflection.Emit {
 
@@ -44,11 +66,13 @@ namespace System.Reflection.Emit {
                int len;
                internal Label end;
 
-               internal int NumHandlers () {
+               internal int NumHandlers ()
+               {
                        return handlers.Length;
                }
                
-               internal void AddCatch (Type extype, int offset) {
+               internal void AddCatch (Type extype, int offset)
+               {
                        int i;
                        End (offset);
                        add_block (offset);
@@ -58,7 +82,8 @@ namespace System.Reflection.Emit {
                        handlers [i].extype = extype;
                }
 
-               internal void AddFinally (int offset) {
+               internal void AddFinally (int offset)
+               {
                        int i;
                        End (offset);
                        add_block (offset);
@@ -68,7 +93,19 @@ namespace System.Reflection.Emit {
                        handlers [i].extype = null;
                }
 
-               internal void End (int offset) {
+               internal void AddFault (int offset)
+               {
+                       int i;
+                       End (offset);
+                       add_block (offset);
+                       i = handlers.Length - 1;
+                       handlers [i].type = ILExceptionBlock.FAULT;
+                       handlers [i].start = offset;
+                       handlers [i].extype = null;
+               }
+
+               internal void End (int offset)
+               {
                        if (handlers == null)
                                return;
                        int i = handlers.Length - 1;
@@ -76,14 +113,16 @@ namespace System.Reflection.Emit {
                                handlers [i].len = offset - handlers [i].start;
                }
 
-               internal int LastClauseType () {
+               internal int LastClauseType ()
+               {
                        if (handlers != null)
                                return handlers [handlers.Length-1].type;
                        else
                                return ILExceptionBlock.CATCH;
                }
 
-               internal void Debug (int b) {
+               internal void Debug (int b)
+               {
 #if NO
                        System.Console.WriteLine ("Handler {0} at {1}, len: {2}", b, start, len);
                        for (int i = 0; i < handlers.Length; ++i)
@@ -91,7 +130,8 @@ namespace System.Reflection.Emit {
 #endif
                }
 
-               void add_block (int offset) {
+               void add_block (int offset)
+               {
                        if (handlers != null) {
                                int i = handlers.Length;
                                ILExceptionBlock[] new_b = new ILExceptionBlock [i + 1];
@@ -110,16 +150,38 @@ namespace System.Reflection.Emit {
                public int code_pos;
        }
 
+       internal interface TokenGenerator {
+               int GetToken (string str);
+
+               int GetToken (MemberInfo member);
+
+               int GetToken (MethodInfo method, Type[] opt_param_types);
+
+               int GetToken (SignatureHelper helper);
+       }               
+
        public class ILGenerator: Object {
                private struct LabelFixup {
-                       public int size;
-                       public int pos;                 // the location of the fixup
-                       public int label_base;  // the base address for this fixup
-                       public int label_idx;
+                       public int offset;    // The number of bytes between pos and the
+                                                             // offset of the jump
+                       public int pos;       // Where offset of the label is placed
+                       public int label_idx; // The label to jump to
                };
-               static Type void_type = typeof (void);
+               
+               struct LabelData {
+                       public LabelData (int addr, int maxStack)
+                       {
+                               this.addr = addr;
+                               this.maxStack = maxStack;
+                       }
+                       
+                       public int addr;
+                       public int maxStack; 
+               }
+               
+               static readonly Type void_type = typeof (void);
+               #region Sync with reflection.h
                private byte[] code;
-               private MethodBase mbuilder; /* a MethodBuilder or ConstructorBuilder */
                private int code_len;
                private int max_stack;
                private int cur_stack;
@@ -127,42 +189,38 @@ namespace System.Reflection.Emit {
                private ILExceptionInfo[] ex_handlers;
                private int num_token_fixups;
                private ILTokenInfo[] token_fixups;
-               private int[] label_to_addr;
-               private int[] label_to_max_stack;
+               #endregion
+               
+               private LabelData [] labels;
                private int num_labels;
                private LabelFixup[] fixups;
                private int num_fixups;
-               private ModuleBuilder module;
-               private AssemblyBuilder abuilder;
-               private IMonoSymbolWriter sym_writer;
+               internal Module module;
                private Stack scopes;
                private int cur_block;
                private Stack open_blocks;
+               private TokenGenerator token_gen;
+               
+               const int defaultFixupSize = 8;
+               const int defaultLabelsSize = 8;
 
-               internal ILGenerator (MethodBase mb, int size) {
+               internal ILGenerator (Module m, TokenGenerator token_gen, int size)
+               {
                        if (size < 0)
                                size = 128;
                        code_len = 0;
                        code = new byte [size];
-                       mbuilder = mb;
                        cur_stack = max_stack = 0;
                        num_fixups = num_labels = 0;
-                       label_to_addr = new int [8];
-                       label_to_max_stack = new int [8];
-                       fixups = new LabelFixup [8];
                        token_fixups = new ILTokenInfo [8];
                        num_token_fixups = 0;
-                       if (mb is MethodBuilder) {
-                               module = (ModuleBuilder)((MethodBuilder)mb).TypeBuilder.Module;
-                       } else if (mb is ConstructorBuilder) {
-                               module = (ModuleBuilder)((ConstructorBuilder)mb).TypeBuilder.Module;
-                       }
-                       abuilder = (AssemblyBuilder)module.Assembly;
-                       sym_writer = module.symbol_writer;
+                       module = m;
                        open_blocks = new Stack ();
+                       this.token_gen = token_gen;
                }
 
-               private void add_token_fixup (MemberInfo mi) {
+               private void add_token_fixup (MemberInfo mi)
+               {
                        if (num_token_fixups == token_fixups.Length) {
                                ILTokenInfo[] ntf = new ILTokenInfo [num_token_fixups * 2];
                                token_fixups.CopyTo (ntf, 0);
@@ -172,21 +230,26 @@ namespace System.Reflection.Emit {
                        token_fixups [num_token_fixups++].code_pos = code_len;
                }
 
-               private void make_room (int nbytes) {
+               private void make_room (int nbytes)
+               {
                        if (code_len + nbytes < code.Length)
                                return;
                        byte[] new_code = new byte [(code_len + nbytes) * 2 + 128];
                        System.Array.Copy (code, 0, new_code, 0, code.Length);
                        code = new_code;
                }
-               private void emit_int (int val) {
+
+               private void emit_int (int val)
+               {
                        code [code_len++] = (byte) (val & 0xFF);
                        code [code_len++] = (byte) ((val >> 8) & 0xFF);
                        code [code_len++] = (byte) ((val >> 16) & 0xFF);
                        code [code_len++] = (byte) ((val >> 24) & 0xFF);
                }
+
                /* change to pass by ref to avoid copy */
-               private void ll_emit (OpCode opcode) {
+               private void ll_emit (OpCode opcode)
+               {
                        /* 
                         * there is already enough room allocated in code.
                         */
@@ -248,13 +311,15 @@ namespace System.Reflection.Emit {
                        }
                }
 
-               private static int target_len (OpCode opcode) {
-                       if (opcode.operandType == OperandType.InlineBrTarget)
+               private static int target_len (OpCode opcode)
+               {
+                       if (opcode.OperandType == OperandType.InlineBrTarget)
                                return 4;
                        return 1;
                }
 
-               private void InternalEndClause () {
+               private void InternalEndClause ()
+               {
                        switch (ex_handlers [cur_block].LastClauseType ()) {
                        case ILExceptionBlock.CATCH:
                                // how could we optimize code size here?
@@ -270,7 +335,8 @@ namespace System.Reflection.Emit {
                        }
                }
 
-               public virtual void BeginCatchBlock (Type exceptionType) {
+               public virtual void BeginCatchBlock (Type exceptionType)
+               {
                        if (open_blocks.Count <= 0)
                                throw new NotSupportedException ("Not in an exception block");
                        InternalEndClause ();
@@ -281,10 +347,15 @@ namespace System.Reflection.Emit {
                        //System.Console.WriteLine ("Begin catch Block: {0} {1}",exceptionType.ToString(), max_stack);
                        //throw new NotImplementedException ();
                }
-               public virtual void BeginExceptFilterBlock () {
+
+               [MonoTODO]
+               public virtual void BeginExceptFilterBlock ()
+               {
                        throw new NotImplementedException ();
                }
-               public virtual Label BeginExceptionBlock () {
+
+               public virtual Label BeginExceptionBlock ()
+               {
                        //System.Console.WriteLine ("Begin Block");
                        
                        if (ex_handlers != null) {
@@ -300,28 +371,43 @@ namespace System.Reflection.Emit {
                        ex_handlers [cur_block].start = code_len;
                        return ex_handlers [cur_block].end = DefineLabel ();
                }
-               public virtual void BeginFaultBlock() {
+
+               public virtual void BeginFaultBlock()
+               {
                        if (open_blocks.Count <= 0)
                                throw new NotSupportedException ("Not in an exception block");
                        //System.Console.WriteLine ("Begin fault Block");
-                       //throw new NotImplementedException ();
+                       ex_handlers [cur_block].AddFault (code_len);
                }
-               public virtual void BeginFinallyBlock() {
+               
+               public virtual void BeginFinallyBlock()
+               {
                        if (open_blocks.Count <= 0)
                                throw new NotSupportedException ("Not in an exception block");
                        InternalEndClause ();
                        //System.Console.WriteLine ("Begin finally Block");
                        ex_handlers [cur_block].AddFinally (code_len);
                }
-               public virtual void BeginScope () {
-                       if (sym_writer != null) {
-                               if (scopes == null)
-                                       scopes = new Stack ();
-                               scopes.Push (sym_writer.OpenScope (code_len));
-                       }
+               
+               public virtual void BeginScope ()
+               { }
+               
+               public LocalBuilder DeclareLocal (Type localType)
+               {
+                       return DeclareLocal (localType, false);
                }
-               public LocalBuilder DeclareLocal (Type localType) {
-                       LocalBuilder res = new LocalBuilder (module, localType, this);
+
+
+#if NET_2_0
+               public
+#else
+               internal
+#endif
+               LocalBuilder DeclareLocal (Type localType, bool pinned)
+               {
+                       LocalBuilder res = new LocalBuilder (localType, this);
+                       res.is_pinned = pinned;
+                       
                        if (locals != null) {
                                LocalBuilder[] new_l = new LocalBuilder [locals.Length + 1];
                                System.Array.Copy (locals, new_l, locals.Length);
@@ -331,43 +417,55 @@ namespace System.Reflection.Emit {
                                locals = new LocalBuilder [1];
                                locals [0] = res;
                        }
-                       res.position = (uint)(locals.Length - 1);
+                       res.position = (ushort)(locals.Length - 1);
                        return res;
                }
-               public virtual Label DefineLabel () {
-                       if (num_labels >= label_to_addr.Length) {
-                               int[] new_l = new int [label_to_addr.Length * 2];
-                               System.Array.Copy (label_to_addr, new_l, label_to_addr.Length);
-                               int[] new_s = new int [label_to_addr.Length * 2];
-                               System.Array.Copy (label_to_max_stack, new_s, label_to_addr.Length);
-                               label_to_addr = new_l;
-                               label_to_max_stack = new_s;
+               
+               public virtual Label DefineLabel ()
+               {
+                       if (labels == null)
+                               labels = new LabelData [defaultLabelsSize];
+                       else if (num_labels >= labels.Length) {
+                               LabelData [] t = new LabelData [labels.Length * 2];
+                               Array.Copy (labels, t, labels.Length);
+                               labels = t;
                        }
-                       label_to_addr [num_labels] = -1;
-                       label_to_max_stack [num_labels] = 0;
+                       
+                       labels [num_labels] = new LabelData (-1, 0);
+                       
                        return new Label (num_labels++);
                }
-               public virtual void Emit (OpCode opcode) {
+               
+               public virtual void Emit (OpCode opcode)
+               {
                        make_room (2);
                        ll_emit (opcode);
                }
-               public virtual void Emit (OpCode opcode, Byte val) {
+               
+               public virtual void Emit (OpCode opcode, Byte val)
+               {
                        make_room (3);
                        ll_emit (opcode);
                        code [code_len++] = val;
                }
-               public virtual void Emit (OpCode opcode, ConstructorInfo constructor) {
-                       int token = abuilder.GetToken (constructor);
+               
+               public virtual void Emit (OpCode opcode, ConstructorInfo constructor)
+               {
+                       int token = token_gen.GetToken (constructor);
                        make_room (6);
                        ll_emit (opcode);
                        if (constructor.DeclaringType.Module == module)
                                add_token_fixup (constructor);
                        emit_int (token);
-                       ParameterInfo[] mparams = constructor.GetParameters();
-                       if ((opcode.StackBehaviourPop == StackBehaviour.Varpop) && (mparams != null))
-                               cur_stack -= mparams.Length;
+                       
+                       if (opcode.StackBehaviourPop == StackBehaviour.Varpop)
+                               cur_stack -= constructor.GetParameterCount ();
                }
-               public virtual void Emit (OpCode opcode, double val) {
+               
+               public virtual void Emit (OpCode opcode, double val)
+               {
+                       Double.AssertEndianity (out val);
+
                        byte[] s = System.BitConverter.GetBytes (val);
                        make_room (10);
                        ll_emit (opcode);
@@ -385,26 +483,34 @@ namespace System.Reflection.Emit {
                                code [code_len++] = s [0];                              
                        }
                }
-               public virtual void Emit (OpCode opcode, FieldInfo field) {
-                       int token = abuilder.GetToken (field);
+               
+               public virtual void Emit (OpCode opcode, FieldInfo field)
+               {
+                       int token = token_gen.GetToken (field);
                        make_room (6);
                        ll_emit (opcode);
                        if (field.DeclaringType.Module == module)
                                add_token_fixup (field);
                        emit_int (token);
                }
-               public virtual void Emit (OpCode opcode, Int16 val) {
+               
+               public virtual void Emit (OpCode opcode, Int16 val)
+               {
                        make_room (4);
                        ll_emit (opcode);
                        code [code_len++] = (byte) (val & 0xFF);
                        code [code_len++] = (byte) ((val >> 8) & 0xFF);
                }
-               public virtual void Emit (OpCode opcode, int val) {
+               
+               public virtual void Emit (OpCode opcode, int val)
+               {
                        make_room (6);
                        ll_emit (opcode);
                        emit_int (val);
                }
-               public virtual void Emit (OpCode opcode, long val) {
+               
+               public virtual void Emit (OpCode opcode, long val)
+               {
                        make_room (10);
                        ll_emit (opcode);
                        code [code_len++] = (byte) (val & 0xFF);
@@ -416,52 +522,75 @@ namespace System.Reflection.Emit {
                        code [code_len++] = (byte) ((val >> 48) & 0xFF);
                        code [code_len++] = (byte) ((val >> 56) & 0xFF);
                }
-               public virtual void Emit (OpCode opcode, Label label) {
+               
+               public virtual void Emit (OpCode opcode, Label label)
+               {
                        int tlen = target_len (opcode);
                        make_room (6);
                        ll_emit (opcode);
-                       if (cur_stack > label_to_max_stack [label.label])
-                               label_to_max_stack [label.label] = cur_stack;
-                       if (num_fixups >= fixups.Length) {
+                       if (cur_stack > labels [label.label].maxStack)
+                               labels [label.label].maxStack = cur_stack;
+                       
+                       if (fixups == null)
+                               fixups = new LabelFixup [defaultFixupSize]; 
+                       else if (num_fixups >= fixups.Length) {
                                LabelFixup[] newf = new LabelFixup [fixups.Length + 16];
                                System.Array.Copy (fixups, newf, fixups.Length);
                                fixups = newf;
                        }
-                       fixups [num_fixups].size = tlen;
+                       fixups [num_fixups].offset = tlen;
                        fixups [num_fixups].pos = code_len;
-                       fixups [num_fixups].label_base = code_len;
                        fixups [num_fixups].label_idx = label.label;
                        num_fixups++;
                        code_len += tlen;
 
                }
-               public virtual void Emit (OpCode opcode, Label[] labels) {
+               
+               public virtual void Emit (OpCode opcode, Label[] labels)
+               {
                        /* opcode needs to be switch. */
                        int count = labels.Length;
                        make_room (6 + count * 4);
                        ll_emit (opcode);
 
                        for (int i = 0; i < count; ++i)
-                               if (cur_stack > label_to_max_stack [labels [i].label])
-                                       label_to_max_stack [labels [i].label] = cur_stack;
+                               if (cur_stack > this.labels [labels [i].label].maxStack)
+                                       this.labels [labels [i].label].maxStack = cur_stack;
 
-                       int switch_base = code_len + count*4;
                        emit_int (count);
-                       if (num_fixups + count >= fixups.Length) {
+                       if (fixups == null)
+                               fixups = new LabelFixup [defaultFixupSize + count]; 
+                       else if (num_fixups + count >= fixups.Length) {
                                LabelFixup[] newf = new LabelFixup [fixups.Length + count + 16];
                                System.Array.Copy (fixups, newf, fixups.Length);
                                fixups = newf;
                        }
-                       for (int i = 0; i < count; ++i) {
-                               fixups [num_fixups].size = 4;
+                       
+                       // ECMA 335, Partition III, p94 (7-10)
+                       //
+                       // The switch instruction implements a jump table. The format of 
+                       // the instruction is an unsigned int32 representing the number of targets N,
+                       // followed by N int32 values specifying jump targets: these targets are
+                       // represented as offsets (positive or negative) from the beginning of the 
+                       // instruction following this switch instruction.
+                       //
+                       // We must make sure it gets an offset from the *end* of the last label
+                       // (eg, the beginning of the instruction following this).
+                       //
+                       // remaining is the number of bytes from the current instruction to the
+                       // instruction that will be emitted.
+                       
+                       for (int i = 0, remaining = count * 4; i < count; ++i, remaining -= 4) {
+                               fixups [num_fixups].offset = remaining;
                                fixups [num_fixups].pos = code_len;
-                               fixups [num_fixups].label_base = switch_base;
                                fixups [num_fixups].label_idx = labels [i].label;
                                num_fixups++;
                                code_len += 4;
                        }
                }
-               public virtual void Emit (OpCode opcode, LocalBuilder lbuilder) {
+
+               public virtual void Emit (OpCode opcode, LocalBuilder lbuilder)
+               {
                        uint pos = lbuilder.position;
                        bool load_addr = false;
                        bool is_store = false;
@@ -518,11 +647,27 @@ namespace System.Reflection.Emit {
                                }
                        }
                }
-               public virtual void Emit (OpCode opcode, MethodInfo method) {
+
+               public virtual void Emit (OpCode opcode, MethodInfo method)
+               {
                        if (method == null)
                                throw new ArgumentNullException ("method");
 
-                       int token = abuilder.GetToken (method);
+                       int token = token_gen.GetToken (method);
+                       make_room (6);
+                       ll_emit (opcode);
+                       if (method.DeclaringType.Module == module)
+                               add_token_fixup (method);
+                       emit_int (token);
+                       if (method.ReturnType != void_type)
+                               cur_stack ++;
+
+                       if (opcode.StackBehaviourPop == StackBehaviour.Varpop)
+                               cur_stack -= method.GetParameterCount ();
+               }
+
+               private void Emit (OpCode opcode, MethodInfo method, int token)
+               {
                        make_room (6);
                        ll_emit (opcode);
                        if (method.DeclaringType.Module == module)
@@ -530,24 +675,29 @@ namespace System.Reflection.Emit {
                        emit_int (token);
                        if (method.ReturnType != void_type)
                                cur_stack ++;
-                       ParameterInfo[] mparams = method.GetParameters();
-                       if ((opcode.StackBehaviourPop == StackBehaviour.Varpop) && (mparams != null))
-                               cur_stack -= mparams.Length;
+
+                       if (opcode.StackBehaviourPop == StackBehaviour.Varpop)
+                               cur_stack -= method.GetParameterCount ();
                }
+
                [CLSCompliant(false)]
-               public void Emit (OpCode opcode, sbyte val) {
+               public void Emit (OpCode opcode, sbyte val)
+               {
                        make_room (3);
                        ll_emit (opcode);
                        code [code_len++] = (byte)val;
                }
 
-               public virtual void Emit (OpCode opcode, SignatureHelper shelper) {
-                       int token = abuilder.GetToken (shelper);
+               public virtual void Emit (OpCode opcode, SignatureHelper shelper)
+               {
+                       int token = token_gen.GetToken (shelper);
                        make_room (6);
                        ll_emit (opcode);
                        emit_int (token);
                }
-               public virtual void Emit (OpCode opcode, float val) {
+
+               public virtual void Emit (OpCode opcode, float val)
+               {
                        byte[] s = System.BitConverter.GetBytes (val);
                        make_room (6);
                        ll_emit (opcode);
@@ -561,29 +711,51 @@ namespace System.Reflection.Emit {
                                code [code_len++] = s [0];                              
                        }
                }
-               public virtual void Emit (OpCode opcode, string val) {
-                       int token = abuilder.GetToken (val);
+
+               public virtual void Emit (OpCode opcode, string val)
+               {
+                       int token = token_gen.GetToken (val);
                        make_room (6);
                        ll_emit (opcode);
                        emit_int (token);
                }
-               public virtual void Emit (OpCode opcode, Type type) {
+
+               public virtual void Emit (OpCode opcode, Type type)
+               {
                        make_room (6);
                        ll_emit (opcode);
-                       emit_int (abuilder.GetToken (type));
-               }
+                       emit_int (token_gen.GetToken (type));
+               }
+
+               [MonoTODO ("Do something about varargs method")]
+               public void EmitCall (OpCode opcode, MethodInfo methodinfo, Type[] optionalParamTypes)
+               {
+                       if (methodinfo == null)
+                               throw new ArgumentNullException ("methodinfo can not be null");
+                       short value = opcode.Value;
+                       if (!(value == OpCodes.Call.Value || value == OpCodes.Callvirt.Value))
+                               throw new NotSupportedException ("Only Call and CallVirt are allowed");
+                       if (optionalParamTypes != null){
+                               if ((methodinfo.CallingConvention & CallingConventions.VarArgs)  == 0){
+                                       throw new InvalidOperationException ("Method is not VarArgs method and optional types were passed");
+                               }
 
-               public void EmitCall (OpCode opcode, MethodInfo methodinfo, Type[] optionalParamTypes) {
-                       throw new NotImplementedException ();
+                               int token = token_gen.GetToken (methodinfo, optionalParamTypes);
+                               Emit (opcode, methodinfo, token);
+                               return;
+                       }
+                       Emit (opcode, methodinfo);
                }
 
-               public void EmitCalli (OpCode opcode, CallingConvention unmanagedCallConv, Type returnType, Type[] paramTypes) {
+               public void EmitCalli (OpCode opcode, CallingConvention unmanagedCallConv, Type returnType, Type[] paramTypes)
+               {
                        SignatureHelper helper 
                                = SignatureHelper.GetMethodSigHelper (module, 0, unmanagedCallConv, returnType, paramTypes);
                        Emit (opcode, helper);
                }
 
-               public void EmitCalli (OpCode opcode, CallingConventions callConv, Type returnType, Type[] paramTypes, Type[] optionalParamTypes) {
+               public void EmitCalli (OpCode opcode, CallingConventions callConv, Type returnType, Type[] paramTypes, Type[] optionalParamTypes)
+               {
                        if (optionalParamTypes != null)
                                throw new NotImplementedException ();
 
@@ -592,20 +764,49 @@ namespace System.Reflection.Emit {
                        Emit (opcode, helper);
                }
                
-               public virtual void EmitWriteLine (FieldInfo field) {
-                       throw new NotImplementedException ();
-               }
-               public virtual void EmitWriteLine (LocalBuilder lbuilder) {
-                       throw new NotImplementedException ();
+               public virtual void EmitWriteLine (FieldInfo field)
+               {
+                       if (field == null)
+                               throw new ArgumentNullException ("field");
+                       
+                       // The MS implementation does not check for valuetypes here but it
+                       // should. Also, it should check that if the field is not static,
+                       // then it is a member of this type.
+                       if (field.IsStatic)
+                               Emit (OpCodes.Ldsfld, field);
+                       else {
+                               Emit (OpCodes.Ldarg_0);
+                               Emit (OpCodes.Ldfld, field);
+                       }
+                       Emit (OpCodes.Call, 
+                             typeof (Console).GetMethod ("WriteLine",
+                                                         new Type[1] { field.FieldType }));
+               }
+
+               public virtual void EmitWriteLine (LocalBuilder lbuilder)
+               {
+                       if (lbuilder == null)
+                               throw new ArgumentNullException ("lbuilder");
+                       if (lbuilder.LocalType is TypeBuilder)
+                               throw new  ArgumentException ("Output streams do not support TypeBuilders.");
+                       // The MS implementation does not check for valuetypes here but it
+                       // should.
+                       Emit (OpCodes.Ldloc, lbuilder);
+                       Emit (OpCodes.Call, 
+                             typeof (Console).GetMethod ("WriteLine",
+                                                         new Type[1] { lbuilder.LocalType }));
                }
-               public virtual void EmitWriteLine (string val) {
+               
+               public virtual void EmitWriteLine (string val)
+               {
                        Emit (OpCodes.Ldstr, val);
                        Emit (OpCodes.Call, 
-                                 typeof (Console).GetMethod ("WriteLine",
-                                                                                         new Type[1] { typeof(string)}));
+                             typeof (Console).GetMethod ("WriteLine",
+                                                         new Type[1] { typeof(string)}));
                }
 
-               public virtual void EndExceptionBlock () {
+               public virtual void EndExceptionBlock ()
+               {
                        if (open_blocks.Count <= 0)
                                throw new NotSupportedException ("Not in an exception block");
                        InternalEndClause ();
@@ -619,32 +820,27 @@ namespace System.Reflection.Emit {
                        //Console.WriteLine ("curblock restored to {0}", cur_block);
                        //throw new NotImplementedException ();
                }
-               public virtual void EndScope () {
-                       if (sym_writer != null) {
-                               sym_writer.CloseScope (code_len);
-                               if (scopes == null)
-                                       throw new InvalidOperationException ();
-                               scopes.Pop ();
-                       }
-               }
-               public virtual void MarkLabel (Label loc) {
+
+               public virtual void EndScope ()
+               { }
+
+               public virtual void MarkLabel (Label loc)
+               {
                        if (loc.label < 0 || loc.label >= num_labels)
                                throw new System.ArgumentException ("The label is not valid");
-                       if (label_to_addr [loc.label] >= 0)
+                       if (labels [loc.label].addr >= 0)
                                throw new System.ArgumentException ("The label was already defined");
-                       label_to_addr [loc.label] = code_len;
-                       if (label_to_max_stack [loc.label] > cur_stack)
-                               cur_stack = label_to_max_stack [loc.label];
+                       labels [loc.label].addr = code_len;
+                       if (labels [loc.label].maxStack > cur_stack)
+                               cur_stack = labels [loc.label].maxStack;
                }
-               public virtual void MarkSequencePoint (ISymbolDocumentWriter document, int startLine,
-                                                      int startColumn, int endLine, int endColumn) {
-                       if (sym_writer == null)
-                               return;
 
-                       sym_writer.MarkSequencePoint (code_len, startLine, startColumn);
-               }
+               public virtual void MarkSequencePoint (ISymbolDocumentWriter document, int startLine,
+                                                      int startColumn, int endLine, int endColumn)
+               { }
 
-               public virtual void ThrowException (Type exceptionType) {
+               public virtual void ThrowException (Type exceptionType)
+               {
                        if (exceptionType == null)
                                throw new ArgumentNullException ("exceptionType");
                        if (! ((exceptionType == typeof (Exception)) || 
@@ -657,23 +853,32 @@ namespace System.Reflection.Emit {
                        Emit (OpCodes.Throw);
                }
 
-               public void UsingNamespace (String usingNamespace) {
+               [MonoTODO]
+               public void UsingNamespace (String usingNamespace)
+               {
                        throw new NotImplementedException ();
                }
 
-               internal void label_fixup () {
-                       int i;
-                       for (i = 0; i < num_fixups; ++i) {
-                               int diff = label_to_addr [fixups [i].label_idx] - fixups [i].label_base;
-                               if (fixups [i].size == 1) {
-                                       code [fixups [i].pos] = (byte)((sbyte) diff - 1);
+               internal void label_fixup ()
+               {
+                       for (int i = 0; i < num_fixups; ++i) {
+                               
+                               // Diff is the offset from the end of the jump instruction to the address of the label
+                               int diff = labels [fixups [i].label_idx].addr - (fixups [i].pos + fixups [i].offset);
+                               if (fixups [i].offset == 1) {
+                                       code [fixups [i].pos] = (byte)((sbyte) diff);
                                } else {
                                        int old_cl = code_len;
                                        code_len = fixups [i].pos;
-                                       emit_int (diff - 4);
+                                       emit_int (diff);
                                        code_len = old_cl;
                                }
                        }
                }
+
+               internal static int Mono_GetCurrentOffset (ILGenerator ig)
+               {
+                       return ig.code_len;
+               }
        }
 }