diff options
| author | Andreas Gampe <agampe@google.com> | 2014-03-24 16:45:44 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-03-24 16:45:44 -0700 |
| commit | c6ee54e9a9fd67d24c63bd802ef2fe540a4f86a5 (patch) | |
| tree | 0d5938790449eb7198f930b2cc6edbd944a9992a /compiler/trampolines/trampoline_compiler.cc | |
| parent | 572396010f292f9ba0c1509d2160b97ff886460e (diff) | |
| download | android_art-c6ee54e9a9fd67d24c63bd802ef2fe540a4f86a5.tar.gz android_art-c6ee54e9a9fd67d24c63bd802ef2fe540a4f86a5.tar.bz2 android_art-c6ee54e9a9fd67d24c63bd802ef2fe540a4f86a5.zip | |
Trampoline and assembly fixes for ARM64
Trampolines need a jump, not a call. Expose br in the ARM64
assembler to allow this.
The resolution trampoline is called with the Quick ABI, and will
continue to a Quick ABI function. Then the method pointer must be
in x0.
Change-Id: I4e383b59d6c40a659d324a7faef3fadf0c890178
Diffstat (limited to 'compiler/trampolines/trampoline_compiler.cc')
| -rw-r--r-- | compiler/trampolines/trampoline_compiler.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/trampolines/trampoline_compiler.cc b/compiler/trampolines/trampoline_compiler.cc index 4dffef9f05..32980cba72 100644 --- a/compiler/trampolines/trampoline_compiler.cc +++ b/compiler/trampolines/trampoline_compiler.cc @@ -62,7 +62,7 @@ static const std::vector<uint8_t>* CreateTrampoline(EntryPointCallingConvention switch (abi) { case kInterpreterAbi: // Thread* is first argument (X0) in interpreter ABI. // FIXME IPx used by VIXL - this is unsafe. - __ Call(Arm64ManagedRegister::FromCoreRegister(X0), Offset(offset.Int32Value()), + __ JumpTo(Arm64ManagedRegister::FromCoreRegister(X0), Offset(offset.Int32Value()), Arm64ManagedRegister::FromCoreRegister(IP1)); break; @@ -73,13 +73,13 @@ static const std::vector<uint8_t>* CreateTrampoline(EntryPointCallingConvention Offset(JNIEnvExt::SelfOffset().Int32Value())); // FIXME IPx used by VIXL - this is unsafe. - __ Call(Arm64ManagedRegister::FromCoreRegister(IP1), Offset(offset.Int32Value()), + __ JumpTo(Arm64ManagedRegister::FromCoreRegister(IP1), Offset(offset.Int32Value()), Arm64ManagedRegister::FromCoreRegister(IP0)); break; case kPortableAbi: // X18 holds Thread*. case kQuickAbi: // Fall-through. - __ Call(Arm64ManagedRegister::FromCoreRegister(TR), Offset(offset.Int32Value()), + __ JumpTo(Arm64ManagedRegister::FromCoreRegister(TR), Offset(offset.Int32Value()), Arm64ManagedRegister::FromCoreRegister(IP0)); break; |