[dotgnu-pnet-commits] pnet ChangeLog configure.in engine/jitc_inline.c

[Klaus Treichel]

CVSROOT:        /cvsroot/dotgnu-pnet
Module name:    pnet
Changes by:     Klaus Treichel <ktreichel>      06/12/31 19:50:41

Modified files:
        .              : ChangeLog configure.in 
        engine         : jitc_inline.c 

Log message:
        2006-12-31  Klaus Treichel  <address@hidden>
        
                * configure.in: Add the --enable-typedalloc option to use typed 
allocation
                with libgc. Add the -fno-omit-frame-pointer option to the 
CFLAGS if the
                jit is used.
        
                * engine/jitc_inline.c: Add the check of the noinline flag in 
the method's
                implementationattributes in the inlinable check.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pnet/ChangeLog?cvsroot=dotgnu-pnet&r1=1.3398&r2=1.3399
http://cvs.savannah.gnu.org/viewcvs/pnet/configure.in?cvsroot=dotgnu-pnet&r1=1.217&r2=1.218
http://cvs.savannah.gnu.org/viewcvs/pnet/engine/jitc_inline.c?cvsroot=dotgnu-pnet&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ChangeLog,v
retrieving revision 1.3398
retrieving revision 1.3399
diff -u -b -r1.3398 -r1.3399
--- ChangeLog   21 Dec 2006 18:30:34 -0000      1.3398
+++ ChangeLog   31 Dec 2006 19:50:41 -0000      1.3399
@@ -1,3 +1,12 @@
+2006-12-31  Klaus Treichel  <address@hidden>
+
+       * configure.in: Add the --enable-typedalloc option to use typed 
allocation
+       with libgc. Add the -fno-omit-frame-pointer option to the CFLAGS if the
+       jit is used.
+
+       * engine/jitc_inline.c: Add the check of the noinline flag in the 
method's
+       implementationattributes in the inlinable check.
+
 2006-12-21  Klaus Treichel  <address@hidden>
 
        * engine/jitc_locals.c: Fix the build without the thread in the method

Index: configure.in
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/configure.in,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -b -r1.217 -r1.218
--- configure.in        11 Jul 2006 17:29:37 -0000      1.217
+++ configure.in        31 Dec 2006 19:50:41 -0000      1.218
@@ -63,6 +63,16 @@
   esac
 fi
 
+dnl Disable typed allocation with libgc.
+def_typedalloc=true
+AC_ARG_ENABLE(typedalloc,
+[  --enable-typedalloc     Enable typed allocation with libgc],
+[case "${enableval}" in
+  yes) typedalloc=true ;;
+  no) typedalloc=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-typedalloc) ;;
+esac], [typedalloc=$def_typedalloc])
+
 dnl Disable interrupt based checks by default
 def_interrupts=false
 AC_ARG_ENABLE(interrupts,
@@ -490,7 +500,11 @@
 
 dnl Check to see if we are using gcc or not.
 if test x$GCC = xyes ; then
+       if test x$withjit = xyes ; then
+               CFLAGS="$CFLAGS -fno-omit-frame-pointer -Wall"
+       else
        CFLAGS="$CFLAGS -Wall"
+       fi
 fi
 
 dnl Check for "tm_gmtoff" in "struct tm".
@@ -668,6 +682,9 @@
 if test x$withgc = xyes ; then
        GCLIBS='$(top_builddir)/libgc/.libs/libgc.a'
        AC_DEFINE(HAVE_LIBGC, 1, [Define if you are using libgc])
+       if test x$typedalloc = xtrue ; then
+               AC_DEFINE(IL_USE_TYPED_ALLOCATION, 1, [Define if you are using 
typed allocation with libgc])
+       fi
 else
        GCLIBS=""
 fi

Index: engine/jitc_inline.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/jitc_inline.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- engine/jitc_inline.c        11 Dec 2006 20:40:11 -0000      1.1
+++ engine/jitc_inline.c        31 Dec 2006 19:50:41 -0000      1.2
@@ -187,6 +187,13 @@
                        ILMethodCode code;
                        ILException *exceptions;
 
+                       /* Check if the method is marked not inlineable. */
+                       if(method->implementAttrs & 
IL_META_METHODIMPL_NO_INLINING)
+                       {
+                               jitMethodInfo->implementationType |= 
_IL_JIT_IMPL_NOINLINE;
+                               return 0;
+                       }
+
                        /* Check if the method is syncronized. */
                        if(ILMethod_IsSynchronized(method))
                        {