* src/vm/jit/code.h (codeinfo) [ENABLE_PROFILING]: Made frequency,

bbfrequency, and cycles conditional.

* src/vm/jit/jit.c (jit_compile) [ENABLE_PROFILING]: Likewise.
(jit_compile_intern) [ENABLE_PROFILING]: Likewise.

diff --git a/src/vm/jit/code.h b/src/vm/jit/code.h
index f6245a0b7c05ec56f35fff74c95c4cf68b0f7b95..710fae73007630d982ab9022993a7ecb67b455b9 100644 (file)
--- a/src/vm/jit/code.h
+++ b/src/vm/jit/code.h
@@ -89,11 +89,13 @@ struct codeinfo {
        u1            savedintcount;        /* number of callee saved int regs    */
        u1            savedfltcount;        /* number of callee saved flt regs    */
        u1           *savedmcode;           /* saved code under patches           */
-#endif /* defined(ENABLE_REPLACEMENT) */
+#endif
 
+#if defined(ENABLE_PROFILING)
        u4            frequency;            /* number of method invocations       */
        u4           *bbfrequency;                  
        s8            cycles;               /* number of cpu cycles               */
+#endif
 };
 
 

diff --git a/src/vm/jit/jit.c b/src/vm/jit/jit.c
index 60cfd86298f618320471ec37b4c7ef730451ed12..1bb3b9a2b2725064078b734bc41c03db1147aa9d 100644 (file)
--- a/src/vm/jit/jit.c
+++ b/src/vm/jit/jit.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: jit.c 7268 2007-02-01 12:02:56Z twisti $
+   $Id: jit.c 7274 2007-02-02 00:10:37Z twisti $
 
 */
 
@@ -1114,11 +1114,13 @@ u1 *jit_compile(methodinfo *m)
        if (r == NULL) {
                /* We had an exception! Finish stuff here if necessary. */
 
+#if defined(ENABLE_PROFILING)
                /* Release memory for basic block profiling information. */
 
                if (JITDATA_HAS_FLAG_INSTRUMENT(jd))
                        if (jd->code->bbfrequency != NULL)
                                MFREE(jd->code->bbfrequency, u4, jd->code->basicblockcount);
+#endif
        }
        else {
                DEBUG_JIT_COMPILEVERBOSE("Running: ");
@@ -1465,12 +1467,14 @@ static u1 *jit_compile_intern(jitdata *jd)
 #endif /* defined(ENABLE_JIT) */
        RT_TIMING_GET_TIME(time_alloc);
 
+#if defined(ENABLE_PROFLING)
        /* Allocate memory for basic block profiling information. This
           _must_ be done after loop optimization and register allocation,
           since they can change the basic block count. */
 
        if (JITDATA_HAS_FLAG_INSTRUMENT(jd))
                code->bbfrequency = MNEW(u4, jd->basicblockcount);
+#endif
 
        DEBUG_JIT_COMPILEVERBOSE("Generating code: ");