commit 2502544dda14d654e09cb060729825f34abbb66a
author Ian Rogers <irogers@google.com> Mon Oct 29 23:10:54 2012 -0700
committer Ian Rogers <irogers@google.com> Mon Oct 29 23:10:54 2012 -0700
tree 59057a2e4ee8db45d1c75326b9f63f2785897f56
parent 2a85d8d034863df3c5ee156a140d0bd88b2b9224

Move Unsafe offset code to Java.

Change-Id: I29c3cafaa7adceded6b1e934df63c80b5e0efa87

src/native/sun_misc_Unsafe.cc

diff --git a/src/native/sun_misc_Unsafe.cc b/src/native/sun_misc_Unsafe.cc
index d946cc3..5dc32b0 100644
--- a/src/native/sun_misc_Unsafe.cc
+++ b/src/native/sun_misc_Unsafe.cc
@@ -20,27 +20,6 @@
 
 namespace art {
 
-static jlong Unsafe_objectFieldOffset0(JNIEnv* env, jclass, jobject javaField) {
-  // TODO: move to Java code
-  jfieldID fid = env->FromReflectedField(javaField);
-  ScopedObjectAccess soa(env);
-  Field* field = soa.DecodeField(fid);
-  return field->GetOffset().Int32Value();
-}
-
-static jint Unsafe_arrayBaseOffset0(JNIEnv* env, jclass, jclass javaArrayClass) {
-  // TODO: move to Java code
-  ScopedObjectAccess soa(env);
-  Class* array_class = soa.Decode<Class*>(javaArrayClass);
-  return Array::DataOffset(array_class->GetComponentSize()).Int32Value();
-}
-
-static jint Unsafe_arrayIndexScale0(JNIEnv* env, jclass, jclass javaClass) {
-  ScopedObjectAccess soa(env);
-  Class* c = soa.Decode<Class*>(javaClass);
-  return c->GetComponentSize();
-}
-
 static jboolean Unsafe_compareAndSwapInt(JNIEnv* env, jobject, jobject javaObj, jlong offset, jint expectedValue, jint newValue) {
   ScopedObjectAccess soa(env);
   Object* obj = soa.Decode<Object*>(javaObj);
@@ -176,9 +155,6 @@
 }
 
 static JNINativeMethod gMethods[] = {
-  NATIVE_METHOD(Unsafe, objectFieldOffset0, "(Ljava/lang/reflect/Field;)J"),
-  NATIVE_METHOD(Unsafe, arrayBaseOffset0, "(Ljava/lang/Class;)I"),
-  NATIVE_METHOD(Unsafe, arrayIndexScale0, "(Ljava/lang/Class;)I"),
   NATIVE_METHOD(Unsafe, compareAndSwapInt, "(Ljava/lang/Object;JII)Z"),
   NATIVE_METHOD(Unsafe, compareAndSwapLong, "(Ljava/lang/Object;JJJ)Z"),
   NATIVE_METHOD(Unsafe, compareAndSwapObject, "(Ljava/lang/Object;JLjava/lang/Object;Ljava/lang/Object;)Z"),