diff options
| author | Richard Coles <torne@google.com> | 2015-03-12 15:24:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-12 15:24:35 +0000 |
| commit | ece92cb15de52c87fd3187197b8d44a14c5be54a (patch) | |
| tree | 36c375a33a7bf8c8c3a6fb2dd5a1cc31213ce35d | |
| parent | 8bf7b0b7f00a210fa038990eade174de75702a1f (diff) | |
| parent | e3024b81d02f5de3de123dc71c08150dcb615eb0 (diff) | |
| download | v8-ece92cb15de52c87fd3187197b8d44a14c5be54a.tar.gz | |
Merge "Don't use C++11's std::trunc and std::round, use the traditional C functions."
| -rw-r--r-- | src/arm/simulator-arm.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/arm/simulator-arm.cc b/src/arm/simulator-arm.cc index aeb35c8a5..972fd07a2 100644 --- a/src/arm/simulator-arm.cc +++ b/src/arm/simulator-arm.cc @@ -2960,7 +2960,7 @@ void Simulator::DecodeTypeVFP(Instruction* instr) { } else if (((instr->Opc2Value() == 0x6)) && (instr->Opc3Value() == 0x3)) { // vrintz - truncate double dm_value = get_double_from_d_register(vm); - double dd_value = std::trunc(dm_value); + double dd_value = trunc(dm_value); dd_value = canonicalizeNaN(dd_value); set_d_register_from_double(vd, dd_value); } else { @@ -3624,7 +3624,7 @@ void Simulator::DecodeSpecialCondition(Instruction* instr) { int rounding_mode = instr->Bits(17, 16); switch (rounding_mode) { case 0x0: // vrinta - round with ties to away from zero - dd_value = std::round(dm_value); + dd_value = round(dm_value); break; case 0x1: { // vrintn - round with ties to even dd_value = std::floor(dm_value); |