Fix arm compilation. DiyFp multiplications are now in a separate procedure.

Review URL: http://codereview.chromium.org/971006

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@4171 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/SConscript b/src/SConscript
index 4e474f4fadc009f7214e838ba19562646d0c4200..cae462721d5f2c2c1f841cf776fbcdb281fb4e50 100755 (executable)
--- a/src/SConscript
+++ b/src/SConscript
@@ -56,6 +56,7 @@ SOURCES = {
     debug-agent.cc
     debug.cc
     disassembler.cc
+    diy_fp.cc
     execution.cc
     factory.cc
     flags.cc

diff --git a/src/diy_fp.cc b/src/diy_fp.cc
new file mode 100644 (file)
index 0000000..0a81005
--- /dev/null
+++ b/src/diy_fp.cc
@@ -0,0 +1,58 @@
+// Copyright 2010 the V8 project authors. All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+//       notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+//       copyright notice, this list of conditions and the following
+//       disclaimer in the documentation and/or other materials provided
+//       with the distribution.
+//     * Neither the name of Google Inc. nor the names of its
+//       contributors may be used to endorse or promote products derived
+//       from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "v8.h"
+
+#include "diy_fp.h"
+
+namespace v8 {
+namespace internal {
+
+void DiyFp::Multiply(const DiyFp& other) {
+  // Simply "emulates" a 128 bit multiplication.
+  // However: the resulting number only contains 64 bits. The least
+  // significant 64 bits are only used for rounding the most significant 64
+  // bits.
+  const uint64_t kM32 = 0xFFFFFFFFu;
+  uint64_t a = f_ >> 32;
+  uint64_t b = f_ & kM32;
+  uint64_t c = other.f_ >> 32;
+  uint64_t d = other.f_ & kM32;
+  uint64_t ac = a * c;
+  uint64_t bc = b * c;
+  uint64_t ad = a * d;
+  uint64_t bd = b * d;
+  uint64_t tmp = (bd >> 32) + (ad & kM32) + (bc & kM32);
+  // By adding 1U << 31 to tmp we round the final result.
+  // Halfway cases will be round up.
+  tmp += 1U << 31;
+  uint64_t result_f = ac + (ad >> 32) + (bc >> 32) + (tmp >> 32);
+  e_ += other.e_ + 64;
+  f_ = result_f;
+}
+
+} }  // namespace v8::internal

diff --git a/src/diy_fp.h b/src/diy_fp.h
index 9cd700368306a11057c26c59bba219fe46c20826..cfe05ef7428b6b130ab4a0e2109f413f7856306f 100644 (file)
--- a/src/diy_fp.h
+++ b/src/diy_fp.h
@@ -64,26 +64,7 @@ class DiyFp {
 
 
   // this = this * other.
-  void Multiply(const DiyFp& other) {
-    // Simply "emulates" a 128 bit multiplication.
-    // However: the resulting number only contains 64 bits. The least
-    // significant 64 bits are only used for rounding the most significant 64
-    // bits.
-    const uint64_t kM32 = 0xFFFFFFFFu;
-    uint64_t a = f_ >> 32;
-    uint64_t b = f_ & kM32;
-    uint64_t c = other.f_ >> 32;
-    uint64_t d = other.f_ & kM32;
-    uint64_t ac = a * c;
-    uint64_t bc = b * c;
-    uint64_t ad = a * d;
-    uint64_t bd = b * d;
-    uint64_t tmp = (bd >> 32) + (ad & kM32) + (bc & kM32);
-    tmp += 1U << 31;  // round
-    uint64_t result_f = ac + (ad >> 32) + (bc >> 32) + (tmp >> 32);
-    e_ += other.e_ + 64;
-    f_ = result_f;
-  }
+  void Multiply(const DiyFp& other);
 
   // returns a * b;
   static DiyFp Times(const DiyFp& a, const DiyFp& b) {

diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index a0cc3e3422d84a8401b47314b5c8ced9d96d57cc..b7b23e93dee9d825ea14891ae7a4a8f0f4d39110 100644 (file)
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -266,6 +266,7 @@
         '../../src/disassembler.cc',
         '../../src/disassembler.h',
         '../../src/dtoa-config.c',
+        '../../src/diy_fp.cc',
         '../../src/diy_fp.h',
         '../../src/double.h',
         '../../src/execution.cc',