diff options
| author | Vladimir Marko <vmarko@google.com> | 2020-02-12 10:52:22 +0000 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2020-02-13 15:07:15 +0000 |
| commit | 2c8123c1480dcd42e31963697264fca7ad6fa154 (patch) | |
| tree | 9599252703d41b43ac973c38032385b303bcb9c8 /compiler/utils/jni_macro_assembler.cc | |
| parent | c3f2fe95ef4f3a51039e497b02b978e7d85ee3fa (diff) | |
Remove MIPS support from JNI/trampoline compiler.
Also remove MIPS assembler/disassembler support.
Test: aosp_taimen-userdebug boots.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Bug: 147346243
Change-Id: Id736074b97cd04987a7902741828b119508df1c0
Diffstat (limited to 'compiler/utils/jni_macro_assembler.cc')
| -rw-r--r-- | compiler/utils/jni_macro_assembler.cc | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/compiler/utils/jni_macro_assembler.cc b/compiler/utils/jni_macro_assembler.cc index 5f405f348c..d6d49f8faa 100644 --- a/compiler/utils/jni_macro_assembler.cc +++ b/compiler/utils/jni_macro_assembler.cc @@ -25,12 +25,6 @@ #ifdef ART_ENABLE_CODEGEN_arm64 #include "arm64/jni_macro_assembler_arm64.h" #endif -#ifdef ART_ENABLE_CODEGEN_mips -#include "mips/assembler_mips.h" -#endif -#ifdef ART_ENABLE_CODEGEN_mips64 -#include "mips64/assembler_mips64.h" -#endif #ifdef ART_ENABLE_CODEGEN_x86 #include "x86/jni_macro_assembler_x86.h" #endif @@ -50,9 +44,8 @@ MacroAsm32UniquePtr JNIMacroAssembler<PointerSize::k32>::Create( ArenaAllocator* allocator, InstructionSet instruction_set, const InstructionSetFeatures* instruction_set_features) { -#ifndef ART_ENABLE_CODEGEN_mips + // TODO: Remove the parameter from API (not needed after Mips target was removed). UNUSED(instruction_set_features); -#endif switch (instruction_set) { #ifdef ART_ENABLE_CODEGEN_arm @@ -60,14 +53,6 @@ MacroAsm32UniquePtr JNIMacroAssembler<PointerSize::k32>::Create( case InstructionSet::kThumb2: return MacroAsm32UniquePtr(new (allocator) arm::ArmVIXLJNIMacroAssembler(allocator)); #endif -#ifdef ART_ENABLE_CODEGEN_mips - case InstructionSet::kMips: - return MacroAsm32UniquePtr(new (allocator) mips::MipsAssembler( - allocator, - instruction_set_features != nullptr - ? instruction_set_features->AsMipsInstructionSetFeatures() - : nullptr)); -#endif #ifdef ART_ENABLE_CODEGEN_x86 case InstructionSet::kX86: return MacroAsm32UniquePtr(new (allocator) x86::X86JNIMacroAssembler(allocator)); @@ -85,23 +70,14 @@ MacroAsm64UniquePtr JNIMacroAssembler<PointerSize::k64>::Create( ArenaAllocator* allocator, InstructionSet instruction_set, const InstructionSetFeatures* instruction_set_features) { -#ifndef ART_ENABLE_CODEGEN_mips64 + // TODO: Remove the parameter from API (not needed after Mips64 target was removed). UNUSED(instruction_set_features); -#endif switch (instruction_set) { #ifdef ART_ENABLE_CODEGEN_arm64 case InstructionSet::kArm64: return MacroAsm64UniquePtr(new (allocator) arm64::Arm64JNIMacroAssembler(allocator)); #endif -#ifdef ART_ENABLE_CODEGEN_mips64 - case InstructionSet::kMips64: - return MacroAsm64UniquePtr(new (allocator) mips64::Mips64Assembler( - allocator, - instruction_set_features != nullptr - ? instruction_set_features->AsMips64InstructionSetFeatures() - : nullptr)); -#endif #ifdef ART_ENABLE_CODEGEN_x86_64 case InstructionSet::kX86_64: return MacroAsm64UniquePtr(new (allocator) x86_64::X86_64JNIMacroAssembler(allocator)); |