Refactor quick entrypoints
Remove FinishCalleeSaveFrameSetup.
Assembly routines write down anchor into TLS as well as placing runtime
method in callee save frame.
Simplify artSet64InstanceFromCode by not computing the referrer from the
stack in the C++ code.
Move assembly offset tests next to constant declaration and tidy arch_test.
Change-Id: Iededeebc05e54a1e2bb7bb3572b8ba012cffa1c8
diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints_test.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints_test.cc
index 41af88e..a9af754 100644
--- a/runtime/entrypoints/quick/quick_trampoline_entrypoints_test.cc
+++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints_test.cc
@@ -98,11 +98,11 @@
// Note: we can only check against the kRuntimeISA, because the ArtMethod computation uses
// sizeof(void*), which is wrong when the target bitwidth is not the same as the host's.
CheckPCOffset(kRuntimeISA, Runtime::kRefsAndArgs,
- GetCalleeSavePCOffset(kRuntimeISA, Runtime::kRefsAndArgs));
+ GetCalleeSaveReturnPcOffset(kRuntimeISA, Runtime::kRefsAndArgs));
CheckPCOffset(kRuntimeISA, Runtime::kRefsOnly,
- GetCalleeSavePCOffset(kRuntimeISA, Runtime::kRefsOnly));
+ GetCalleeSaveReturnPcOffset(kRuntimeISA, Runtime::kRefsOnly));
CheckPCOffset(kRuntimeISA, Runtime::kSaveAll,
- GetCalleeSavePCOffset(kRuntimeISA, Runtime::kSaveAll));
+ GetCalleeSaveReturnPcOffset(kRuntimeISA, Runtime::kSaveAll));
}
} // namespace art