Reviewers: akos.palfi.imgtec,

Message:
This should fix the name conflict with the MIPS port.

Description:
Move fdlibm from v8::internal to v8::fdlibm.

[email protected]

Please review this at https://codereview.chromium.org/446863002/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files (+9, -8 lines):
  M src/bootstrapper.cc
  M src/runtime.cc
  M third_party/fdlibm/fdlibm.h
  M third_party/fdlibm/fdlibm.cc


Index: src/bootstrapper.cc
diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc
index c297a37e1ceef40c9be1c3e4d0e016301a3b110f..ec54f2d8296397296001412928ef5b03afee7d5d 100644
--- a/src/bootstrapper.cc
+++ b/src/bootstrapper.cc
@@ -2651,11 +2651,12 @@ Genesis::Genesis(Isolate* isolate,
                                   NONE).Assert();

     // Initialize trigonometric lookup tables and constants.
- const int constants_size = ARRAY_SIZE(TrigonometricConstants::constants);
+    const int constants_size =
+        ARRAY_SIZE(fdlibm::TrigonometricConstants::constants);
     const int table_num_bytes = constants_size * kDoubleSize;
     v8::Local<v8::ArrayBuffer> trig_buffer = v8::ArrayBuffer::New(
         reinterpret_cast<v8::Isolate*>(isolate),
-        const_cast<double*>(TrigonometricConstants::constants),
+        const_cast<double*>(fdlibm::TrigonometricConstants::constants),
         table_num_bytes);
     v8::Local<v8::Float64Array> trig_table =
         v8::Float64Array::New(trig_buffer, 0, constants_size);
Index: src/runtime.cc
diff --git a/src/runtime.cc b/src/runtime.cc
index cc41117ead4fd9dec1613bbf553d465ff7101e8f..2008acf64e72e24e48dcfecc8b26d9c3adfcdf3d 100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -7690,7 +7690,7 @@ RUNTIME_FUNCTION(Runtime_RemPiO2) {
   CONVERT_DOUBLE_ARG_CHECKED(x, 0);
   Factory* factory = isolate->factory();
   double y[2];
-  int n = rempio2(x, y);
+  int n = fdlibm::rempio2(x, y);
   Handle<FixedArray> array = factory->NewFixedArray(3);
   Handle<HeapNumber> y0 = factory->NewHeapNumber(y[0]);
   Handle<HeapNumber> y1 = factory->NewHeapNumber(y[1]);
Index: third_party/fdlibm/fdlibm.cc
diff --git a/third_party/fdlibm/fdlibm.cc b/third_party/fdlibm/fdlibm.cc
index 6b8084f8b9addb3c51b5ed7a769eb44d258f96e8..fe7e2316087b74ccdf3ed7d157176d5ade126c64 100644
--- a/third_party/fdlibm/fdlibm.cc
+++ b/third_party/fdlibm/fdlibm.cc
@@ -20,7 +20,7 @@


 namespace v8 {
-namespace internal {
+namespace fdlibm {

 #ifdef _MSC_VER
 inline double scalbn(double x, int y) { return _scalb(x, y); }
@@ -228,7 +228,7 @@ recompute:


 int rempio2(double x, double* y) {
-  int32_t hx = static_cast<int32_t>(double_to_uint64(x) >> 32);
+  int32_t hx = static_cast<int32_t>(internal::double_to_uint64(x) >> 32);
   int32_t ix = hx & 0x7fffffff;

   if (ix >= 0x7ff00000) {
@@ -237,9 +237,9 @@ int rempio2(double x, double* y) {
   }

   int32_t e0 = (ix >> 20) - 1046;
-  uint64_t zi = double_to_uint64(x) & 0xFFFFFFFFu;
+  uint64_t zi = internal::double_to_uint64(x) & 0xFFFFFFFFu;
   zi |= static_cast<uint64_t>(ix - (e0 << 20)) << 32;
-  double z = uint64_to_double(zi);
+  double z = internal::uint64_to_double(zi);

   double tx[3];
   for (int i = 0; i < 2; i++) {
Index: third_party/fdlibm/fdlibm.h
diff --git a/third_party/fdlibm/fdlibm.h b/third_party/fdlibm/fdlibm.h
index 4ce7794b8e2dbacedc7009728910da92e5d8e03d..39c4b50dbaf534a73c8aa7cfd18a5d654805e4b6 100644
--- a/third_party/fdlibm/fdlibm.h
+++ b/third_party/fdlibm/fdlibm.h
@@ -17,7 +17,7 @@
 #define V8_FDLIBM_H_

 namespace v8 {
-namespace internal {
+namespace fdlibm {

 int rempio2(double x, double* y);



--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to