Permalink
Browse files

Merge branch 'master' into concurrency_classpath_extension

  • Loading branch information...
2 parents f4f4b8a + 56253e3 commit 6ebc89d03a43c29a995dcb33fe6fda082c04f5be Mike Jensen committed Jan 3, 2014
Showing with 8 additions and 0 deletions.
  1. +8 −0 src/classpath-avian.cpp
View
@@ -730,6 +730,14 @@ Avian_avian_Atomic_getOffset
}
extern "C" AVIAN_EXPORT int64_t JNICALL
+Avian_sun_misc_Unsafe_objectFieldOffset
+(Thread* t, object, uintptr_t* arguments)
+{
+ return fieldOffset
+ (t, jfieldVmField(t, reinterpret_cast<object>(arguments[1])));
+}
+
+extern "C" AVIAN_EXPORT int64_t JNICALL
Avian_avian_Atomic_compareAndSwapObject
(Thread* t, object, uintptr_t* arguments)
{

0 comments on commit 6ebc89d

Please sign in to comment.