* src/vm/jit/x86_64/codegen.c (codegen) [ENABLE_PROFILING]: #ifdef

instrumentation code.
(createnativestub) [ENABLE_PROFILING]: Likewise.

* src/vm/jit/x86_64/codegen.h [ENABLE_PROFILING] (PROFILE_CYCLE_START)
(PROFILE_CYCLE_STOP): Added #ifdef.

diff --git a/src/vm/jit/x86_64/codegen.c b/src/vm/jit/x86_64/codegen.c
index 760814d5304131254dd3fbc5b65797aff131884b..d6915b2a071462d0edc444cb5058e04edcd649c1 100644 (file)
--- a/src/vm/jit/x86_64/codegen.c
+++ b/src/vm/jit/x86_64/codegen.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: codegen.c 7248 2007-01-29 19:28:12Z twisti $
+   $Id: codegen.c 7281 2007-02-03 19:51:36Z twisti $
 
 */
 
@@ -180,7 +180,8 @@ bool codegen(jitdata *jd)
                dseg_add_target(cd, ex->handler);
                (void) dseg_add_unique_address(cd, ex->catchtype.any);
        }
-       
+
+#if defined(ENABLE_PROFILING)
        /* generate method profiling code */
 
        if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) {
@@ -191,6 +192,7 @@ bool codegen(jitdata *jd)
 
                PROFILE_CYCLE_START;
        }
+#endif
 
        /* create stack frame (if necessary) */
 
@@ -349,6 +351,7 @@ bool codegen(jitdata *jd)
                len = bptr->indepth;
                MCODECHECK(512);
 
+#if defined(ENABLE_PROFILING)
                /* generate basicblock profiling code */
 
                if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) {
@@ -362,6 +365,7 @@ bool codegen(jitdata *jd)
                        if (bptr->type == BBTYPE_EXH)
                                PROFILE_CYCLE_START;
                }
+#endif
 
 #if defined(ENABLE_LSRA)
                if (opt_lsra) {
@@ -3279,6 +3283,7 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
        (void) dseg_addlinenumbertablesize(cd);
        (void) dseg_add_unique_s4(cd, 0);                      /* ExTableSize     */
 
+#if defined(ENABLE_PROFILING)
        /* generate native method profiling code */
 
        if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) {
@@ -3287,6 +3292,7 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
                M_MOV_IMM(code, REG_ITMP3);
                M_IINC_MEMBASE(REG_ITMP3, OFFSET(codeinfo, frequency));
        }
+#endif
 
        /* generate stub code */
 

diff --git a/src/vm/jit/x86_64/codegen.h b/src/vm/jit/x86_64/codegen.h
index e77b7db57c081149f0879ff9353f0898d6b8ec71..8b9e96a310382e7b19ea96bb5001aa2a727cf7eb 100644 (file)
--- a/src/vm/jit/x86_64/codegen.h
+++ b/src/vm/jit/x86_64/codegen.h
@@ -1,6 +1,6 @@
 /* src/vm/jit/x86_64/codegen.h - code generation macros for x86_64
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
    C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
    E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
    J. Wenninger, Institut f. Computersprachen - TU Wien
@@ -22,12 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Andreas Krall
-            Christian Thalinger
-
-   $Id: codegen.h 6132 2006-12-07 10:59:01Z twisti $
+   $Id: codegen.h 7281 2007-02-03 19:51:36Z twisti $
 
 */
 
@@ -346,6 +341,8 @@
 #define M_ISBB_MEMBASE(a,b,c)   emit_alul_reg_membase(cd, ALU_SBB, (a), (b), (c))
 
 
+#if defined(ENABLE_PROFILING)
+
 #define PROFILE_CYCLE_START \
     do { \
         if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) { \
@@ -378,6 +375,13 @@
         } \
     } while (0)
 
+#else
+
+#define PROFILE_CYCLE_START
+#define PROFILE_CYCLE_STOP
+
+#endif
+
 #endif /* _CODEGEN_H */