Revision: 12574
Author:   [email protected]
Date:     Fri Sep 21 01:04:05 2012
Log:      Merged r12132 into 3.10 branch.

MIPS: Fix transcendental cache on ARM in optimized code.

[email protected]

Review URL: https://chromiumcodereview.appspot.com/10967035
http://code.google.com/p/v8/source/detail?r=12574

Modified:
 /branches/3.10/src/mips/code-stubs-mips.cc
 /branches/3.10/src/version.cc

=======================================
--- /branches/3.10/src/mips/code-stubs-mips.cc  Mon Apr 30 05:34:39 2012
+++ /branches/3.10/src/mips/code-stubs-mips.cc  Fri Sep 21 01:04:05 2012
@@ -3453,23 +3453,23 @@
                                  1,
                                  1);
   } else {
-    if (!CpuFeatures::IsSupported(FPU)) UNREACHABLE();
+    ASSERT(CpuFeatures::IsSupported(FPU));
     CpuFeatures::Scope scope(FPU);

     Label no_update;
     Label skip_cache;

     // Call C function to calculate the result and update the cache.
-    // Register a0 holds precalculated cache entry address; preserve
-    // it on the stack and pop it into register cache_entry after the
-    // call.
-    __ Push(cache_entry, a2, a3);
+    // a0: precalculated cache entry address.
+    // a2 and a3: parts of the double value.
+    // Store a0, a2 and a3 on stack for later before calling C function.
+    __ Push(a3, a2, cache_entry);
     GenerateCallCFunction(masm, scratch0);
     __ GetCFunctionDoubleResult(f4);

     // Try to update the cache. If we cannot allocate a
     // heap number, we return the result without updating.
-    __ Pop(cache_entry, a2, a3);
+    __ Pop(a3, a2, cache_entry);
     __ LoadRoot(t1, Heap::kHeapNumberMapRootIndex);
     __ AllocateHeapNumber(t2, scratch0, scratch1, t1, &no_update);
     __ sdc1(f4, FieldMemOperand(t2, HeapNumber::kValueOffset));
=======================================
--- /branches/3.10/src/version.cc       Wed Sep 19 07:55:50 2012
+++ /branches/3.10/src/version.cc       Fri Sep 21 01:04:05 2012
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     10
 #define BUILD_NUMBER      8
-#define PATCH_LEVEL       26
+#define PATCH_LEVEL       27
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
 #define IS_CANDIDATE_VERSION 0

--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev

Reply via email to