* src/vm/jit/stacktrace.c: Moved to .cpp.

[cacao.git] / src / native / jni.cpp

diff --git a/src/native/jni.cpp b/src/native/jni.cpp
index fa529f5263eaef9a9e5c79bba39f08934a9cdf91..5f4a25ef611f214a99844b60d37b4dd3988666aa 100644 (file)
--- a/src/native/jni.cpp
+++ b/src/native/jni.cpp
@@ -113,7 +113,7 @@ struct java_lang_ClassLoader;
 #include "vm/jit/argument.h"
 #include "vm/jit/asmpart.h"
 #include "vm/jit/jit.h"
-#include "vm/jit/stacktrace.h"
+#include "vm/jit/stacktrace.hpp"
 
 #include "vmcore/loader.h"
 #include "vmcore/options.h"
@@ -3674,7 +3674,7 @@ void *_Jv_JNI_GetDirectBufferAddress(JNIEnv *env, jobject buf)
 #  endif
        void                          *p;
 
-       TRACEJNICALLS(("_Jv_JNI_GetDirectBufferAddress(env=%p, buf=%p)", env, buf));
+       TRACEJNICALLSENTER(("_Jv_JNI_GetDirectBufferAddress(env=%p, buf=%p)", env, buf));
 
        /* Prevent compiler warning. */
 
@@ -3693,13 +3693,17 @@ void *_Jv_JNI_GetDirectBufferAddress(JNIEnv *env, jobject buf)
        paddress = (gnu_classpath_Pointer32 *) po;
 #  endif
 
-       if (paddress == NULL)
+       if (paddress == NULL) {
+               TRACEJNICALLSEXIT(("->%p", NULL));
                return NULL;
+       }
 
        LLNI_field_get_val(paddress, data, address);
 
        p = (void *) (intptr_t) address;
 
+       TRACEJNICALLSEXIT(("->%p", p));
+
        return p;
 
 # elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)