jdk-sandbox: comparison hotspot/src/share/vm/prims/unsafe.cpp

equal deleted inserted replaced

-:10a0fafc26aa
+:c02b05ba16a1
 /*
-* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 oop p = JNIHandles::resolve(obj); \
 *(type_name*)index_oop_from_field_offset_long(p, offset) = x
 #define GET_FIELD_VOLATILE(obj, offset, type_name, v) \
 oop p = JNIHandles::resolve(obj); \
-volatile type_name v = *(volatile type_name*)index_oop_from_field_offset_long(p, offset)
+volatile type_name v = OrderAccess::load_acquire((volatile type_name*)index_oop_from_field_offset_long(p, offset));
 #define SET_FIELD_VOLATILE(obj, offset, type_name, x) \
 oop p = JNIHandles::resolve(obj); \
-*(volatile type_name*)index_oop_from_field_offset_long(p, offset) = x; \
+OrderAccess::release_store_fence((volatile type_name*)index_oop_from_field_offset_long(p, offset), x);
-OrderAccess::fence();
 // Macros for oops that check UseCompressedOops
 #define GET_OOP_FIELD(obj, offset, v) \
 oop p = JNIHandles::resolve(obj);   \
 if (UseCompressedOops) {            \
 volatile narrowOop n = *(volatile narrowOop*)index_oop_from_field_offset_long(p, offset); \
 v = oopDesc::decode_heap_oop(n);                               \
 } else {                            \
 v = *(volatile oop*)index_oop_from_field_offset_long(p, offset);       \
-}
+} \
+OrderAccess::acquire();
 // Get/SetObject must be special-cased, since it works with handles.
 // The xxx140 variants for backward compatibility do not allow a full-width offset.
 UNSAFE_ENTRY(void, Unsafe_SetObjectVolatile(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jobject x_h))
 UnsafeWrapper("Unsafe_SetObjectVolatile");
 oop x = JNIHandles::resolve(x_h);
 oop p = JNIHandles::resolve(obj);
+void* addr = index_oop_from_field_offset_long(p, offset);
+OrderAccess::release();
 if (UseCompressedOops) {
-oop_store((narrowOop*)index_oop_from_field_offset_long(p, offset), x);
+oop_store((narrowOop*)addr, x);
 } else {
-oop_store((oop*)index_oop_from_field_offset_long(p, offset), x);
+oop_store((oop*)addr, x);
 }
 OrderAccess::fence();
 UNSAFE_END
+#if defined(SPARC) || defined(X86)
+// Sparc and X86 have atomic jlong (8 bytes) instructions
+#else
+// Keep old code for platforms which may not have atomic jlong (8 bytes) instructions
 // Volatile long versions must use locks if !VM_Version::supports_cx8().
 // support_cx8 is a surrogate for 'supports atomic long memory ops'.
 UNSAFE_ENTRY(jlong, Unsafe_GetLongVolatile(JNIEnv *env, jobject unsafe, jobject obj, jlong offset))
 *addr = x;
 }
 }
 UNSAFE_END
+#endif // not SPARC and not X86
 #define DEFINE_GETSETOOP(jboolean, Boolean) \
 \
 UNSAFE_ENTRY(jboolean, Unsafe_Get##Boolean##140(JNIEnv *env, jobject unsafe, jobject obj, jint offset)) \
 UnsafeWrapper("Unsafe_Get"#Boolean); \
 SET_FIELD(obj, offset, jboolean, x); \
 UNSAFE_END \
 \
 // END DEFINE_GETSETOOP.
+DEFINE_GETSETOOP(jboolean, Boolean)
+DEFINE_GETSETOOP(jbyte, Byte)
+DEFINE_GETSETOOP(jshort, Short);
+DEFINE_GETSETOOP(jchar, Char);
+DEFINE_GETSETOOP(jint, Int);
+DEFINE_GETSETOOP(jlong, Long);
+DEFINE_GETSETOOP(jfloat, Float);
+DEFINE_GETSETOOP(jdouble, Double);
+#undef DEFINE_GETSETOOP
 #define DEFINE_GETSETOOP_VOLATILE(jboolean, Boolean) \
 \
 UNSAFE_ENTRY(jboolean, Unsafe_Get##Boolean##Volatile(JNIEnv *env, jobject unsafe, jobject obj, jlong offset)) \
 UnsafeWrapper("Unsafe_Get"#Boolean); \
 SET_FIELD_VOLATILE(obj, offset, jboolean, x); \
 UNSAFE_END \
 \
 // END DEFINE_GETSETOOP_VOLATILE.
-DEFINE_GETSETOOP(jboolean, Boolean)
-DEFINE_GETSETOOP(jbyte, Byte)
-DEFINE_GETSETOOP(jshort, Short);
-DEFINE_GETSETOOP(jchar, Char);
-DEFINE_GETSETOOP(jint, Int);
-DEFINE_GETSETOOP(jlong, Long);
-DEFINE_GETSETOOP(jfloat, Float);
-DEFINE_GETSETOOP(jdouble, Double);
 DEFINE_GETSETOOP_VOLATILE(jboolean, Boolean)
 DEFINE_GETSETOOP_VOLATILE(jbyte, Byte)
 DEFINE_GETSETOOP_VOLATILE(jshort, Short);
 DEFINE_GETSETOOP_VOLATILE(jchar, Char);
 DEFINE_GETSETOOP_VOLATILE(jint, Int);
-// no long -- handled specially
 DEFINE_GETSETOOP_VOLATILE(jfloat, Float);
 DEFINE_GETSETOOP_VOLATILE(jdouble, Double);
-#undef DEFINE_GETSETOOP
+#if defined(SPARC) || defined(X86)
+// Sparc and X86 have atomic jlong (8 bytes) instructions
+DEFINE_GETSETOOP_VOLATILE(jlong, Long);
+#endif
+#undef DEFINE_GETSETOOP_VOLATILE
 // The non-intrinsified versions of setOrdered just use setVolatile
-UNSAFE_ENTRY(void, Unsafe_SetOrderedInt(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jint x)) \
+UNSAFE_ENTRY(void, Unsafe_SetOrderedInt(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jint x))
-UnsafeWrapper("Unsafe_SetOrderedInt"); \
+UnsafeWrapper("Unsafe_SetOrderedInt");
-SET_FIELD_VOLATILE(obj, offset, jint, x); \
+SET_FIELD_VOLATILE(obj, offset, jint, x);
 UNSAFE_END
 UNSAFE_ENTRY(void, Unsafe_SetOrderedObject(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jobject x_h))
 UnsafeWrapper("Unsafe_SetOrderedObject");
 oop x = JNIHandles::resolve(x_h);
 oop p = JNIHandles::resolve(obj);
+void* addr = index_oop_from_field_offset_long(p, offset);
+OrderAccess::release();
 if (UseCompressedOops) {
-oop_store((narrowOop*)index_oop_from_field_offset_long(p, offset), x);
+oop_store((narrowOop*)addr, x);
 } else {
-oop_store((oop*)index_oop_from_field_offset_long(p, offset), x);
+oop_store((oop*)addr, x);
 }
 OrderAccess::fence();
 UNSAFE_END
 UNSAFE_ENTRY(void, Unsafe_SetOrderedLong(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jlong x))
 UnsafeWrapper("Unsafe_SetOrderedLong");
+#if defined(SPARC) || defined(X86)
+// Sparc and X86 have atomic jlong (8 bytes) instructions
+SET_FIELD_VOLATILE(obj, offset, jlong, x);
+#else
+// Keep old code for platforms which may not have atomic long (8 bytes) instructions
 {
 if (VM_Version::supports_cx8()) {
 SET_FIELD_VOLATILE(obj, offset, jlong, x);
 }
 else {
 jlong* addr = (jlong*)(index_oop_from_field_offset_long(p(), offset));
 ObjectLocker ol(p, THREAD);
 *addr = x;
 }
 }
+#endif
 UNSAFE_END
 ////// Data in the C heap.
 // Note:  These do not throw NullPointerException for bad pointers.

changeset 7885	c02b05ba16a1
parent 7397	5b173b4ca846
child 8076	96d498ec7ae1