2003-09-17 Martin Baulig <martin@ximian.com>
[mono.git] / mcs / class / corlib / System.Reflection.Emit / ILGenerator.cs
index 5909a7b0b2ce3ee26d54c72c03941bb60552efb3..68112837355f3ed5cee269efe76134a0d8eca432 100644 (file)
@@ -11,6 +11,8 @@
 using System;
 using System.Collections;
 using System.Diagnostics.SymbolStore;
+using System.Runtime.InteropServices;
+using Mono.CSharp.Debugger;
 
 namespace System.Reflection.Emit {
 
@@ -27,11 +29,13 @@ namespace System.Reflection.Emit {
                internal int filter_offset;
                
                internal void Debug () {
+#if NO
                        System.Console.Write ("\ttype="+type.ToString()+" start="+start.ToString()+" len="+len.ToString());
                        if (extype != null)
                                System.Console.WriteLine (" extype="+extype.ToString());
                        else
                                System.Console.WriteLine ("");
+#endif
                }
        }
        internal struct ILExceptionInfo {
@@ -40,7 +44,13 @@ namespace System.Reflection.Emit {
                int len;
                internal Label end;
 
-               internal void AddCatch (Type extype, int offset) {
+               internal int NumHandlers ()
+               {
+                       return handlers.Length;
+               }
+               
+               internal void AddCatch (Type extype, int offset)
+               {
                        int i;
                        End (offset);
                        add_block (offset);
@@ -50,7 +60,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);
@@ -60,7 +71,8 @@ namespace System.Reflection.Emit {
                        handlers [i].extype = null;
                }
 
-               internal void End (int offset) {
+               internal void End (int offset)
+               {
                        if (handlers == null)
                                return;
                        int i = handlers.Length - 1;
@@ -68,22 +80,25 @@ 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 () {
+               internal void Debug (int b)
+               {
 #if NO
-                       System.Console.WriteLine ("Handler at "+start.ToString()+ " len: "+len.ToString());
+                       System.Console.WriteLine ("Handler {0} at {1}, len: {2}", b, start, len);
                        for (int i = 0; i < handlers.Length; ++i)
                                handlers [i].Debug ();
 #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];
@@ -105,7 +120,8 @@ namespace System.Reflection.Emit {
        public class ILGenerator: Object {
                private struct LabelFixup {
                        public int size;
-                       public int pos;
+                       public int pos;                 // the location of the fixup
+                       public int label_base;  // the base address for this fixup
                        public int label_idx;
                };
                static Type void_type = typeof (void);
@@ -119,28 +135,30 @@ namespace System.Reflection.Emit {
                private int num_token_fixups;
                private ILTokenInfo[] token_fixups;
                private int[] label_to_addr;
+               private int[] label_to_max_stack;
                private int num_labels;
                private LabelFixup[] fixups;
                private int num_fixups;
                private ModuleBuilder module;
                private AssemblyBuilder abuilder;
-               private ISymbolWriter sym_writer;
+               private IMonoSymbolWriter sym_writer;
                private Stack scopes;
                private int cur_block;
-               private int open_blocks;
+               private Stack open_blocks;
 
-               internal ILGenerator (MethodBase mb, int size) {
+               internal ILGenerator (MethodBase mb, int size)
+               {
                        if (size < 0)
-                               size = 256;
+                               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 [16];
-                       fixups = new LabelFixup [16];
-                       token_fixups = new ILTokenInfo [16];
-                       scopes = new Stack ();
+                       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;
@@ -148,10 +166,12 @@ namespace System.Reflection.Emit {
                                module = (ModuleBuilder)((ConstructorBuilder)mb).TypeBuilder.Module;
                        }
                        abuilder = (AssemblyBuilder)module.Assembly;
-                       sym_writer = module.GetSymWriter ();
+                       sym_writer = module.symbol_writer;
+                       open_blocks = new Stack ();
                }
 
-               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);
@@ -161,21 +181,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.Length * 2 + 128];
+                       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.
                         */
@@ -204,6 +229,7 @@ namespace System.Reflection.Emit {
                        }
                        if (max_stack < cur_stack)
                                max_stack = cur_stack;
+
                        /* 
                         * Note that we adjust for the pop behaviour _after_ setting max_stack.
                         */
@@ -236,13 +262,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?
@@ -258,18 +286,27 @@ namespace System.Reflection.Emit {
                        }
                }
 
-               public virtual void BeginCatchBlock (Type exceptionType) {
-                       if (open_blocks <= 0)
+               public virtual void BeginCatchBlock (Type exceptionType)
+               {
+                       if (open_blocks.Count <= 0)
                                throw new NotSupportedException ("Not in an exception block");
                        InternalEndClause ();
                        ex_handlers [cur_block].AddCatch (exceptionType, code_len);
-                       //System.Console.WriteLine ("Begin catch Block: "+exceptionType.ToString());
+                       cur_stack = 1; // the exception object is on the stack by default
+                       if (max_stack < cur_stack)
+                               max_stack = cur_stack;
+                       //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) {
@@ -281,30 +318,40 @@ namespace System.Reflection.Emit {
                                ex_handlers = new ILExceptionInfo [1];
                                cur_block = 0;
                        }
-                       open_blocks++;
+                       open_blocks.Push (cur_block);
                        ex_handlers [cur_block].start = code_len;
                        return ex_handlers [cur_block].end = DefineLabel ();
                }
-               public virtual void BeginFaultBlock() {
-                       if (open_blocks <= 0)
+
+               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 ();
                }
-               public virtual void BeginFinallyBlock() {
-                       if (open_blocks <= 0)
+               
+               public virtual void BeginFinallyBlock()
+               {
+                       if (open_blocks.Count <= 0)
                                throw new NotSupportedException ("Not in an exception block");
-                       //System.Console.WriteLine ("Begin finally Block");
                        InternalEndClause ();
+                       //System.Console.WriteLine ("Begin finally Block");
                        ex_handlers [cur_block].AddFinally (code_len);
-                       //throw new NotImplementedException ();
                }
-               public virtual void BeginScope () {
-                       if (sym_writer != null)
+               
+               public virtual void BeginScope ()
+               {
+                       if (sym_writer != null) {
+                               if (scopes == null)
+                                       scopes = new Stack ();
                                scopes.Push (sym_writer.OpenScope (code_len));
+                       }
                }
-               public LocalBuilder DeclareLocal (Type localType) {
-                       LocalBuilder res = new LocalBuilder (module, localType);
+               
+               public LocalBuilder DeclareLocal (Type localType)
+               {
+                       LocalBuilder res = new LocalBuilder (module, localType, this);
                        if (locals != null) {
                                LocalBuilder[] new_l = new LocalBuilder [locals.Length + 1];
                                System.Array.Copy (locals, new_l, locals.Length);
@@ -317,62 +364,97 @@ namespace System.Reflection.Emit {
                        res.position = (uint)(locals.Length - 1);
                        return res;
                }
-               public virtual Label DefineLabel () {
+               
+               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;
                        }
                        label_to_addr [num_labels] = -1;
+                       label_to_max_stack [num_labels] = 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) {
+               
+               public virtual void Emit (OpCode opcode, ConstructorInfo constructor)
+               {
                        int token = abuilder.GetToken (constructor);
                        make_room (6);
                        ll_emit (opcode);
-                       if (constructor is ConstructorBuilder)
+                       if (constructor.DeclaringType.Module == module)
                                add_token_fixup (constructor);
                        emit_int (token);
                        ParameterInfo[] mparams = constructor.GetParameters();
-                       if (mparams != null)
+                       if ((opcode.StackBehaviourPop == StackBehaviour.Varpop) && (mparams != null))
                                cur_stack -= mparams.Length;
                }
-               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);
-                       System.Array.Copy (s, 0, code, code_len, 8);
-                       code_len += 8;
+                       if (BitConverter.IsLittleEndian){
+                               System.Array.Copy (s, 0, code, code_len, 8);
+                               code_len += 8;
+                       } else {
+                               code [code_len++] = s [7];
+                               code [code_len++] = s [6];
+                               code [code_len++] = s [5];
+                               code [code_len++] = s [4];
+                               code [code_len++] = s [3];
+                               code [code_len++] = s [2];
+                               code [code_len++] = s [1];
+                               code [code_len++] = s [0];                              
+                       }
                }
-               public virtual void Emit (OpCode opcode, FieldInfo field) {
+               
+               public virtual void Emit (OpCode opcode, FieldInfo field)
+               {
                        int token = abuilder.GetToken (field);
                        make_room (6);
                        ll_emit (opcode);
-                       if (field is FieldBuilder)
+                       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, Int32 val) {
+               
+               public virtual void Emit (OpCode opcode, int val)
+               {
                        make_room (6);
                        ll_emit (opcode);
                        emit_int (val);
                }
-               public virtual void Emit (OpCode opcode, Int64 val) {
+               
+               public virtual void Emit (OpCode opcode, long val)
+               {
                        make_room (10);
                        ll_emit (opcode);
                        code [code_len++] = (byte) (val & 0xFF);
@@ -384,10 +466,14 @@ 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) {
                                LabelFixup[] newf = new LabelFixup [fixups.Length + 16];
                                System.Array.Copy (fixups, newf, fixups.Length);
@@ -395,16 +481,25 @@ namespace System.Reflection.Emit {
                        }
                        fixups [num_fixups].size = 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;
+
+                       int switch_base = code_len + count*4;
                        emit_int (count);
                        if (num_fixups + count >= fixups.Length) {
                                LabelFixup[] newf = new LabelFixup [fixups.Length + count + 16];
@@ -414,16 +509,23 @@ namespace System.Reflection.Emit {
                        for (int i = 0; i < count; ++i) {
                                fixups [num_fixups].size = 4;
                                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;
                        make_room (6);
+
+                       if (lbuilder.ilgen != this)
+                               throw new Exception ("Trying to emit a local from a different ILGenerator.");
+
                        /* inline the code from ll_emit () to optimize il code size */
                        if (opcode.StackBehaviourPop == StackBehaviour.Pop1) {
                                cur_stack --;
@@ -472,119 +574,217 @@ 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);
                        make_room (6);
                        ll_emit (opcode);
-                       if (method is MethodBuilder)
+                       if (method.DeclaringType.Module == module)
                                add_token_fixup (method);
                        emit_int (token);
-                       if (method.ReturnType == void_type)
-                               cur_stack --;
+                       if (method.ReturnType != void_type)
+                               cur_stack ++;
                        ParameterInfo[] mparams = method.GetParameters();
-                       if (mparams != null)
+                       if ((opcode.StackBehaviourPop == StackBehaviour.Varpop) && (mparams != null))
                                cur_stack -= mparams.Length;
                }
+
                [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;
                }
 
-               [MonoTODO]
-               public virtual void Emit (OpCode opcode, SignatureHelper shelper) {
-                       int token = 0; // FIXME: request a token from the modulebuilder
+               public virtual void Emit (OpCode opcode, SignatureHelper shelper)
+               {
+                       int token = abuilder.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);
-                       System.Array.Copy (s, 0, code, code_len, 4);
-                       code_len += 4;
+                       if (BitConverter.IsLittleEndian){
+                               System.Array.Copy (s, 0, code, code_len, 4);
+                               code_len += 4;
+                       } else {
+                               code [code_len++] = s [3];
+                               code [code_len++] = s [2];
+                               code [code_len++] = s [1];
+                               code [code_len++] = s [0];                              
+                       }
                }
-               public virtual void Emit (OpCode opcode, string val) {
+
+               public virtual void Emit (OpCode opcode, string val)
+               {
                        int token = abuilder.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));
                }
 
-               public void EmitCall (OpCode opcode, MethodInfo methodinfo, Type[] optionalParamTypes) {
-                       throw new NotImplementedException ();
+               [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");
+                               }
+                       }
+                       Emit (opcode, methodinfo);
                }
-               public void EmitCalli (OpCode opcode, CallingConventions call_conv, Type returnType, Type[] paramTypes, Type[] optionalParamTypes) {
-                       throw new NotImplementedException ();
+
+               public void EmitCalli (OpCode opcode, CallingConvention unmanagedCallConv, Type returnType, Type[] paramTypes)
+               {
+                       SignatureHelper helper 
+                               = SignatureHelper.GetMethodSigHelper (module, 0, unmanagedCallConv, returnType, paramTypes);
+                       Emit (opcode, helper);
                }
 
-               public virtual void EmitWriteLine (FieldInfo field) {
-                       throw new NotImplementedException ();
+               public void EmitCalli (OpCode opcode, CallingConventions callConv, Type returnType, Type[] paramTypes, Type[] optionalParamTypes)
+               {
+                       if (optionalParamTypes != null)
+                               throw new NotImplementedException ();
+
+                       SignatureHelper helper 
+                               = SignatureHelper.GetMethodSigHelper (module, callConv, 0, returnType, paramTypes);
+                       Emit (opcode, helper);
                }
-               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.Ldloc_0);
+                               Emit (OpCodes.Ldfld, field);
+                       }
+                       Emit (OpCodes.Call, 
+                                 typeof (Console).GetMethod ("WriteLine",
+                                                                                         new Type[1] { field.FieldType }));
                }
-               public virtual void EmitWriteLine (string val) {
-                       throw new NotImplementedException ();
+
+               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)
+               {
+                       Emit (OpCodes.Ldstr, val);
+                       Emit (OpCodes.Call, 
+                                 typeof (Console).GetMethod ("WriteLine",
+                                                                                         new Type[1] { typeof(string)}));
                }
 
-               public virtual void EndExceptionBlock () {
-                       if (open_blocks <= 0)
+               public virtual void EndExceptionBlock ()
+               {
+                       if (open_blocks.Count <= 0)
                                throw new NotSupportedException ("Not in an exception block");
                        InternalEndClause ();
                        MarkLabel (ex_handlers [cur_block].end);
                        ex_handlers [cur_block].End (code_len);
-                       ex_handlers [cur_block].Debug ();
-                       --cur_block;
-                       --open_blocks;
-                       //System.Console.WriteLine ("End Block");
+                       ex_handlers [cur_block].Debug (cur_block);
+                       //System.Console.WriteLine ("End Block {0} (handlers: {1})", cur_block, ex_handlers [cur_block].NumHandlers ());
+                       open_blocks.Pop ();
+                       if (open_blocks.Count > 0)
+                               cur_block = (int)open_blocks.Peek ();
+                       //Console.WriteLine ("curblock restored to {0}", cur_block);
                        //throw new NotImplementedException ();
                }
-               public virtual void EndScope () {
+
+               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 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)
                                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];
                }
+
                public virtual void MarkSequencePoint (ISymbolDocumentWriter document, int startLine,
-                                                      int startColumn, int endLine, int endColumn) {
+                                                      int startColumn, int endLine, int endColumn)
+               {
                        if (sym_writer == null)
                                return;
 
-                       int[] offsets = { code_len };
-                       int[] startLines = { startLine };
-                       int[] startColumns = { startColumn };
-                       int[] endLines = { endLine };
-                       int[] endColumns = { endColumn };
-
-                       sym_writer.DefineSequencePoints (document, offsets, startLines, startColumns,
-                                                        endLines, endColumns);
+                       sym_writer.MarkSequencePoint (code_len, startLine, startColumn);
                }
-               public virtual void ThrowException (Type exceptionType) {
-                       throw new NotImplementedException ();
+
+               public virtual void ThrowException (Type exceptionType)
+               {
+                       if (exceptionType == null)
+                               throw new ArgumentNullException ("exceptionType");
+                       if (! ((exceptionType == typeof (Exception)) || 
+                                  exceptionType.IsSubclassOf (typeof (Exception))))
+                               throw new ArgumentException ("Type should be an exception type", "exceptionType");
+                       ConstructorInfo ctor = exceptionType.GetConstructor (new Type[0]);
+                       if (ctor == null)
+                               throw new ArgumentException ("Type should have a default constructor", "exceptionType");
+                       Emit (OpCodes.Newobj, ctor);
+                       Emit (OpCodes.Throw);
                }
-               public void UsingNamespace (String usingNamespace) {
+
+               [MonoTODO]
+               public void UsingNamespace (String usingNamespace)
+               {
                        throw new NotImplementedException ();
                }
 
-               internal void label_fixup () {
+               internal void label_fixup ()
+               {
                        int i;
                        for (i = 0; i < num_fixups; ++i) {
-                               int diff = label_to_addr [fixups [i].label_idx] - fixups [i].pos;
+                               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);
                                } else {