Merged with tip.

diff --git a/src/vm/jit/i386/darwin/md-asm.h b/src/vm/jit/i386/darwin/md-asm.h
index 588811a39a7844d92d52d7966dac589c755e9480..d610cc3ce1dc3a24803ccab9cf12b4332aa7eb40 100644 (file)
--- a/src/vm/jit/i386/darwin/md-asm.h
+++ b/src/vm/jit/i386/darwin/md-asm.h
@@ -117,6 +117,8 @@
 #define builtin_d2i                           _builtin_d2i
 #define builtin_d2l                           _builtin_d2l
 
+#define asm_get_cycle_count                   _asm_get_cycle_count
+
 #endif /* _MD_ASM_H */
 
 

diff --git a/src/vm/jit/stacktrace.c b/src/vm/jit/stacktrace.c
index 493e1c5f7290d49352266e7f8102f3fd46a2bfc4..461c09d18f68d38ff92196ac1ad0f2daf64febab 100644 (file)
--- a/src/vm/jit/stacktrace.c
+++ b/src/vm/jit/stacktrace.c
@@ -77,6 +77,7 @@
 /* global variables ***********************************************************/
 
 CYCLES_STATS_DECLARE(stacktrace_overhead        , 100, 1)
+CYCLES_STATS_DECLARE(stacktrace_fillInStackTrace, 40,  5000)
 CYCLES_STATS_DECLARE(stacktrace_get,              40,  5000)
 CYCLES_STATS_DECLARE(stacktrace_getClassContext , 40,  5000)
 CYCLES_STATS_DECLARE(stacktrace_getCurrentClass , 40,  5000)