diff options
| author | Roland Levillain <rpl@google.com> | 2014-11-17 10:24:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-17 10:24:03 +0000 |
| commit | 610b21cc7f62c61fcb7d88c1ffcc74bfa9ca5ef8 (patch) | |
| tree | 85314ec6521fd5e8be6b4f75f1dab3ecc16e5a02 /compiler/optimizing/code_generator_arm.cc | |
| parent | 1ad824c1e2b91196fa5d6a4827322923c3046833 (diff) | |
| parent | 01a8d7135c59b4a664d1e0c0e4d8db343d4118ef (diff) | |
| download | art-610b21cc7f62c61fcb7d88c1ffcc74bfa9ca5ef8.tar.gz art-610b21cc7f62c61fcb7d88c1ffcc74bfa9ca5ef8.tar.bz2 art-610b21cc7f62c61fcb7d88c1ffcc74bfa9ca5ef8.zip | |
Merge "Add support for int-to-short in the optimizing compiler."
Diffstat (limited to 'compiler/optimizing/code_generator_arm.cc')
| -rw-r--r-- | compiler/optimizing/code_generator_arm.cc | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc index bb2f899886..c17142d7c9 100644 --- a/compiler/optimizing/code_generator_arm.cc +++ b/compiler/optimizing/code_generator_arm.cc @@ -1367,6 +1367,22 @@ void LocationsBuilderARM::VisitTypeConversion(HTypeConversion* conversion) { } break; + case Primitive::kPrimShort: + switch (input_type) { + case Primitive::kPrimByte: + case Primitive::kPrimInt: + case Primitive::kPrimChar: + // Processing a Dex `int-to-short' instruction. + locations->SetInAt(0, Location::RequiresRegister()); + locations->SetOut(Location::RequiresRegister(), Location::kNoOutputOverlap); + break; + + default: + LOG(FATAL) << "Unexpected type conversion from " << input_type + << " to " << result_type; + } + break; + case Primitive::kPrimInt: switch (input_type) { case Primitive::kPrimLong: @@ -1461,6 +1477,21 @@ void InstructionCodeGeneratorARM::VisitTypeConversion(HTypeConversion* conversio } break; + case Primitive::kPrimShort: + switch (input_type) { + case Primitive::kPrimByte: + case Primitive::kPrimInt: + case Primitive::kPrimChar: + // Processing a Dex `int-to-short' instruction. + __ sbfx(out.As<Register>(), in.As<Register>(), 0, 16); + break; + + default: + LOG(FATAL) << "Unexpected type conversion from " << input_type + << " to " << result_type; + } + break; + case Primitive::kPrimInt: switch (input_type) { case Primitive::kPrimLong: |