diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-07-16 16:23:40 +0100 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-07-16 17:55:38 +0100 |
| commit | 8d486731559ba0c5e12c27b4a507181333702b7e (patch) | |
| tree | 78d19970d33511d6a1c54560801d5c5dcc0c47af /compiler/optimizing/code_generator_arm.cc | |
| parent | fbde4dd1cb6db729e3f3ee5bdae0cdd824d73054 (diff) | |
| download | android_art-8d486731559ba0c5e12c27b4a507181333702b7e.tar.gz android_art-8d486731559ba0c5e12c27b4a507181333702b7e.tar.bz2 android_art-8d486731559ba0c5e12c27b4a507181333702b7e.zip | |
Use the thumb2 assembler for the optimizing compiler.
Change-Id: I2b058f4433504dc3299c06f5cb0b5ab12f34aa82
Diffstat (limited to 'compiler/optimizing/code_generator_arm.cc')
| -rw-r--r-- | compiler/optimizing/code_generator_arm.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc index 73c2d48320..9d17fb137a 100644 --- a/compiler/optimizing/code_generator_arm.cc +++ b/compiler/optimizing/code_generator_arm.cc @@ -97,7 +97,8 @@ CodeGeneratorARM::CodeGeneratorARM(HGraph* graph) : CodeGenerator(graph, kNumberOfRegIds), location_builder_(graph, this), instruction_visitor_(graph, this), - move_resolver_(graph->GetArena(), this) {} + move_resolver_(graph->GetArena(), this), + assembler_(true) {} size_t CodeGeneratorARM::FrameEntrySpillSize() const { return kNumberOfPushedRegistersAtEntry * kArmWordSize; @@ -948,9 +949,11 @@ void InstructionCodeGeneratorARM::VisitCompare(HCompare* compare) { ShifterOperand(right.AsRegisterPairHigh())); // Signed compare. __ b(&less, LT); __ b(&greater, GT); + // Do LoadImmediate before any `cmp`, as LoadImmediate might affect + // the status flags. + __ LoadImmediate(output, 0); __ cmp(left.AsRegisterPairLow(), ShifterOperand(right.AsRegisterPairLow())); // Unsigned compare. - __ LoadImmediate(output, 0); __ b(&done, EQ); __ b(&less, CC); |