From: Stefan Ring <stefan@complang.tuwien.ac.at>
Date: Mon, 5 May 2008 13:02:09 +0000 (+0200)
Subject: Merged with tip.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=8c81647e1c96715f45498a3ada7f795b5c9dfe81;hp=1174e0ac56273516885bb5b8b8320737163e3dc2;p=cacao.git

Merged with tip.
---

diff --git a/src/vm/jit/i386/darwin/md-asm.h b/src/vm/jit/i386/darwin/md-asm.h
index 588811a39..d610cc3ce 100644
--- 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 493e1c5f7..461c09d18 100644
--- 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)