2005-01-31 Zoltan Varga <vargaz@freemail.hu>

[mono.git] / mcs / class / corlib / System.Reflection.Emit / ILGenerator.cs

diff --git a/mcs/class/corlib/System.Reflection.Emit/ILGenerator.cs b/mcs/class/corlib/System.Reflection.Emit/ILGenerator.cs
index 051fc1906785e958771a2d3e99abcc45f05f687a..b99186888fde6e57f31ef2f1b953d679ecf54171 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/ILGenerator.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/ILGenerator.cs
@@ -35,7 +35,6 @@ using System;
 using System.Collections;
 using System.Diagnostics.SymbolStore;
 using System.Runtime.InteropServices;
-using Mono.CSharp.Debugger;
 
 namespace System.Reflection.Emit {
 
@@ -94,6 +93,17 @@ namespace System.Reflection.Emit {
                        handlers [i].extype = null;
                }
 
+               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)
@@ -186,7 +196,6 @@ namespace System.Reflection.Emit {
                private LabelFixup[] fixups;
                private int num_fixups;
                internal Module module;
-               internal IMonoSymbolWriter sym_writer;
                private Stack scopes;
                private int cur_block;
                private Stack open_blocks;
@@ -206,8 +215,6 @@ namespace System.Reflection.Emit {
                        token_fixups = new ILTokenInfo [8];
                        num_token_fixups = 0;
                        module = m;
-                       if (module is ModuleBuilder)
-                               sym_writer = ((ModuleBuilder)module).symbol_writer;
                        open_blocks = new Stack ();
                        this.token_gen = token_gen;
                }
@@ -370,7 +377,7 @@ namespace System.Reflection.Emit {
                        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()
@@ -383,17 +390,24 @@ namespace System.Reflection.Emit {
                }
                
                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)
+               {
+                       return DeclareLocal (localType, false);
+               }
+
+
+#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);
@@ -808,14 +822,7 @@ namespace System.Reflection.Emit {
                }
 
                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)
                {
@@ -830,12 +837,7 @@ namespace System.Reflection.Emit {
 
                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 ThrowException (Type exceptionType)
                {
@@ -873,5 +875,10 @@ namespace System.Reflection.Emit {
                                }
                        }
                }
+
+               internal static int Mono_GetCurrentOffset (ILGenerator ig)
+               {
+                       return ig.code_len;
+               }
        }
 }