[dotgnu-pnet-commits] pnet ChangeLog engine/convert.c

[Klaus Treichel]

CVSROOT:        /cvsroot/dotgnu-pnet
Module name:    pnet
Changes by:     Klaus Treichel <ktreichel>      06/08/01 18:12:56

Modified files:
        .              : ChangeLog 
        engine         : convert.c 

Log message:
        2006-08-01  Klaus Treichel  <address@hidden>
        
                * engine/convert.c: Remove the no longer needed macros for the 
metadata
                lock and unlock. Disable finalizers during build of a function 
to prevent
                finalizers trying to build a finalizer function. Fix a compiler 
warning.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pnet/ChangeLog?cvsroot=dotgnu-pnet&r1=1.3346&r2=1.3347
http://cvs.savannah.gnu.org/viewcvs/pnet/engine/convert.c?cvsroot=dotgnu-pnet&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ChangeLog,v
retrieving revision 1.3346
retrieving revision 1.3347
diff -u -b -r1.3346 -r1.3347
--- ChangeLog   28 Jul 2006 17:41:54 -0000      1.3346
+++ ChangeLog   1 Aug 2006 18:12:55 -0000       1.3347
@@ -1,3 +1,9 @@
+2006-08-01  Klaus Treichel  <address@hidden>
+
+       * engine/convert.c: Remove the no longer needed macros for the metadata
+       lock and unlock. Disable finalizers during build of a function to 
prevent
+       finalizers trying to build a finalizer function. Fix a compiler warning.
+
 2006-07-28  Klaus Treichel  <address@hidden>
 
        * engine/jitc.c: Add constants for the System.MissingMethodException,

Index: engine/convert.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/convert.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- engine/convert.c    29 Dec 2005 15:56:52 -0000      1.25
+++ engine/convert.c    1 Aug 2006 18:12:56 -0000       1.26
@@ -38,23 +38,6 @@
 
 #ifdef IL_USE_JIT
 /*
- * Wee keep these macros for now until all references to _ILUnrollMethod
- * are removed when the jit coder is used.
- */
-#define        METADATA_WRLOCK(thread) \
-                       do { \
-                               
IL_METADATA_WRLOCK(_ILExecThreadProcess(thread)); \
-                               ILGCDisableFinalizers(0); \
-                       } while (0)
-#define        METADATA_UNLOCK(thread) \
-                       do { \
-                               ILGCEnableFinalizers(); \
-                               
IL_METADATA_UNLOCK(_ILExecThreadProcess(thread)); \
-                               ILGCInvokeFinalizers(0); \
-                       } while (0)
-
-
-/*
  * Inner version of "_ILConvertMethod", which detects the type of
  * exception to throw, but does not throw it.
  * This method is invoked only during on demand compilation of a jitted IL 
method
@@ -87,13 +70,17 @@
           method is written in IL or not */
        if(code.code)
        {
+               /* Disable the finalizers so that the coder will not be called 
resursively. */
+               ILGCDisableFinalizers(0);
                /* Use the bytecode verifier and coder to convert the method */
                if(!_ILVerify(coder, &start, method, &code,
                                          
ILImageIsSecure(ILProgramItem_Image(method)), thread))
                {
+                       ILGCEnableFinalizers();
                        *errorCode = IL_CONVERT_VERIFY_FAILED;
                        return 0;
                }
+               ILGCEnableFinalizers();
        }
        else
        {
@@ -105,7 +92,7 @@
 
        /* The method is converted now */
        *errorCode = IL_CONVERT_OK;
-       return 1;
+       return (unsigned char *)1;
 }
 #else
 #ifdef IL_CONFIG_PINVOKE