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

[Aleksey Demakov]

CVSROOT:        /sources/dotgnu-pnet
Module name:    libjit
Changes by:     Aleksey Demakov <avd>   06/08/29 13:29:35

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

Log message:
        delete extra popping of setjmp context for interpreter

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libjit/ChangeLog?cvsroot=dotgnu-pnet&r1=1.261&r2=1.262
http://cvs.savannah.gnu.org/viewcvs/libjit/jit/jit-insn.c?cvsroot=dotgnu-pnet&r1=1.48&r2=1.49

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/dotgnu-pnet/libjit/ChangeLog,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -b -r1.261 -r1.262
--- ChangeLog   29 Aug 2006 11:57:12 -0000      1.261
+++ ChangeLog   29 Aug 2006 13:29:35 -0000      1.262
@@ -1,5 +1,9 @@
 2006-08-29  Aleksey Demakov  <address@hidden>
 
+       * jit/jit-insn.c (jit_insn_return, jit_insn_return_ptr): do not pop
+       the setjmp context for the interpreter backend because it takes care
+       of this by itself.
+
        * jit/jit-rules.h, jit/jit-rules-alpha.c, jit/jit-rules-arm.c,
        * jit/jit-rules-interp.c, jit/jit-rules-x86.c, jit/jit-reg-alloc.c:
        move part of the _jit_gen_exch_top() functionality into a separate

Index: jit/jit-insn.c
===================================================================
RCS file: /sources/dotgnu-pnet/libjit/jit/jit-insn.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- jit/jit-insn.c      12 Jul 2006 16:43:04 -0000      1.48
+++ jit/jit-insn.c      29 Aug 2006 13:29:35 -0000      1.49
@@ -6737,6 +6737,7 @@
                return 0;
        }
 
+#if !defined(JIT_BACKEND_INTERP)
        /* We need to pop the "setjmp" context */
        if(func->has_try)
        {
@@ -6751,6 +6752,7 @@
                         (void *)_jit_unwind_pop_setjmp, type, 0, 0, 
JIT_CALL_NOTHROW);
                jit_type_free(type);
        }
+#endif
 
        /* This function has an ordinary return path */
        func->builder->ordinary_return = 1;
@@ -6905,6 +6907,7 @@
                return 0;
        }
 
+#if !defined(JIT_BACKEND_INTERP)
        /* We need to pop the "setjmp" context */
        if(func->has_try)
        {
@@ -6919,6 +6922,7 @@
                         (void *)_jit_unwind_pop_setjmp, type, 0, 0, 
JIT_CALL_NOTHROW);
                jit_type_free(type);
        }
+#endif
 
        /* This function has an ordinary return path */
        func->builder->ordinary_return = 1;
@@ -8009,7 +8013,7 @@
 int jit_insn_mark_offset(jit_function_t func, jit_int offset)
 {
 #if 1
- /*|| !USE_NEW_REG_ALLOC*/
+/*!USE_NEW_REG_ALLOC*/
        if(!jit_insn_new_block(func))
        {
                return 0;