commit 7655f29fabc0a12765de828914a18314382e5a35
author Ian Rogers <irogers@google.com> Mon Jul 29 11:07:13 2013 -0700
committer Ian Rogers <irogers@google.com> Tue Jul 30 16:00:24 2013 -0700
tree 219f2df20cf7f053a73a345ae20e131a73759c79
parent 1a8080d4c2e1772cfcc5e9d6587bc63bba3945d9

Portable refactorings.

Separate quick from portable entrypoints.
Move architectural dependencies into arch.

Change-Id: I9adbc0a9782e2959fdc3308215f01e3107632b7c

compiler/stubs/portable/stubs.cc

diff --git a/compiler/stubs/portable/stubs.cc b/compiler/stubs/portable/stubs.cc
index cee6847..def43e2 100644
--- a/compiler/stubs/portable/stubs.cc
+++ b/compiler/stubs/portable/stubs.cc
@@ -34,7 +34,8 @@
   RegList save = (1 << R0) | (1 << R1) | (1 << R2) | (1 << R3) | (1 << LR);
 
   __ PushList(save);
-  __ LoadFromOffset(kLoadWord, R12, TR, ENTRYPOINT_OFFSET(pPortableResolutionTrampolineFromCode));
+  __ LoadFromOffset(kLoadWord, R12, TR,
+                    PORTABLE_ENTRYPOINT_OFFSET(pPortableResolutionTrampolineFromCode));
   __ mov(R3, ShifterOperand(TR));  // Pass Thread::Current() in R3
   __ mov(R2, ShifterOperand(SP));  // Pass sp for Method** callee_addr
   __ IncreaseFrameSize(12);         // 3 words of space for alignment
@@ -69,7 +70,7 @@
   __ StoreToOffset(kStoreWord, A0, SP, 0);
 
   __ LoadFromOffset(kLoadWord, T9, S1,
-                    ENTRYPOINT_OFFSET(pPortableResolutionTrampolineFromCode));
+                    PORTABLE_ENTRYPOINT_OFFSET(pPortableResolutionTrampolineFromCode));
   __ Move(A3, S1);  // Pass Thread::Current() in A3
   __ Move(A2, SP);  // Pass SP for Method** callee_addr
   __ Jalr(T9);  // Call to resolution trampoline (callee, receiver, callee_addr, Thread*)
@@ -112,7 +113,7 @@
   __ pushl(ECX);  // pass receiver
   __ pushl(EAX);  // pass called
   // Call to resolve method.
-  __ Call(ThreadOffset(ENTRYPOINT_OFFSET(pPortableResolutionTrampolineFromCode)),
+  __ Call(ThreadOffset(PORTABLE_ENTRYPOINT_OFFSET(pPortableResolutionTrampolineFromCode)),
           X86ManagedRegister::FromCpuRegister(ECX));
   __ leave();