diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-08-10 00:20:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-08-10 00:20:26 +0000 |
| commit | dfdf1e5343ba9c05adff4cefeedd7d7b5fd49f6a (patch) | |
| tree | 3e68dfa7106d9e9d56c472dc4cd9590a3281bc28 /compiler/utils/jni_macro_assembler.cc | |
| parent | c21f1c5b293a2830ef4a06f032cebd98d9596d4a (diff) | |
| parent | 60b1e1d5e10869cf3f0692a97499e0dfedea3373 (diff) | |
Merge "ART: Extract JNI macro assembler for arm"
Diffstat (limited to 'compiler/utils/jni_macro_assembler.cc')
| -rw-r--r-- | compiler/utils/jni_macro_assembler.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/compiler/utils/jni_macro_assembler.cc b/compiler/utils/jni_macro_assembler.cc index 4fca4e1090..797a98cfd5 100644 --- a/compiler/utils/jni_macro_assembler.cc +++ b/compiler/utils/jni_macro_assembler.cc @@ -20,8 +20,7 @@ #include <vector> #ifdef ART_ENABLE_CODEGEN_arm -#include "arm/assembler_arm32.h" -#include "arm/assembler_thumb2.h" +#include "arm/jni_macro_assembler_arm.h" #endif #ifdef ART_ENABLE_CODEGEN_arm64 #include "arm64/jni_macro_assembler_arm64.h" @@ -58,9 +57,8 @@ MacroAsm32UniquePtr JNIMacroAssembler<PointerSize::k32>::Create( switch (instruction_set) { #ifdef ART_ENABLE_CODEGEN_arm case kArm: - return MacroAsm32UniquePtr(new (arena) arm::Arm32Assembler(arena)); case kThumb2: - return MacroAsm32UniquePtr(new (arena) arm::Thumb2Assembler(arena)); + return MacroAsm32UniquePtr(new (arena) arm::ArmJNIMacroAssembler(arena, instruction_set)); #endif #ifdef ART_ENABLE_CODEGEN_mips case kMips: |