commit 58df32711162823647356afe25ae2cde04133563
author Jeff Hao <jeffhao@google.com> Mon Apr 22 15:28:53 2013 -0700
committer Jeff Hao <jeffhao@google.com> Tue Apr 23 16:34:16 2013 -0700
tree df1b2b43b90f4861b475f1452b175353a56ec3d7
parent ede1807e3481a6937416964bb7556364f2d428e1

Removed compiled resolution trampoline.

Created assembly versions of resolution trampoline for portable and
quick. Removed compiled version from the image.

Change-Id: I183e110c4e102fb45ce6e7f4e855f8bed7986251

src/image_writer.cc

diff --git a/src/image_writer.cc b/src/image_writer.cc
index 5638b5b..16ac385 100644
--- a/src/image_writer.cc
+++ b/src/image_writer.cc
@@ -354,10 +354,6 @@
   image_roots->Set(ImageHeader::kJniStubArray, runtime->GetJniDlsymLookupStub());
   image_roots->Set(ImageHeader::kAbstractMethodErrorStubArray,
                    runtime->GetAbstractMethodErrorStubArray());
-  image_roots->Set(ImageHeader::kStaticResolutionStubArray,
-                   runtime->GetResolutionStubArray(Runtime::kStaticMethod));
-  image_roots->Set(ImageHeader::kUnknownMethodResolutionStubArray,
-                   runtime->GetResolutionStubArray(Runtime::kUnknownMethod));
   image_roots->Set(ImageHeader::kResolutionMethod, runtime->GetResolutionMethod());
   image_roots->Set(ImageHeader::kCalleeSaveMethod,
                    runtime->GetCalleeSaveMethod(Runtime::kSaveAll));
@@ -490,31 +486,13 @@
   }
 
   if (orig == Runtime::Current()->GetResolutionMethod()) {
-    // The resolution stub's code points at the unknown resolution trampoline
-    ByteArray* orig_res_stub_array_ =
-        Runtime::Current()->GetResolutionStubArray(Runtime::kUnknownMethod);
-    CHECK(orig->GetCode() == orig_res_stub_array_->GetData());
-    ByteArray* copy_res_stub_array_ = down_cast<ByteArray*>(GetImageAddress(orig_res_stub_array_));
-    copy->SetCode(copy_res_stub_array_->GetData());
+    // The resolution method's code is set to the resolution trampoline when we load the image.
+    copy->SetCode(NULL);
     return;
   }
 
-  // Non-abstract methods typically have code
-  uint32_t code_offset = orig->GetOatCodeOffset();
-  const byte* code = NULL;
-  if (orig->IsStatic()) {
-    // Static methods may point at the resolution trampoline stub
-    ByteArray* orig_res_stub_array_ =
-        Runtime::Current()->GetResolutionStubArray(Runtime::kStaticMethod);
-    if (reinterpret_cast<int8_t*>(code_offset) == orig_res_stub_array_->GetData()) {
-      ByteArray* copy_res_stub_array_ = down_cast<ByteArray*>(GetImageAddress(orig_res_stub_array_));
-      code = reinterpret_cast<const byte*>(copy_res_stub_array_->GetData());
-    }
-  }
-  if (code == NULL) {
-    code = GetOatAddress(code_offset);
-  }
-  copy->SetCode(code);
+  // Non-abstract methods have code
+  copy->SetCode(GetOatAddress(orig->GetOatCodeOffset()));
 
   if (orig->IsNative()) {
     // The native method's pointer is directed to a stub to lookup via dlsym.