* src/vm/jit/powerpc/emit.c (emit_verbosecall_enter) [!NDEBUG]: We

also define the function with NDEBUG, but empty.
(emit_verbosecall_exit): Likewise.
* src/vm/jit/powerpc/codegen.c (codegen): Removed
JITDATA_HAS_FLAG_VERBOSECALL from emit_verbosecall calls.

diff --git a/src/vm/jit/powerpc/codegen.c b/src/vm/jit/powerpc/codegen.c
index 58de23ecabb58a577e5e12ee5daf8583655569d8..21cc922096072f0cdcabfc9ce1a911ab7ef63775 100644 (file)
--- a/src/vm/jit/powerpc/codegen.c
+++ b/src/vm/jit/powerpc/codegen.c
@@ -30,7 +30,7 @@
             Christian Ullrich
             Edwin Steiner
 
-   $Id: codegen.c 6166 2006-12-10 22:17:03Z twisti $
+   $Id: codegen.c 6250 2006-12-27 23:05:05Z twisti $
 
 */
 
@@ -390,8 +390,7 @@ bool codegen(jitdata *jd)
 
        /* call trace function */
 
-       if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
-               emit_verbosecall_enter(jd);
+       emit_verbosecall_enter(jd);
        }
 
        /* end of header generation */
@@ -2298,8 +2297,7 @@ nowperformreturn:
 
                        /* call trace function */
 
-                       if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
-                               emit_verbosecall_exit(jd);
+                       emit_verbosecall_exit(jd);
 
 #if defined(ENABLE_THREADS)
                        if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
@@ -3170,9 +3168,6 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
        M_AST_INTERN(REG_ZERO, REG_SP, LA_LR_OFFSET);
        M_STWU(REG_SP, REG_SP, -(cd->stackframesize * 4));
 
-       if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
-               emit_verbosecall_enter(jd);
-
        /* get function address (this must happen before the stackframeinfo) */
 
        funcdisp = dseg_add_functionptr(cd, f);
@@ -3182,6 +3177,10 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
                codegen_addpatchref(cd, PATCHER_resolve_native_function, m, funcdisp);
 #endif
 
+       /* emit trace code */
+
+       emit_verbosecall_enter(jd);
+
        /* save integer and float argument registers */
 
        j = 0;
@@ -3344,8 +3343,7 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
 
        /* print call trace */
 
-       if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
-               emit_verbosecall_exit(jd);
+       emit_verbosecall_exit(jd);
 
        /* save return value */
 

diff --git a/src/vm/jit/powerpc/emit.c b/src/vm/jit/powerpc/emit.c
index eb333c13738c090024862fdce3e04a11246fea9f..a4f75ceaa531f19a5584b9c50c030ee2c4dce2aa 100644 (file)
--- a/src/vm/jit/powerpc/emit.c
+++ b/src/vm/jit/powerpc/emit.c
@@ -589,9 +589,9 @@ void emit_replacement_stubs(jitdata *jd)
 
 *******************************************************************************/
 
-#if !defined(NDEBUG)
 void emit_verbosecall_enter(jitdata *jd)
 {
+#if !defined(NDEBUG)
        methodinfo   *m;
        codegendata  *cd;
        registerdata *rd;
@@ -600,6 +600,9 @@ void emit_verbosecall_enter(jitdata *jd)
        int stack_size;
        methoddesc *md;
 
+       if (!JITDATA_HAS_FLAG_VERBOSECALL(jd))
+               return;
+
        /* get required compiler data */
 
        m  = jd->m;
@@ -794,8 +797,8 @@ void emit_verbosecall_enter(jitdata *jd)
        /* mark trace code */
 
        M_NOP;
-}
 #endif /* !defined(NDEBUG) */
+}
 
 
 /* emit_verbosecall_exit *******************************************************
@@ -804,15 +807,18 @@ void emit_verbosecall_enter(jitdata *jd)
 
 *******************************************************************************/
 
-#if !defined(NDEBUG)
 void emit_verbosecall_exit(jitdata *jd)
 {
+#if !defined(NDEBUG)
        methodinfo   *m;
        codegendata  *cd;
        registerdata *rd;
        methoddesc   *md;
        s4            disp;
 
+       if (!JITDATA_HAS_FLAG_VERBOSECALL(jd))
+               return;
+
        /* get required compiler data */
 
        m  = jd->m;
@@ -881,8 +887,8 @@ void emit_verbosecall_exit(jitdata *jd)
        /* mark trace code */
 
        M_NOP;
-}
 #endif /* !defined(NDEBUG) */
+}
 
 
 /*