diff options
author | 2014-05-28 22:43:01 -0700 | |
---|---|---|
committer | 2014-05-29 20:50:49 -0700 | |
commit | cf4035a4c41ccfcc3e89a0cee25f5218a11b0705 (patch) | |
tree | 323d9e98e6129c67e464a3e6857ee02593a2f2c2 /runtime/arch/stub_test.cc | |
parent | 29b53d3d715b1ec19349e8cbf7c5e4ff529bd5fe (diff) |
ART: Use StackReference in Quick Stack Frame
The method reference at the bottom of a quick frame is a stack
reference and not a native pointer. This is important for 64b
architectures, where the notions do not coincide.
Change key methods to have StackReference<mirror::ArtMethod>*
parameter instead of mirror::ArtMethod**. Make changes to
invoke stubs for 64b archs, change the frame setup for JNI code
(both generic JNI and compilers), tie up loose ends.
Tested on x86 and x86-64 with host tests. On x86-64, tests succeed
with jni compiler activated. x86-64 QCG was not tested.
Tested on ARM32 with device tests.
Fix ARM64 not saving x19 (used for wSUSPEND) on upcalls.
Tested on ARM64 in interpreter-only + generic-jni mode.
Fix ARM64 JNI Compiler to work with the CL.
Tested on ARM64 in interpreter-only + jni compiler.
Change-Id: I77931a0cbadd04d163b3eb8d6f6a6f8740578f13
Diffstat (limited to 'runtime/arch/stub_test.cc')
-rw-r--r-- | runtime/arch/stub_test.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/runtime/arch/stub_test.cc b/runtime/arch/stub_test.cc index fac988310a..44edd4b076 100644 --- a/runtime/arch/stub_test.cc +++ b/runtime/arch/stub_test.cc @@ -225,7 +225,8 @@ class StubTest : public CommonRuntimeTest { "cmp x1, x2\n\t" "b.ne 1f\n\t" - "mov %[fpr_result], #0\n\t" + "mov x2, #0\n\t" + "str x2, %[fpr_result]\n\t" // Finish up. "2:\n\t" @@ -247,15 +248,16 @@ class StubTest : public CommonRuntimeTest { // Failed fpr verification. "1:\n\t" - "mov %[fpr_result], #1\n\t" + "mov x2, #1\n\t" + "str x2, %[fpr_result]\n\t" "b 2b\n\t" // Goto finish-up // End "3:\n\t" - : [result] "=r" (result), [fpr_result] "=r" (fpr_result) + : [result] "=r" (result) // Use the result from r0 : [arg0] "0"(arg0), [arg1] "r"(arg1), [arg2] "r"(arg2), [code] "r"(code), [self] "r"(self), - [referrer] "r"(referrer) + [referrer] "r"(referrer), [fpr_result] "m" (fpr_result) : "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "x17"); // clobber. #elif defined(__x86_64__) // Note: Uses the native convention |