diff options
| author | Andreas Gampe <agampe@google.com> | 2016-08-08 17:32:34 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2016-08-09 15:24:40 -0700 |
| commit | 60b1e1d5e10869cf3f0692a97499e0dfedea3373 (patch) | |
| tree | 2aa73972874af2c5aad9447cfe41f1f7ba608545 /compiler/utils/jni_macro_assembler.cc | |
| parent | 5c6233c00f1f50e8539fdfffd06c31359eac8b89 (diff) | |
ART: Extract JNI macro assembler for arm
Extract the JNI assembler parts from the regular assembler.
Change-Id: Ice39ffeb854f8651e93443dd69f4c9e0e802975c
Test: m test-art-target (N6)
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 1acc90ca6f..9b16b984aa 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/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: |