diff options
Diffstat (limited to 'runtime/native/sun_misc_Unsafe.cc')
| -rw-r--r-- | runtime/native/sun_misc_Unsafe.cc | 275 |
1 files changed, 139 insertions, 136 deletions
diff --git a/runtime/native/sun_misc_Unsafe.cc b/runtime/native/sun_misc_Unsafe.cc index 472340cee7..2fae3cc8e7 100644 --- a/runtime/native/sun_misc_Unsafe.cc +++ b/runtime/native/sun_misc_Unsafe.cc @@ -21,7 +21,7 @@ #include "mirror/array.h" #include "mirror/class-inl.h" #include "mirror/object-inl.h" -#include "scoped_fast_native_object_access.h" +#include "scoped_fast_native_object_access-inl.h" #include <unistd.h> #include <stdlib.h> @@ -33,61 +33,64 @@ namespace art { static jboolean Unsafe_compareAndSwapInt(JNIEnv* env, jobject, jobject javaObj, jlong offset, jint expectedValue, jint newValue) { ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); // JNI must use non transactional mode. bool success = obj->CasFieldStrongSequentiallyConsistent32<false>(MemberOffset(offset), - expectedValue, newValue); + expectedValue, + newValue); return success ? JNI_TRUE : JNI_FALSE; } static jboolean Unsafe_compareAndSwapLong(JNIEnv* env, jobject, jobject javaObj, jlong offset, jlong expectedValue, jlong newValue) { ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); // JNI must use non transactional mode. bool success = obj->CasFieldStrongSequentiallyConsistent64<false>(MemberOffset(offset), - expectedValue, newValue); + expectedValue, + newValue); return success ? JNI_TRUE : JNI_FALSE; } static jboolean Unsafe_compareAndSwapObject(JNIEnv* env, jobject, jobject javaObj, jlong offset, jobject javaExpectedValue, jobject javaNewValue) { ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); - mirror::Object* expectedValue = soa.Decode<mirror::Object*>(javaExpectedValue); - mirror::Object* newValue = soa.Decode<mirror::Object*>(javaNewValue); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); + ObjPtr<mirror::Object> expectedValue = soa.Decode<mirror::Object>(javaExpectedValue); + ObjPtr<mirror::Object> newValue = soa.Decode<mirror::Object>(javaNewValue); // JNI must use non transactional mode. if (kUseReadBarrier) { // Need to make sure the reference stored in the field is a to-space one before attempting the // CAS or the CAS could fail incorrectly. mirror::HeapReference<mirror::Object>* field_addr = reinterpret_cast<mirror::HeapReference<mirror::Object>*>( - reinterpret_cast<uint8_t*>(obj) + static_cast<size_t>(offset)); + reinterpret_cast<uint8_t*>(obj.Decode()) + static_cast<size_t>(offset)); ReadBarrier::Barrier<mirror::Object, kWithReadBarrier, /*kAlwaysUpdateField*/true>( - obj, + obj.Decode(), MemberOffset(offset), field_addr); } bool success = obj->CasFieldStrongSequentiallyConsistentObject<false>(MemberOffset(offset), - expectedValue, newValue); + expectedValue.Decode(), + newValue.Decode()); return success ? JNI_TRUE : JNI_FALSE; } static jint Unsafe_getInt(JNIEnv* env, jobject, jobject javaObj, jlong offset) { ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); return obj->GetField32(MemberOffset(offset)); } static jint Unsafe_getIntVolatile(JNIEnv* env, jobject, jobject javaObj, jlong offset) { ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); return obj->GetField32Volatile(MemberOffset(offset)); } static void Unsafe_putInt(JNIEnv* env, jobject, jobject javaObj, jlong offset, jint newValue) { ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); // JNI must use non transactional mode. obj->SetField32<false>(MemberOffset(offset), newValue); } @@ -95,7 +98,7 @@ static void Unsafe_putInt(JNIEnv* env, jobject, jobject javaObj, jlong offset, j static void Unsafe_putIntVolatile(JNIEnv* env, jobject, jobject javaObj, jlong offset, jint newValue) { ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); // JNI must use non transactional mode. obj->SetField32Volatile<false>(MemberOffset(offset), newValue); } @@ -103,7 +106,7 @@ static void Unsafe_putIntVolatile(JNIEnv* env, jobject, jobject javaObj, jlong o static void Unsafe_putOrderedInt(JNIEnv* env, jobject, jobject javaObj, jlong offset, jint newValue) { ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); QuasiAtomic::ThreadFenceRelease(); // JNI must use non transactional mode. obj->SetField32<false>(MemberOffset(offset), newValue); @@ -111,19 +114,19 @@ static void Unsafe_putOrderedInt(JNIEnv* env, jobject, jobject javaObj, jlong of static jlong Unsafe_getLong(JNIEnv* env, jobject, jobject javaObj, jlong offset) { ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); return obj->GetField64(MemberOffset(offset)); } static jlong Unsafe_getLongVolatile(JNIEnv* env, jobject, jobject javaObj, jlong offset) { ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); return obj->GetField64Volatile(MemberOffset(offset)); } static void Unsafe_putLong(JNIEnv* env, jobject, jobject javaObj, jlong offset, jlong newValue) { ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); // JNI must use non transactional mode. obj->SetField64<false>(MemberOffset(offset), newValue); } @@ -131,7 +134,7 @@ static void Unsafe_putLong(JNIEnv* env, jobject, jobject javaObj, jlong offset, static void Unsafe_putLongVolatile(JNIEnv* env, jobject, jobject javaObj, jlong offset, jlong newValue) { ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); // JNI must use non transactional mode. obj->SetField64Volatile<false>(MemberOffset(offset), newValue); } @@ -139,7 +142,7 @@ static void Unsafe_putLongVolatile(JNIEnv* env, jobject, jobject javaObj, jlong static void Unsafe_putOrderedLong(JNIEnv* env, jobject, jobject javaObj, jlong offset, jlong newValue) { ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); QuasiAtomic::ThreadFenceRelease(); // JNI must use non transactional mode. obj->SetField64<false>(MemberOffset(offset), newValue); @@ -147,56 +150,56 @@ static void Unsafe_putOrderedLong(JNIEnv* env, jobject, jobject javaObj, jlong o static jobject Unsafe_getObjectVolatile(JNIEnv* env, jobject, jobject javaObj, jlong offset) { ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); - mirror::Object* value = obj->GetFieldObjectVolatile<mirror::Object>(MemberOffset(offset)); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); + ObjPtr<mirror::Object> value = obj->GetFieldObjectVolatile<mirror::Object>(MemberOffset(offset)); return soa.AddLocalReference<jobject>(value); } static jobject Unsafe_getObject(JNIEnv* env, jobject, jobject javaObj, jlong offset) { ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); - mirror::Object* value = obj->GetFieldObject<mirror::Object>(MemberOffset(offset)); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); + ObjPtr<mirror::Object> value = obj->GetFieldObject<mirror::Object>(MemberOffset(offset)); return soa.AddLocalReference<jobject>(value); } static void Unsafe_putObject(JNIEnv* env, jobject, jobject javaObj, jlong offset, jobject javaNewValue) { ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); - mirror::Object* newValue = soa.Decode<mirror::Object*>(javaNewValue); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); + ObjPtr<mirror::Object> newValue = soa.Decode<mirror::Object>(javaNewValue); // JNI must use non transactional mode. - obj->SetFieldObject<false>(MemberOffset(offset), newValue); + obj->SetFieldObject<false>(MemberOffset(offset), newValue.Decode()); } static void Unsafe_putObjectVolatile(JNIEnv* env, jobject, jobject javaObj, jlong offset, jobject javaNewValue) { ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); - mirror::Object* newValue = soa.Decode<mirror::Object*>(javaNewValue); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); + ObjPtr<mirror::Object> newValue = soa.Decode<mirror::Object>(javaNewValue); // JNI must use non transactional mode. - obj->SetFieldObjectVolatile<false>(MemberOffset(offset), newValue); + obj->SetFieldObjectVolatile<false>(MemberOffset(offset), newValue.Decode()); } static void Unsafe_putOrderedObject(JNIEnv* env, jobject, jobject javaObj, jlong offset, jobject javaNewValue) { ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); - mirror::Object* newValue = soa.Decode<mirror::Object*>(javaNewValue); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); + ObjPtr<mirror::Object> newValue = soa.Decode<mirror::Object>(javaNewValue); QuasiAtomic::ThreadFenceRelease(); // JNI must use non transactional mode. - obj->SetFieldObject<false>(MemberOffset(offset), newValue); + obj->SetFieldObject<false>(MemberOffset(offset), newValue.Decode()); } static jint Unsafe_getArrayBaseOffsetForComponentType(JNIEnv* env, jclass, jobject component_class) { ScopedFastNativeObjectAccess soa(env); - mirror::Class* component = soa.Decode<mirror::Class*>(component_class); + ObjPtr<mirror::Class> component = soa.Decode<mirror::Class>(component_class); Primitive::Type primitive_type = component->GetPrimitiveType(); return mirror::Array::DataOffset(Primitive::ComponentSize(primitive_type)).Int32Value(); } static jint Unsafe_getArrayIndexScaleForComponentType(JNIEnv* env, jclass, jobject component_class) { ScopedFastNativeObjectAccess soa(env); - mirror::Class* component = soa.Decode<mirror::Class*>(component_class); + ObjPtr<mirror::Class> component = soa.Decode<mirror::Class>(component_class); Primitive::Type primitive_type = component->GetPrimitiveType(); return Primitive::ComponentSize(primitive_type); } @@ -289,16 +292,16 @@ static void Unsafe_putDoubleJD(JNIEnv* env ATTRIBUTE_UNUSED, jobject, jlong addr static void Unsafe_copyMemory(JNIEnv *env, jobject unsafe ATTRIBUTE_UNUSED, jlong src, jlong dst, jlong size) { - if (size == 0) { - return; - } - // size is nonnegative and fits into size_t - if (size < 0 || size != (jlong)(size_t) size) { - ScopedFastNativeObjectAccess soa(env); - ThrowIllegalAccessException("wrong number of bytes"); - } - size_t sz = (size_t)size; - memcpy(reinterpret_cast<void *>(dst), reinterpret_cast<void *>(src), sz); + if (size == 0) { + return; + } + // size is nonnegative and fits into size_t + if (size < 0 || size != (jlong)(size_t) size) { + ScopedFastNativeObjectAccess soa(env); + ThrowIllegalAccessException("wrong number of bytes"); + } + size_t sz = (size_t)size; + memcpy(reinterpret_cast<void *>(dst), reinterpret_cast<void *>(src), sz); } template<typename T> @@ -306,12 +309,12 @@ static void copyToArray(jlong srcAddr, mirror::PrimitiveArray<T>* array, size_t array_offset, size_t size) REQUIRES_SHARED(Locks::mutator_lock_) { - const T* src = reinterpret_cast<T*>(srcAddr); - size_t sz = size / sizeof(T); - size_t of = array_offset / sizeof(T); - for (size_t i = 0; i < sz; ++i) { - array->Set(i + of, *(src + i)); - } + const T* src = reinterpret_cast<T*>(srcAddr); + size_t sz = size / sizeof(T); + size_t of = array_offset / sizeof(T); + for (size_t i = 0; i < sz; ++i) { + array->Set(i + of, *(src + i)); + } } template<typename T> @@ -319,12 +322,12 @@ static void copyFromArray(jlong dstAddr, mirror::PrimitiveArray<T>* array, size_t array_offset, size_t size) REQUIRES_SHARED(Locks::mutator_lock_) { - T* dst = reinterpret_cast<T*>(dstAddr); - size_t sz = size / sizeof(T); - size_t of = array_offset / sizeof(T); - for (size_t i = 0; i < sz; ++i) { - *(dst + i) = array->Get(i + of); - } + T* dst = reinterpret_cast<T*>(dstAddr); + size_t sz = size / sizeof(T); + size_t of = array_offset / sizeof(T); + for (size_t i = 0; i < sz; ++i) { + *(dst + i) = array->Get(i + of); + } } static void Unsafe_copyMemoryToPrimitiveArray(JNIEnv *env, @@ -333,29 +336,29 @@ static void Unsafe_copyMemoryToPrimitiveArray(JNIEnv *env, jobject dstObj, jlong dstOffset, jlong size) { - ScopedObjectAccess soa(env); - if (size == 0) { - return; - } - // size is nonnegative and fits into size_t - if (size < 0 || size != (jlong)(size_t) size) { - ThrowIllegalAccessException("wrong number of bytes"); - } - size_t sz = (size_t)size; - size_t dst_offset = (size_t)dstOffset; - mirror::Object* dst = soa.Decode<mirror::Object*>(dstObj); - mirror::Class* component_type = dst->GetClass()->GetComponentType(); - if (component_type->IsPrimitiveByte() || component_type->IsPrimitiveBoolean()) { - copyToArray(srcAddr, dst->AsByteSizedArray(), dst_offset, sz); - } else if (component_type->IsPrimitiveShort() || component_type->IsPrimitiveChar()) { - copyToArray(srcAddr, dst->AsShortSizedArray(), dst_offset, sz); - } else if (component_type->IsPrimitiveInt() || component_type->IsPrimitiveFloat()) { - copyToArray(srcAddr, dst->AsIntArray(), dst_offset, sz); - } else if (component_type->IsPrimitiveLong() || component_type->IsPrimitiveDouble()) { - copyToArray(srcAddr, dst->AsLongArray(), dst_offset, sz); - } else { - ThrowIllegalAccessException("not a primitive array"); - } + ScopedObjectAccess soa(env); + if (size == 0) { + return; + } + // size is nonnegative and fits into size_t + if (size < 0 || size != (jlong)(size_t) size) { + ThrowIllegalAccessException("wrong number of bytes"); + } + size_t sz = (size_t)size; + size_t dst_offset = (size_t)dstOffset; + ObjPtr<mirror::Object> dst = soa.Decode<mirror::Object>(dstObj); + mirror::Class* component_type = dst->GetClass()->GetComponentType(); + if (component_type->IsPrimitiveByte() || component_type->IsPrimitiveBoolean()) { + copyToArray(srcAddr, dst->AsByteSizedArray(), dst_offset, sz); + } else if (component_type->IsPrimitiveShort() || component_type->IsPrimitiveChar()) { + copyToArray(srcAddr, dst->AsShortSizedArray(), dst_offset, sz); + } else if (component_type->IsPrimitiveInt() || component_type->IsPrimitiveFloat()) { + copyToArray(srcAddr, dst->AsIntArray(), dst_offset, sz); + } else if (component_type->IsPrimitiveLong() || component_type->IsPrimitiveDouble()) { + copyToArray(srcAddr, dst->AsLongArray(), dst_offset, sz); + } else { + ThrowIllegalAccessException("not a primitive array"); + } } static void Unsafe_copyMemoryFromPrimitiveArray(JNIEnv *env, @@ -364,85 +367,85 @@ static void Unsafe_copyMemoryFromPrimitiveArray(JNIEnv *env, jlong srcOffset, jlong dstAddr, jlong size) { - ScopedObjectAccess soa(env); - if (size == 0) { - return; - } - // size is nonnegative and fits into size_t - if (size < 0 || size != (jlong)(size_t) size) { - ThrowIllegalAccessException("wrong number of bytes"); - } - size_t sz = (size_t)size; - size_t src_offset = (size_t)srcOffset; - mirror::Object* src = soa.Decode<mirror::Object*>(srcObj); - mirror::Class* component_type = src->GetClass()->GetComponentType(); - if (component_type->IsPrimitiveByte() || component_type->IsPrimitiveBoolean()) { - copyFromArray(dstAddr, src->AsByteSizedArray(), src_offset, sz); - } else if (component_type->IsPrimitiveShort() || component_type->IsPrimitiveChar()) { - copyFromArray(dstAddr, src->AsShortSizedArray(), src_offset, sz); - } else if (component_type->IsPrimitiveInt() || component_type->IsPrimitiveFloat()) { - copyFromArray(dstAddr, src->AsIntArray(), src_offset, sz); - } else if (component_type->IsPrimitiveLong() || component_type->IsPrimitiveDouble()) { - copyFromArray(dstAddr, src->AsLongArray(), src_offset, sz); - } else { - ThrowIllegalAccessException("not a primitive array"); - } + ScopedObjectAccess soa(env); + if (size == 0) { + return; + } + // size is nonnegative and fits into size_t + if (size < 0 || size != (jlong)(size_t) size) { + ThrowIllegalAccessException("wrong number of bytes"); + } + size_t sz = (size_t)size; + size_t src_offset = (size_t)srcOffset; + ObjPtr<mirror::Object> src = soa.Decode<mirror::Object>(srcObj); + mirror::Class* component_type = src->GetClass()->GetComponentType(); + if (component_type->IsPrimitiveByte() || component_type->IsPrimitiveBoolean()) { + copyFromArray(dstAddr, src->AsByteSizedArray(), src_offset, sz); + } else if (component_type->IsPrimitiveShort() || component_type->IsPrimitiveChar()) { + copyFromArray(dstAddr, src->AsShortSizedArray(), src_offset, sz); + } else if (component_type->IsPrimitiveInt() || component_type->IsPrimitiveFloat()) { + copyFromArray(dstAddr, src->AsIntArray(), src_offset, sz); + } else if (component_type->IsPrimitiveLong() || component_type->IsPrimitiveDouble()) { + copyFromArray(dstAddr, src->AsLongArray(), src_offset, sz); + } else { + ThrowIllegalAccessException("not a primitive array"); + } } static jboolean Unsafe_getBoolean(JNIEnv* env, jobject, jobject javaObj, jlong offset) { - ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); - return obj->GetFieldBoolean(MemberOffset(offset)); + ScopedFastNativeObjectAccess soa(env); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); + return obj->GetFieldBoolean(MemberOffset(offset)); } static void Unsafe_putBoolean(JNIEnv* env, jobject, jobject javaObj, jlong offset, jboolean newValue) { - ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); - // JNI must use non transactional mode (SetField8 is non-transactional). - obj->SetFieldBoolean<false>(MemberOffset(offset), newValue); + ScopedFastNativeObjectAccess soa(env); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); + // JNI must use non transactional mode (SetField8 is non-transactional). + obj->SetFieldBoolean<false>(MemberOffset(offset), newValue); } static jbyte Unsafe_getByte(JNIEnv* env, jobject, jobject javaObj, jlong offset) { - ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); - return obj->GetFieldByte(MemberOffset(offset)); + ScopedFastNativeObjectAccess soa(env); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); + return obj->GetFieldByte(MemberOffset(offset)); } static void Unsafe_putByte(JNIEnv* env, jobject, jobject javaObj, jlong offset, jbyte newValue) { - ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); - // JNI must use non transactional mode. - obj->SetFieldByte<false>(MemberOffset(offset), newValue); + ScopedFastNativeObjectAccess soa(env); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); + // JNI must use non transactional mode. + obj->SetFieldByte<false>(MemberOffset(offset), newValue); } static jchar Unsafe_getChar(JNIEnv* env, jobject, jobject javaObj, jlong offset) { - ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); - return obj->GetFieldChar(MemberOffset(offset)); + ScopedFastNativeObjectAccess soa(env); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); + return obj->GetFieldChar(MemberOffset(offset)); } static void Unsafe_putChar(JNIEnv* env, jobject, jobject javaObj, jlong offset, jchar newValue) { - ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); - // JNI must use non transactional mode. - obj->SetFieldChar<false>(MemberOffset(offset), newValue); + ScopedFastNativeObjectAccess soa(env); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); + // JNI must use non transactional mode. + obj->SetFieldChar<false>(MemberOffset(offset), newValue); } static jshort Unsafe_getShort(JNIEnv* env, jobject, jobject javaObj, jlong offset) { - ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); - return obj->GetFieldShort(MemberOffset(offset)); + ScopedFastNativeObjectAccess soa(env); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); + return obj->GetFieldShort(MemberOffset(offset)); } static void Unsafe_putShort(JNIEnv* env, jobject, jobject javaObj, jlong offset, jshort newValue) { - ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); - // JNI must use non transactional mode. - obj->SetFieldShort<false>(MemberOffset(offset), newValue); + ScopedFastNativeObjectAccess soa(env); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); + // JNI must use non transactional mode. + obj->SetFieldShort<false>(MemberOffset(offset), newValue); } static jfloat Unsafe_getFloat(JNIEnv* env, jobject, jobject javaObj, jlong offset) { ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); union {int32_t val; jfloat converted;} conv; conv.val = obj->GetField32(MemberOffset(offset)); return conv.converted; @@ -450,7 +453,7 @@ static jfloat Unsafe_getFloat(JNIEnv* env, jobject, jobject javaObj, jlong offse static void Unsafe_putFloat(JNIEnv* env, jobject, jobject javaObj, jlong offset, jfloat newValue) { ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); union {int32_t converted; jfloat val;} conv; conv.val = newValue; // JNI must use non transactional mode. @@ -459,7 +462,7 @@ static void Unsafe_putFloat(JNIEnv* env, jobject, jobject javaObj, jlong offset, static jdouble Unsafe_getDouble(JNIEnv* env, jobject, jobject javaObj, jlong offset) { ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); union {int64_t val; jdouble converted;} conv; conv.val = obj->GetField64(MemberOffset(offset)); return conv.converted; @@ -467,7 +470,7 @@ static jdouble Unsafe_getDouble(JNIEnv* env, jobject, jobject javaObj, jlong off static void Unsafe_putDouble(JNIEnv* env, jobject, jobject javaObj, jlong offset, jdouble newValue) { ScopedFastNativeObjectAccess soa(env); - mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj); + ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(javaObj); union {int64_t converted; jdouble val;} conv; conv.val = newValue; // JNI must use non transactional mode. |