diff options
| author | Alexandre Rames <alexandre.rames@arm.com> | 2014-10-17 14:35:27 +0100 |
|---|---|---|
| committer | Alexandre Rames <alexandre.rames@arm.com> | 2014-10-17 14:35:27 +0100 |
| commit | 37c92df53979f9f6ab83155ab9521d554d717161 (patch) | |
| tree | fe9ba081a00719b104184f1f3307b88648e5ead9 /compiler/trampolines/trampoline_compiler.cc | |
| parent | a304f97c97d38af73afe6b49259ac4faf0902123 (diff) | |
| download | android_art-37c92df53979f9f6ab83155ab9521d554d717161.tar.gz android_art-37c92df53979f9f6ab83155ab9521d554d717161.tar.bz2 android_art-37c92df53979f9f6ab83155ab9521d554d717161.zip | |
Rename arm64 `Register` to `XRegister`.
This will avoid naming conflicts in the arm64 port of
the optimizing compiler.
Change-Id: Ie736ddd2ddbd2e299058256de28bad5d41c57d6f
Diffstat (limited to 'compiler/trampolines/trampoline_compiler.cc')
| -rw-r--r-- | compiler/trampolines/trampoline_compiler.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/compiler/trampolines/trampoline_compiler.cc b/compiler/trampolines/trampoline_compiler.cc index e793c6b12c..733b58fa5a 100644 --- a/compiler/trampolines/trampoline_compiler.cc +++ b/compiler/trampolines/trampoline_compiler.cc @@ -62,23 +62,23 @@ static const std::vector<uint8_t>* CreateTrampoline(EntryPointCallingConvention switch (abi) { case kInterpreterAbi: // Thread* is first argument (X0) in interpreter ABI. - __ JumpTo(Arm64ManagedRegister::FromCoreRegister(X0), Offset(offset.Int32Value()), - Arm64ManagedRegister::FromCoreRegister(IP1)); + __ JumpTo(Arm64ManagedRegister::FromXRegister(X0), Offset(offset.Int32Value()), + Arm64ManagedRegister::FromXRegister(IP1)); break; case kJniAbi: // Load via Thread* held in JNIEnv* in first argument (X0). - __ LoadRawPtr(Arm64ManagedRegister::FromCoreRegister(IP1), - Arm64ManagedRegister::FromCoreRegister(X0), + __ LoadRawPtr(Arm64ManagedRegister::FromXRegister(IP1), + Arm64ManagedRegister::FromXRegister(X0), Offset(JNIEnvExt::SelfOffset().Int32Value())); - __ JumpTo(Arm64ManagedRegister::FromCoreRegister(IP1), Offset(offset.Int32Value()), - Arm64ManagedRegister::FromCoreRegister(IP0)); + __ JumpTo(Arm64ManagedRegister::FromXRegister(IP1), Offset(offset.Int32Value()), + Arm64ManagedRegister::FromXRegister(IP0)); break; case kPortableAbi: // X18 holds Thread*. case kQuickAbi: // Fall-through. - __ JumpTo(Arm64ManagedRegister::FromCoreRegister(TR), Offset(offset.Int32Value()), - Arm64ManagedRegister::FromCoreRegister(IP0)); + __ JumpTo(Arm64ManagedRegister::FromXRegister(TR), Offset(offset.Int32Value()), + Arm64ManagedRegister::FromXRegister(IP0)); break; } |