diff options
| author | 2014-06-05 19:47:18 +0000 | |
|---|---|---|
| committer | 2014-06-05 19:47:18 +0000 | |
| commit | 0eb3e752b65ef908e3790d81fae57cd85a41006b (patch) | |
| tree | 0378d281508f1f1b05e6463d80fceeba4d91eb16 /compiler/utils/assembler.cc | |
| parent | 7ce610516242b1ffd47a42bfc31c2d562f443ca6 (diff) | |
| parent | 65fcc2cf3c5cd97b84330c094908f3a6a7a8d4e7 (diff) | |
Merge "Thumb2 assembler for JNI compiler and optimizing compiler"
Diffstat (limited to 'compiler/utils/assembler.cc')
| -rw-r--r-- | compiler/utils/assembler.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/compiler/utils/assembler.cc b/compiler/utils/assembler.cc index 26bdceb1eb..68b784a25c 100644 --- a/compiler/utils/assembler.cc +++ b/compiler/utils/assembler.cc @@ -19,7 +19,8 @@ #include <algorithm> #include <vector> -#include "arm/assembler_arm.h" +#include "arm/assembler_arm32.h" +#include "arm/assembler_thumb2.h" #include "arm64/assembler_arm64.h" #include "mips/assembler_mips.h" #include "x86/assembler_x86.h" @@ -106,8 +107,9 @@ void AssemblerBuffer::ExtendCapacity() { Assembler* Assembler::Create(InstructionSet instruction_set) { switch (instruction_set) { case kArm: + return new arm::Arm32Assembler(); case kThumb2: - return new arm::ArmAssembler(); + return new arm::Thumb2Assembler(); case kArm64: return new arm64::Arm64Assembler(); case kMips: |