commit 9813216f8845e1c4a6dc4d2a10aa227e7d43f858
author Elliott Hughes <enh@google.com> Fri Mar 29 17:14:49 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 29 17:14:50 2013 +0000
tree a5b1b4c48d3739173cb6be1f1ccfe13a6b83ab85
parent ef64fc32d412d64e180cb90ee29ff46af7391580
parent bf3483153e2de90a8cf058fe5ba87cdb66a94e3c

Merge "Track 64-bit nio changes."

vm/InitRefs.cpp

diff --git a/vm/InitRefs.cpp b/vm/InitRefs.cpp
index 19487dc..d8f0697 100644
--- a/vm/InitRefs.cpp
+++ b/vm/InitRefs.cpp
@@ -251,7 +251,7 @@
 
     static struct FieldInfo infoBuffer[] = {
         { &gDvm.offJavaNioBuffer_capacity,               "capacity",               "I" },
-        { &gDvm.offJavaNioBuffer_effectiveDirectAddress, "effectiveDirectAddress", "I" },
+        { &gDvm.offJavaNioBuffer_effectiveDirectAddress, "effectiveDirectAddress", "J" },
         { NULL, NULL, NULL }
     };
 

vm/Jni.cpp

diff --git a/vm/Jni.cpp b/vm/Jni.cpp
index 8808a3f..f235835 100644
--- a/vm/Jni.cpp
+++ b/vm/Jni.cpp
@@ -2757,7 +2757,7 @@
 
     // 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);
 }
 
 /*