Reviewers: Michael Starzinger,

Description:
Merged r11523 into 3.10 branch.

MIPS: Fixed illegal instruction use on Loongson in code for Math.random().

[email protected]
BUG=v8:2115


Please review this at https://chromiumcodereview.appspot.com/10382124/

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

Affected files:
  M src/mips/lithium-codegen-mips.cc
  M src/version.cc


Index: src/mips/lithium-codegen-mips.cc
diff --git a/src/mips/lithium-codegen-mips.cc b/src/mips/lithium-codegen-mips.cc index 762e15cee1eb59c45a7d3110ef491c5fb687f852..122fd1ef4c29aca625dcdda34e0e6ea7ffc72f5c 100644
--- a/src/mips/lithium-codegen-mips.cc
+++ b/src/mips/lithium-codegen-mips.cc
@@ -3225,7 +3225,7 @@ void LCodeGen::DoRandom(LRandom* instr) {
   // state[0] = 18273 * (state[0] & 0xFFFF) + (state[0] >> 16)
   __ And(a3, a1, Operand(0xFFFF));
   __ li(t0, Operand(18273));
-  __ mul(a3, a3, t0);
+  __ Mul(a3, a3, t0);
   __ srl(a1, a1, 16);
   __ Addu(a1, a3, a1);
   // Save state[0].
@@ -3234,7 +3234,7 @@ void LCodeGen::DoRandom(LRandom* instr) {
   // state[1] = 36969 * (state[1] & 0xFFFF) + (state[1] >> 16)
   __ And(a3, a0, Operand(0xFFFF));
   __ li(t0, Operand(36969));
-  __ mul(a3, a3, t0);
+  __ Mul(a3, a3, t0);
   __ srl(a0, a0, 16),
   __ Addu(a0, a3, a0);
   // Save state[1].
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index 0dda633448c707847493d8afc01f96d82df1ec7b..bbf308b9322bcd41331d81a31c729c150ded18a0 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     10
 #define BUILD_NUMBER      8
-#define PATCH_LEVEL       4
+#define PATCH_LEVEL       5
 // 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