diff options
author | 2023-06-28 13:13:02 +0100 | |
---|---|---|
committer | 2023-06-28 13:56:37 +0100 | |
commit | b851c021cde9100ecb780beccb833494c57a1f46 (patch) | |
tree | 887d14caa716e028b6c4ea48d49192c762f3ca18 | |
parent | bd3d6bb079641007fc561fa66b6ae8d366f3cd91 (diff) |
Remove obsolete `kInterpreterAbi`.
It was no longer used (although still handled in `CreateTrampoline`).
Bug: 283082089
Test: m test-art-host-gtest
Test: run ART test 001-HelloWorld on a Linux RISC-V VM:
lunch aosp_riscv64-userdebug
export ART_TEST_SSH_USER=ubuntu
export ART_TEST_SSH_HOST=localhost
export ART_TEST_SSH_PORT=10001
export ART_TEST_ON_VM=true
. art/tools/buildbot-utils.sh
art/tools/buildbot-build.sh --target
# Create, boot and configure the VM.
art/tools/buildbot-vm.sh create
art/tools/buildbot-vm.sh boot
art/tools/buildbot-vm.sh setup-ssh # password: 'ubuntu'
art/tools/buildbot-cleanup-device.sh
art/tools/buildbot-setup-device.sh
art/tools/buildbot-sync.sh
art/test.py --target -r --prebuild --no-prebuild --ndebug --no-image \
--64 --interpreter 001-HelloWorld
Change-Id: I9939e9ac91fb68e8687ccac8e1bbf9d7b023b05f
-rw-r--r-- | compiler/trampolines/trampoline_compiler.cc | 12 | ||||
-rw-r--r-- | compiler/trampolines/trampoline_compiler.h | 2 |
2 files changed, 0 insertions, 14 deletions
diff --git a/compiler/trampolines/trampoline_compiler.cc b/compiler/trampolines/trampoline_compiler.cc index 739ec2965b..23d1a5265c 100644 --- a/compiler/trampolines/trampoline_compiler.cc +++ b/compiler/trampolines/trampoline_compiler.cc @@ -61,9 +61,6 @@ static std::unique_ptr<const std::vector<uint8_t>> CreateTrampoline( ArmVIXLAssembler assembler(allocator); switch (abi) { - case kInterpreterAbi: // Thread* is first argument (R0) in interpreter ABI. - ___ Ldr(pc, MemOperand(r0, offset.Int32Value())); - break; case kJniAbi: { // Load via Thread* held in JNIEnv* in first argument (R0). vixl::aarch32::UseScratchRegisterScope temps(assembler.GetVIXLAssembler()); const vixl::aarch32::Register temp_reg = temps.Acquire(); @@ -99,11 +96,6 @@ static std::unique_ptr<const std::vector<uint8_t>> CreateTrampoline( Arm64Assembler assembler(allocator); switch (abi) { - case kInterpreterAbi: // Thread* is first argument (X0) in interpreter ABI. - __ 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::FromXRegister(IP1), Arm64ManagedRegister::FromXRegister(X0), @@ -139,10 +131,6 @@ static std::unique_ptr<const std::vector<uint8_t>> CreateTrampoline(ArenaAllocat Riscv64Assembler assembler(allocator); switch (abi) { - case kInterpreterAbi: // Thread* is first argument (A0) in interpreter ABI. - __ Loadd(TMP, A0, offset.Int32Value()); - __ Jr(TMP); - break; case kJniAbi: // Load via Thread* held in JNIEnv* in first argument (A0). // Note: We use `TMP2` here because `TMP` can be used for source address by `Loadd()`. __ Loadd(TMP2, diff --git a/compiler/trampolines/trampoline_compiler.h b/compiler/trampolines/trampoline_compiler.h index 32e35ae1d6..25b715fab0 100644 --- a/compiler/trampolines/trampoline_compiler.h +++ b/compiler/trampolines/trampoline_compiler.h @@ -28,8 +28,6 @@ namespace art HIDDEN { enum EntryPointCallingConvention { - // ABI of invocations to a method's interpreter entry point. - kInterpreterAbi, // ABI of calls to a method's native code, only used for native methods. kJniAbi, // ABI of calls to a method's quick code entry point. |