[dotgnu-pnet-commits] libjit ChangeLog jit/jit-function.c

[Klaus Treichel]

CVSROOT:        /cvsroot/dotgnu-pnet
Module name:    libjit
Changes by:     Klaus Treichel <ktreichel>      07/02/10 19:12:29

Modified files:
        .              : ChangeLog 
        jit            : jit-function.c 

Log message:
        2007-02-10  Klaus Treichel  <address@hidden>
        
                * jit/jit-function.c: Use the on-demand compilation driver in
                jit_function_apply too. Return the functions' entry point if the
                function is allready compiled in jit_function_compile_entry.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libjit/ChangeLog?cvsroot=dotgnu-pnet&r1=1.300&r2=1.301
http://cvs.savannah.gnu.org/viewcvs/libjit/jit/jit-function.c?cvsroot=dotgnu-pnet&r1=1.27&r2=1.28

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/libjit/ChangeLog,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -b -r1.300 -r1.301
--- ChangeLog   4 Feb 2007 14:31:32 -0000       1.300
+++ ChangeLog   10 Feb 2007 19:12:28 -0000      1.301
@@ -1,3 +1,9 @@
+2007-02-10  Klaus Treichel  <address@hidden>
+
+       * jit/jit-function.c: Use the on-demand compilation driver in
+       jit_function_apply too. Return the functions' entry point if the
+       function is allready compiled in jit_function_compile_entry.
+
 2007-02-04  Aleksey Demakov  <address@hidden>
 
        * include/jit/jit-common.h, include/jit/jit-context.h,

Index: jit/jit-function.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/libjit/jit/jit-function.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- jit/jit-function.c  4 Feb 2007 14:31:33 -0000       1.27
+++ jit/jit-function.c  10 Feb 2007 19:12:29 -0000      1.28
@@ -910,6 +910,7 @@
        if(func->is_compiled && !(func->builder))
        {
                /* The function is already compiled, and we don't need to 
recompile */
+               *entry_point = func->entry_point;
                return 1;
        }
        if(!(func->builder))
@@ -1423,6 +1424,9 @@
        (jit_function_t func, jit_type_t signature, void **args, void 
*return_area)
 {
        struct jit_backtrace call_trace;
+#if defined(jit_redirector_size)
+       jit_on_demand_driver_func on_demand_driver;
+#endif
        void *entry;
        jit_jmp_buf jbuf;
 
@@ -1457,7 +1461,16 @@
        }
        else
        {
+#if defined(jit_redirector_size)
+               on_demand_driver = func->context->on_demand_driver;
+               if(!on_demand_driver)
+               {
+                       on_demand_driver = _jit_function_compile_on_demand;
+               }
+               entry = (*on_demand_driver)(func);
+#else
                entry = _jit_function_compile_on_demand(func);
+#endif
        }
 
        /* Get the default signature if necessary */