From 7819aac048999f16fa3b63814f0a715263751ab7 Mon Sep 17 00:00:00 2001 From: Michael Starzinger Date: Wed, 5 Sep 2007 23:33:48 +0200 Subject: [PATCH] * src/vm/jit/codegen-common.c (codegen_start_native_call) [__X86_64__]: Tracer for native methods is called from here now. (codegen_finish_native_call) [__X86_64__]: Likewise. * src/vm/jit/x86_64/codegen.c (codegen_emit_stub_native): Removed verbosecall tracer. --- src/vm/jit/codegen-common.c | 4 ++-- src/vm/jit/x86_64/codegen.c | 10 ---------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/vm/jit/codegen-common.c b/src/vm/jit/codegen-common.c index 5764cffbc..4981924c1 100644 --- a/src/vm/jit/codegen-common.c +++ b/src/vm/jit/codegen-common.c @@ -1584,7 +1584,7 @@ java_handle_t *codegen_start_native_call(u1 *currentsp, u1 *pv) #endif #if !defined(NDEBUG) -# if defined(__POWERPC__) +# if defined(__POWERPC__) || defined (__X86_64__) /* print the call-trace if necesarry */ if (opt_TraceJavaCalls) @@ -1677,7 +1677,7 @@ java_object_t *codegen_finish_native_call(u1 *currentsp, u1 *pv) #if !defined(NDEBUG) -# if defined(__POWERPC__) +# if defined(__POWERPC__) || defined (__X86_64__) /* print the call-trace if necesarry */ if (opt_TraceJavaCalls) diff --git a/src/vm/jit/x86_64/codegen.c b/src/vm/jit/x86_64/codegen.c index 77cadfcd7..dc2e2465f 100644 --- a/src/vm/jit/x86_64/codegen.c +++ b/src/vm/jit/x86_64/codegen.c @@ -3159,11 +3159,6 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f) M_ASUB_IMM(cd->stackframesize * 8, REG_SP); -#if !defined(NDEBUG) - if (JITDATA_HAS_FLAG_VERBOSECALL(jd)) - emit_verbosecall_enter(jd); -#endif - /* get function address (this must happen before the stackframeinfo) */ if (f == NULL) @@ -3307,11 +3302,6 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f) break; } -#if !defined(NDEBUG) - if (JITDATA_HAS_FLAG_VERBOSECALL(jd)) - emit_verbosecall_exit(jd); -#endif - /* remove native stackframe info */ M_MOV(REG_SP, REG_A0); -- 2.25.1