diff options
| author | Elliott Hughes <enh@google.com> | 2013-03-29 17:14:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-03-29 17:14:50 +0000 |
| commit | 9813216f8845e1c4a6dc4d2a10aa227e7d43f858 (patch) | |
| tree | a5b1b4c48d3739173cb6be1f1ccfe13a6b83ab85 | |
| parent | ef64fc32d412d64e180cb90ee29ff46af7391580 (diff) | |
| parent | bf3483153e2de90a8cf058fe5ba87cdb66a94e3c (diff) | |
| download | dalvik-9813216f8845e1c4a6dc4d2a10aa227e7d43f858.tar.gz | |
Merge "Track 64-bit nio changes."
| -rw-r--r-- | vm/InitRefs.cpp | 2 | ||||
| -rw-r--r-- | vm/Jni.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vm/InitRefs.cpp b/vm/InitRefs.cpp index 19487dc39..d8f06972a 100644 --- a/vm/InitRefs.cpp +++ b/vm/InitRefs.cpp @@ -251,7 +251,7 @@ static bool initFieldOffsets() { static struct FieldInfo infoBuffer[] = { { &gDvm.offJavaNioBuffer_capacity, "capacity", "I" }, - { &gDvm.offJavaNioBuffer_effectiveDirectAddress, "effectiveDirectAddress", "I" }, + { &gDvm.offJavaNioBuffer_effectiveDirectAddress, "effectiveDirectAddress", "J" }, { NULL, NULL, NULL } }; diff --git a/vm/Jni.cpp b/vm/Jni.cpp index 8808a3f4a..f2358359d 100644 --- a/vm/Jni.cpp +++ b/vm/Jni.cpp @@ -2757,7 +2757,7 @@ static void* GetDirectBufferAddress(JNIEnv* env, jobject jbuf) { // All Buffer objects have an effectiveDirectAddress field. Object* bufObj = dvmDecodeIndirectRef(ts.self(), jbuf); - return (void*) dvmGetFieldInt(bufObj, gDvm.offJavaNioBuffer_effectiveDirectAddress); + return (void*) dvmGetFieldLong(bufObj, gDvm.offJavaNioBuffer_effectiveDirectAddress); } /* |