[v8-dev] Version 4.3.61.34 (cherry-pick) (issue 1223663003 by [email protected])

Fri, 03 Jul 2015 06:24:09 -0700 

Reviewers: Jakob,

Description:
Version 4.3.61.34 (cherry-pick)

Merged 448ec36491a33111642470ad8b78e99ce3cf1975

MIPS: Fix unpredictable random failures after direct api function call.

[email protected]
BUG=

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

Base URL: https://chromium.googlesource.com/v8/[email protected]

Affected files (+13, -15 lines):
  M include/v8-version.h
  M src/mips/assembler-mips.cc
  M src/mips/code-stubs-mips.cc
  M src/mips64/assembler-mips64.cc
  M src/mips64/code-stubs-mips64.cc
  M test/mjsunit/mjsunit.status


Index: include/v8-version.h
diff --git a/include/v8-version.h b/include/v8-version.h
index ad89b2a5b7f06eba1aff313b4e3992c291aa01ce..1d470d93099c9b0544d69e8341c828c2094ebcff 100644 
--- a/include/v8-version.h
+++ b/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 4
 #define V8_MINOR_VERSION 3
 #define V8_BUILD_NUMBER 61
-#define V8_PATCH_LEVEL 33
+#define V8_PATCH_LEVEL 34

 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
Index: src/mips/assembler-mips.cc
diff --git a/src/mips/assembler-mips.cc b/src/mips/assembler-mips.cc
index c26a8514bb1d35ee43df5efa6c088b599874ece3..d114a965f1a7ea82549382ba41ace6d1aaaf4a04 100644 
--- a/src/mips/assembler-mips.cc
+++ b/src/mips/assembler-mips.cc
@@ -1432,6 +1432,7 @@ void Assembler::jal(int32_t target) {


 void Assembler::jalr(Register rs, Register rd) {
+  DCHECK(rs.code() != rd.code());
   BlockTrampolinePoolScope block_trampoline_pool(this);
   positions_recorder()->WriteRecordedPositions();
   GenInstrRegister(SPECIAL, rs, zero_reg, rd, 0, JALR);
Index: src/mips/code-stubs-mips.cc
diff --git a/src/mips/code-stubs-mips.cc b/src/mips/code-stubs-mips.cc
index 837b5a495b6798f39b359df117e0291f6810d6fc..fc5fef561fd167c195f53315498549c2801e960f 100644 
--- a/src/mips/code-stubs-mips.cc
+++ b/src/mips/code-stubs-mips.cc
@@ -4012,8 +4012,8 @@ void DirectCEntryStub::GenerateCall(MacroAssembler* masm, 
   intptr_t loc =
       reinterpret_cast<intptr_t>(GetCode().location());
   __ Move(t9, target);
-  __ li(ra, Operand(loc, RelocInfo::CODE_TARGET), CONSTANT_SIZE);
-  __ Call(ra);
+  __ li(at, Operand(loc, RelocInfo::CODE_TARGET), CONSTANT_SIZE);
+  __ Call(at);
 }


Index: src/mips64/assembler-mips64.cc
diff --git a/src/mips64/assembler-mips64.cc b/src/mips64/assembler-mips64.cc
index 9501371b6395dc787aaa8c03738d80864f6e6696..68573d795f8f726bdccad637c121b3847dbf79b0 100644 
--- a/src/mips64/assembler-mips64.cc
+++ b/src/mips64/assembler-mips64.cc
@@ -1413,6 +1413,7 @@ void Assembler::jal(int64_t target) {


 void Assembler::jalr(Register rs, Register rd) {
+  DCHECK(rs.code() != rd.code());
   BlockTrampolinePoolScope block_trampoline_pool(this);
   positions_recorder()->WriteRecordedPositions();
   GenInstrRegister(SPECIAL, rs, zero_reg, rd, 0, JALR);
Index: src/mips64/code-stubs-mips64.cc
diff --git a/src/mips64/code-stubs-mips64.cc b/src/mips64/code-stubs-mips64.cc index 560e2c6e4e8469682be8feb12fd3bd248580f875..7dc52d6cce001aeae31e23f2fcee0684702d7fe9 100644 
--- a/src/mips64/code-stubs-mips64.cc
+++ b/src/mips64/code-stubs-mips64.cc
@@ -4055,8 +4055,8 @@ void DirectCEntryStub::GenerateCall(MacroAssembler* masm, 
   intptr_t loc =
       reinterpret_cast<intptr_t>(GetCode().location());
   __ Move(t9, target);
-  __ li(ra, Operand(loc, RelocInfo::CODE_TARGET), CONSTANT_SIZE);
-  __ Call(ra);
+  __ li(at, Operand(loc, RelocInfo::CODE_TARGET), CONSTANT_SIZE);
+  __ Call(at);
 }


@@ -5288,9 +5288,9 @@ static void CallApiFunctionAndReturn(
   __ li(s3, Operand(next_address));
   __ ld(s0, MemOperand(s3, kNextOffset));
   __ ld(s1, MemOperand(s3, kLimitOffset));
-  __ ld(s2, MemOperand(s3, kLevelOffset));
-  __ Daddu(s2, s2, Operand(1));
-  __ sd(s2, MemOperand(s3, kLevelOffset));
+  __ lw(s2, MemOperand(s3, kLevelOffset));
+  __ Addu(s2, s2, Operand(1));
+  __ sw(s2, MemOperand(s3, kLevelOffset));

   if (FLAG_log_timer_events) {
     FrameScope frame(masm, StackFrame::MANUAL);
@@ -5331,11 +5331,11 @@ static void CallApiFunctionAndReturn(
   // previous handle scope.
   __ sd(s0, MemOperand(s3, kNextOffset));
   if (__ emit_debug_code()) {
-    __ ld(a1, MemOperand(s3, kLevelOffset));
+    __ lw(a1, MemOperand(s3, kLevelOffset));
     __ Check(eq, kUnexpectedLevelAfterReturnFromApiCall, a1, Operand(s2));
   }
-  __ Dsubu(s2, s2, Operand(1));
-  __ sd(s2, MemOperand(s3, kLevelOffset));
+  __ Subu(s2, s2, Operand(1));
+  __ sw(s2, MemOperand(s3, kLevelOffset));
   __ ld(at, MemOperand(s3, kLimitOffset));
   __ Branch(&delete_allocated_handles, ne, s1, Operand(at));

Index: test/mjsunit/mjsunit.status
diff --git a/test/mjsunit/mjsunit.status b/test/mjsunit/mjsunit.status
index 4b3ae5dd7c3e0d6332370cd4b4f8ba1fd3e71309..8e911ac17b156224229a5f2f759d91bb1ac94f91 100644 
--- a/test/mjsunit/mjsunit.status
+++ b/test/mjsunit/mjsunit.status
@@ -498,10 +498,6 @@
   'math-floor-of-div-minus-zero': [SKIP],
 }],  # 'arch == mips64el'

-['arch == mips64el and simulator_run == False', {
-  # Random failures on HW, need investigation.
-  'debug-*': [SKIP],
-}],
############################################################################## 
 ['system == windows', {
   # TODO(mstarzinger): Too slow with turbo fan.


--
--
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