diff options
| author | Dave Allison <dallison@google.com> | 2014-06-16 20:44:29 -0700 |
|---|---|---|
| committer | Dave Allison <dallison@google.com> | 2014-06-24 09:05:27 -0700 |
| commit | 20dfc797dc631bf8d655dcf123f46f13332d3074 (patch) | |
| tree | c1d4e4f919d54f39a6d39d9d769ed5a844afb22b /compiler/optimizing/code_generator_arm.h | |
| parent | cbb0e809c0a4e8a4e8b7f5d3768a1864cfb381bb (diff) | |
| download | android_art-20dfc797dc631bf8d655dcf123f46f13332d3074.tar.gz android_art-20dfc797dc631bf8d655dcf123f46f13332d3074.tar.bz2 android_art-20dfc797dc631bf8d655dcf123f46f13332d3074.zip | |
Add some more instruction support to optimizing compiler.
This adds a few more DEX instructions to the optimizing compiler's
builder (constants, moves, if_xx, etc).
Also:
* Changes the codegen for IF_XX instructions to use a condition
rather than comparing a value against 0.
* Fixes some instructions in the ARM disassembler.
* Fixes PushList and PopList in the thumb2 assembler.
* Switches the assembler for the optimizing compiler to thumb2
rather than ARM.
Change-Id: Iaafcd02243ccc5b03a054ef7a15285b84c06740f
Diffstat (limited to 'compiler/optimizing/code_generator_arm.h')
| -rw-r--r-- | compiler/optimizing/code_generator_arm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/code_generator_arm.h b/compiler/optimizing/code_generator_arm.h index 712a24cf67..0e2a079cde 100644 --- a/compiler/optimizing/code_generator_arm.h +++ b/compiler/optimizing/code_generator_arm.h @@ -20,7 +20,7 @@ #include "code_generator.h" #include "nodes.h" #include "parallel_move_resolver.h" -#include "utils/arm/assembler_arm32.h" +#include "utils/arm/assembler_thumb2.h" namespace art { namespace arm { @@ -180,7 +180,7 @@ class CodeGeneratorARM : public CodeGenerator { LocationsBuilderARM location_builder_; InstructionCodeGeneratorARM instruction_visitor_; ParallelMoveResolverARM move_resolver_; - Arm32Assembler assembler_; + Thumb2Assembler assembler_; DISALLOW_COPY_AND_ASSIGN(CodeGeneratorARM); }; |