[dotgnu-pnet-commits] pnet ./ChangeLog engine/jitc.c engine/jitc_allo...

[Klaus Treichel]

CVSROOT:        /sources/dotgnu-pnet
Module name:    pnet
Branch:         
Changes by:     Klaus Treichel <address@hidden> 06/05/27 12:10:51

Modified files:
        .              : ChangeLog 
        engine         : jitc.c jitc_alloc.c jitc_except.c 

Log message:
        2006-05-27  Klaus Treichel  <address@hidden>
        
        * engine/jitc.c: Mobe the inclusion of jitc_alloc.c just before
        the one of jitc_delegate.c because we'll need the allocation routines
        there.
        
        * engine/jitc_alloc.c: As a temporary workaround i'm ding a ILGCAlloc
        instead of an ILGCAllocAtomic now.
        
        * engine/jitc_except.c: Fix a valgrind warning.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnet/ChangeLog.diff?tr1=1.3317&tr2=1.3318&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnet/engine/jitc.c.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnet/engine/jitc_alloc.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnet/engine/jitc_except.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: pnet/ChangeLog
diff -u pnet/ChangeLog:1.3317 pnet/ChangeLog:1.3318
--- pnet/ChangeLog:1.3317       Thu May 25 09:28:59 2006
+++ pnet/ChangeLog      Sat May 27 12:10:50 2006
@@ -1,3 +1,14 @@
+2006-05-27  Klaus Treichel  <address@hidden>
+
+       * engine/jitc.c: Mobe the inclusion of jitc_alloc.c just before
+       the one of jitc_delegate.c because we'll need the allocation routines
+       there.
+
+       * engine/jitc_alloc.c: As a temporary workaround i'm ding a ILGCAlloc
+       instead of an ILGCAllocAtomic now.
+
+       * engine/jitc_except.c: Fix a valgrind warning.
+
 2006-05-25  Klaus Treichel  <address@hidden>
 
        * engine/jitc.c: Add signatures for inlined internalcalls. Add output of
Index: pnet/engine/jitc.c
diff -u pnet/engine/jitc.c:1.33 pnet/engine/jitc.c:1.34
--- pnet/engine/jitc.c:1.33     Thu May 25 09:29:00 2006
+++ pnet/engine/jitc.c  Sat May 27 12:10:50 2006
@@ -2647,6 +2647,7 @@
        return 1;
 }
 
+#include "jitc_alloc.c"
 #include "jitc_delegate.c"
 
 /*
@@ -3422,7 +3423,6 @@
        return 0;
 }
 
-#include "jitc_alloc.c"
 #include "jitc_diag.c"
 #include "jitc_locals.c"
 #include "jitc_labels.c"
Index: pnet/engine/jitc_alloc.c
diff -u pnet/engine/jitc_alloc.c:1.2 pnet/engine/jitc_alloc.c:1.3
--- pnet/engine/jitc_alloc.c:1.2        Mon May  1 17:30:50 2006
+++ pnet/engine/jitc_alloc.c    Sat May 27 12:10:51 2006
@@ -63,7 +63,11 @@
        ILObject *obj;
 
        /* Allocate memory from the heap */
-       ptr = ILGCAllocAtomic(size + IL_OBJECT_HEADER_SIZE);
+       /* TODO: There seem to be classes in the runtime where managed pointers 
*/
+       /* are not correctly recognized (are IntPtrs in the class definition). 
*/
+       /* This is why i'm using ILGCAlloc here. */
+       /* ptr = ILGCAllocAtomic(size + IL_OBJECT_HEADER_SIZE); */
+       ptr = ILGCAlloc(size + IL_OBJECT_HEADER_SIZE);
 
        if(!ptr)
        {
Index: pnet/engine/jitc_except.c
diff -u pnet/engine/jitc_except.c:1.6 pnet/engine/jitc_except.c:1.7
--- pnet/engine/jitc_except.c:1.6       Mon May  1 17:30:50 2006
+++ pnet/engine/jitc_except.c   Sat May 27 12:10:51 2006
@@ -181,7 +181,6 @@
 static void JITCoder_Throw(ILCoder *coder, int inCurrentMethod)
 {
        ILJITCoder *jitCoder = _ILCoderToILJITCoder(coder);
-       ILJitValue exception = jitCoder->jitStack[jitCoder->stackTop - 1];;
 
 #if !defined(IL_CONFIG_REDUCE_CODE) && !defined(IL_WITHOUT_TOOLS)
        if (jitCoder->flags & IL_CODER_FLAG_STATS)
@@ -196,6 +195,8 @@
 
        if(!(jitCoder->isInCatcher))
        {
+               ILJitValue exception = jitCoder->jitStack[jitCoder->stackTop - 
1];
+
                jit_insn_call_native(jitCoder->jitFunction,
                                                         
"ILRuntimeExceptionThrow",
                                                         
ILRuntimeExceptionThrow,