commit bf6b92a158053c98b15f4393abb3b86344ec9a20
author Andreas Gampe <agampe@google.com> Wed Mar 05 16:11:04 2014 -0800
committer Ian Rogers <irogers@google.com> Wed Mar 05 22:32:53 2014 -0800
tree 93a28d1e01b045a8df23fe5279601496b62af3dd
parent 359597ee8c0667a7d2c0b74dcbb0f90bb6059bae

Generic JNI implementation for x86_64

Starting implementation for generic JNI on x86_64. Frames are of
large static size (>4K) right now, should be compacted later. Passes
the whole of jni_compiler_test.

Change-Id: I88ac3e13a534afe7568d62a1ef97cb766e8260e4

compiler/jni/jni_compiler_test.cc

diff --git a/compiler/jni/jni_compiler_test.cc b/compiler/jni/jni_compiler_test.cc
index f48cf6c..a9fbc64 100644
--- a/compiler/jni/jni_compiler_test.cc
+++ b/compiler/jni/jni_compiler_test.cc
@@ -328,7 +328,9 @@
   EXPECT_TRUE(env->IsInstanceOf(thisObj, JniCompilerTest::jklass_));
   gJava_MyClassNatives_fooIOO_calls++;
   ScopedObjectAccess soa(Thread::Current());
-  EXPECT_EQ(3U, Thread::Current()->NumStackReferences());
+  size_t null_args = (y == nullptr ? 1 : 0) + (z == nullptr ? 1 : 0);
+  EXPECT_TRUE(3U == Thread::Current()->NumStackReferences() ||
+              (3U - null_args) == Thread::Current()->NumStackReferences());
   switch (x) {
     case 1:
       return y;
@@ -434,7 +436,9 @@
   EXPECT_TRUE(env->IsInstanceOf(JniCompilerTest::jobj_, klass));
   gJava_MyClassNatives_fooSIOO_calls++;
   ScopedObjectAccess soa(Thread::Current());
-  EXPECT_EQ(3U, Thread::Current()->NumStackReferences());
+  size_t null_args = (y == nullptr ? 1 : 0) + (z == nullptr ? 1 : 0);
+  EXPECT_TRUE(3U == Thread::Current()->NumStackReferences() ||
+              (3U - null_args) == Thread::Current()->NumStackReferences());
   switch (x) {
     case 1:
       return y;
@@ -487,7 +491,9 @@
   EXPECT_TRUE(env->IsInstanceOf(JniCompilerTest::jobj_, klass));
   gJava_MyClassNatives_fooSSIOO_calls++;
   ScopedObjectAccess soa(Thread::Current());
-  EXPECT_EQ(3U, Thread::Current()->NumStackReferences());
+  size_t null_args = (y == nullptr ? 1 : 0) + (z == nullptr ? 1 : 0);
+  EXPECT_TRUE(3U == Thread::Current()->NumStackReferences() ||
+              (3U - null_args) == Thread::Current()->NumStackReferences());
   switch (x) {
     case 1:
       return y;

compiler/jni/quick/calling_convention.cc

diff --git a/compiler/jni/quick/calling_convention.cc b/compiler/jni/quick/calling_convention.cc
index 5d5eaf2..ac962af 100644
--- a/compiler/jni/quick/calling_convention.cc
+++ b/compiler/jni/quick/calling_convention.cc
@@ -106,7 +106,7 @@
 }
 
 FrameOffset JniCallingConvention::SavedLocalReferenceCookieOffset() const {
-  size_t start_of_sirt = SirtLinkOffset().Int32Value() +  kPointerSize;
+  size_t start_of_sirt = SirtNumRefsOffset().Int32Value() +  kPointerSize;
   size_t references_size = kPointerSize * ReferenceCount();  // size excluding header
   return FrameOffset(start_of_sirt + references_size);
 }
@@ -158,11 +158,11 @@
 // position
 FrameOffset JniCallingConvention::CurrentParamSirtEntryOffset() {
   CHECK(IsCurrentParamAReference());
-  CHECK_GT(SirtLinkOffset(), SirtNumRefsOffset());
+  CHECK_LT(SirtLinkOffset(), SirtNumRefsOffset());
   // Address of 1st SIRT entry
-  int result = SirtLinkOffset().Int32Value() + kPointerSize;
+  int result = SirtNumRefsOffset().Int32Value() + kPointerSize;
   result += itr_refs_ * kPointerSize;
-  CHECK_GT(result, SirtLinkOffset().Int32Value());
+  CHECK_GT(result, SirtNumRefsOffset().Int32Value());
   return FrameOffset(result);
 }