X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fnative%2Fjni.cpp;h=661780662a239c07a46fd157f4ccce0377900621;hb=03349a3953e0f217d686d88b99fa176509a27559;hp=d33892469c10a7621c96efdc14b6e8dd2a921708;hpb=ad591a0456199cfbc13b0b3e034cdd3fc567caa6;p=cacao.git

diff --git a/src/native/jni.cpp b/src/native/jni.cpp
index d33892469..661780662 100644
--- a/src/native/jni.cpp
+++ b/src/native/jni.cpp
@@ -1,6 +1,6 @@
 /* src/native/jni.cpp - implementation of the Java Native Interface functions
 
-   Copyright (C) 1996-2005, 2006, 2007, 2008
+   Copyright (C) 1996-2011
    CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
@@ -2069,6 +2069,8 @@ jobject _Jv_JNI_GetObjectField(JNIEnv *env, jobject obj, jfieldID fieldID)
 #define SET_FIELD(o,type,f,value) \
     *((type *) (((intptr_t) (o)) + ((intptr_t) ((fieldinfo *) (f))->offset))) = (type) (value)
 
+#define GET_FIELDINFO(f) ((fieldinfo*) (f))
+
 #define JNI_SET_FIELD(name, type, intern)                                  \
 void _Jv_JNI_Set##name##Field(JNIEnv *env, jobject obj, jfieldID fieldID,  \
 							  type value)                                  \
@@ -2079,7 +2081,10 @@ void _Jv_JNI_Set##name##Field(JNIEnv *env, jobject obj, jfieldID fieldID,  \
                                                                            \
 	SET_FIELD(LLNI_DIRECT((java_handle_t *) obj), intern, fieldID, value); \
 	                                                                       \
-	LLNI_CRITICAL_START;                                                   \
+	LLNI_CRITICAL_END;                                                     \
+																		   \
+	if (GET_FIELDINFO(fieldID)->flags & ACC_VOLATILE)                      \
+		Atomic::memory_barrier();                                          \
 }
 
 JNI_SET_FIELD(Boolean, jboolean, s4)
@@ -2102,6 +2107,9 @@ void _Jv_JNI_SetObjectField(JNIEnv *env, jobject obj, jfieldID fieldID,
 	SET_FIELD(obj, java_handle_t*, fieldID, LLNI_UNWRAP((java_handle_t*) value));
 
 	LLNI_CRITICAL_END;
+
+	if (GET_FIELDINFO(fieldID)->flags & ACC_VOLATILE)
+		Atomic::memory_barrier();
 }
 
 
@@ -2253,7 +2261,7 @@ jobject _Jv_JNI_CallStaticObjectMethodV(JNIEnv *env, jclass clazz,
 	methodinfo    *m;
 	java_handle_t *o;
 
-	TRACEJNICALLS(("_Jv_JNI_CallStaticObjectMethodV(env=%p, clazz=%p, methodID=%p, args=%p)", env, clazz, methodID, args));
+	TRACEJNICALLS(("_Jv_JNI_CallStaticObjectMethodV(env=%p, clazz=%p, methodID=%p)", env, clazz, methodID));
 
 	m = (methodinfo *) methodID;
 
@@ -2300,7 +2308,7 @@ void _Jv_JNI_CallStaticVoidMethodV(JNIEnv *env, jclass clazz,
 {
 	methodinfo *m;
 
-	TRACEJNICALLS(("_Jv_JNI_CallStaticVoidMethodV(env=%p, clazz=%p, methodID=%p, args=%p)", env, clazz, methodID, args));
+	TRACEJNICALLS(("_Jv_JNI_CallStaticVoidMethodV(env=%p, clazz=%p, methodID=%p)", env, clazz, methodID));
 
 	m = (methodinfo *) methodID;
 
@@ -2439,6 +2447,9 @@ void _Jv_JNI_SetStatic##name##Field(JNIEnv *env, jclass clazz, \
 			return;                                            \
                                                                \
 	f->value->field = value;                                   \
+															   \
+	if (f->flags & ACC_VOLATILE)                               \
+		Atomic::memory_barrier();                              \
 }
 
 JNI_SET_STATIC_FIELD(Boolean, jboolean, i)
@@ -2467,6 +2478,9 @@ void _Jv_JNI_SetStaticObjectField(JNIEnv *env, jclass clazz, jfieldID fieldID,
 			return;
 
 	f->value->a = LLNI_UNWRAP((java_handle_t *) value);
+
+	if (f->flags & ACC_VOLATILE)
+		Atomic::memory_barrier();
 }
 
 
@@ -2965,14 +2979,10 @@ jint jni_RegisterNatives(JNIEnv* env, jclass clazz, const JNINativeMethod* metho
 
 	classinfo* c = LLNI_classinfo_unwrap(clazz);
 
-	/* XXX: if implemented this needs a call to jvmti_NativeMethodBind
-	if (jvmti) jvmti_NativeMethodBind(method, address,  new_address_ptr);
-	*/
-
 	NativeMethods& nm = VM::get_current()->get_nativemethods();
 	nm.register_methods(c->name, methods, nMethods);
 
-    return 0;
+	return 0;
 }
 
 
@@ -3555,7 +3565,8 @@ void* jni_GetDirectBufferAddress(JNIEnv *env, jobject buf)
 
 jlong jni_GetDirectBufferCapacity(JNIEnv* env, jobject buf)
 {
-#if defined(ENABLE_JAVASE) && defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
+#if defined(ENABLE_JAVASE)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
 	TRACEJNICALLS(("jni_GetDirectBufferCapacity(env=%p, buf=%p)", env, buf));
 
 	java_handle_t* h = (java_handle_t *) buf;
@@ -3567,6 +3578,23 @@ jlong jni_GetDirectBufferCapacity(JNIEnv* env, jobject buf)
 	jlong capacity = b.get_cap();
 
 	return capacity;
+# elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
+
+	TRACEJNICALLS(("jni_GetDirectBufferCapacity(env=%p, buf=%p)", env, buf));
+
+	java_nio_Buffer jnb(buf);
+
+	if (!builtin_instanceof(jnb.get_handle(), class_sun_nio_ch_DirectBuffer))
+		return -1;
+
+	jlong capacity = jnb.get_capacity();
+
+	return capacity;
+
+# else
+#  error unknown classpath configuration
+# endif
+
 #else
 	vm_abort("jni_GetDirectBufferCapacity: not implemented in this configuration");