diff options
| author | Calin Juravle <calin@google.com> | 2015-02-23 16:05:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-23 16:05:22 +0000 |
| commit | 304e47467579c909a6312ef3cca5cdad1433de9c (patch) | |
| tree | 01deec033535600b9955dd18719aac3189b0de00 /compiler | |
| parent | f9fe845f587e856acf4b3f1b19e4b7bab828b142 (diff) | |
| parent | 3173c8a11f7e23a89526e0ac3b21af5150966d74 (diff) | |
| download | android_art-304e47467579c909a6312ef3cca5cdad1433de9c.tar.gz android_art-304e47467579c909a6312ef3cca5cdad1433de9c.tar.bz2 android_art-304e47467579c909a6312ef3cca5cdad1433de9c.zip | |
Merge "[optimizing] Fix float addition on x86."
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/optimizing/code_generator_x86.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc index e151c6b683..1101569174 100644 --- a/compiler/optimizing/code_generator_x86.cc +++ b/compiler/optimizing/code_generator_x86.cc @@ -1809,7 +1809,7 @@ void LocationsBuilderX86::VisitAdd(HAdd* add) { case Primitive::kPrimFloat: case Primitive::kPrimDouble: { locations->SetInAt(0, Location::RequiresFpuRegister()); - locations->SetInAt(1, Location::Any()); + locations->SetInAt(1, Location::RequiresFpuRegister()); locations->SetOut(Location::SameAsFirstInput()); break; } @@ -1853,8 +1853,6 @@ void InstructionCodeGeneratorX86::VisitAdd(HAdd* add) { case Primitive::kPrimFloat: { if (second.IsFpuRegister()) { __ addss(first.AsFpuRegister<XmmRegister>(), second.AsFpuRegister<XmmRegister>()); - } else { - __ addss(first.AsFpuRegister<XmmRegister>(), Address(ESP, second.GetStackIndex())); } break; } @@ -1862,8 +1860,6 @@ void InstructionCodeGeneratorX86::VisitAdd(HAdd* add) { case Primitive::kPrimDouble: { if (second.IsFpuRegister()) { __ addsd(first.AsFpuRegister<XmmRegister>(), second.AsFpuRegister<XmmRegister>()); - } else { - __ addsd(first.AsFpuRegister<XmmRegister>(), Address(ESP, second.GetStackIndex())); } break; } |