Merge V8 5.1.281.59 DO NOT MERGE
Change-Id: Ic348288edb4e0d01ae307520606fbb3f35ec9049
(cherry picked from commit 1eae5e700a1e41eec085eac042831417f736879e)
(cherry picked from commit 85c91d5683431930be9abf06e6e21f29fb4eb7ac)
Bug: 31987131
Bug: 29178923
diff --git a/V8_MERGE_REVISION b/V8_MERGE_REVISION
index 56848e5..5278fb5 100644
--- a/V8_MERGE_REVISION
+++ b/V8_MERGE_REVISION
@@ -1,2 +1,2 @@
-v8 5.1.281.57
-https://chromium.googlesource.com/v8/v8/+/5.1.281.57
+v8 5.1.281.59
+https://chromium.googlesource.com/v8/v8/+/5.1.281.59
diff --git a/include/v8-version.h b/include/v8-version.h
index 2c6c726..545ec70 100644
--- a/include/v8-version.h
+++ b/include/v8-version.h
@@ -11,7 +11,7 @@
#define V8_MAJOR_VERSION 5
#define V8_MINOR_VERSION 1
#define V8_BUILD_NUMBER 281
-#define V8_PATCH_LEVEL 57
+#define V8_PATCH_LEVEL 59
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
diff --git a/src/compiler/s390/code-generator-s390.cc b/src/compiler/s390/code-generator-s390.cc
index 68c1d9d..1d96856 100644
--- a/src/compiler/s390/code-generator-s390.cc
+++ b/src/compiler/s390/code-generator-s390.cc
@@ -1307,8 +1307,8 @@
#endif
case kS390_Push:
if (instr->InputAt(0)->IsDoubleRegister()) {
- __ StoreDouble(i.InputDoubleRegister(0), MemOperand(sp, -kDoubleSize));
__ lay(sp, MemOperand(sp, -kDoubleSize));
+ __ StoreDouble(i.InputDoubleRegister(0), MemOperand(sp));
frame_access_state()->IncreaseSPDelta(kDoubleSize / kPointerSize);
} else {
__ Push(i.InputRegister(0));
@@ -1317,14 +1317,14 @@
break;
case kS390_PushFrame: {
int num_slots = i.InputInt32(1);
+ __ lay(sp, MemOperand(sp, -num_slots * kPointerSize));
if (instr->InputAt(0)->IsDoubleRegister()) {
__ StoreDouble(i.InputDoubleRegister(0),
- MemOperand(sp, -num_slots * kPointerSize));
+ MemOperand(sp));
} else {
__ StoreP(i.InputRegister(0),
- MemOperand(sp, -num_slots * kPointerSize));
+ MemOperand(sp));
}
- __ lay(sp, MemOperand(sp, -num_slots * kPointerSize));
break;
}
case kS390_StoreToStackSlot: {
@@ -1499,36 +1499,30 @@
__ ldebr(i.OutputDoubleRegister(), i.InputDoubleRegister(0));
break;
case kS390_DoubleExtractLowWord32:
- // TODO(john.yan): this can cause problem when interrupting,
- // use freg->greg instruction
- __ stdy(i.InputDoubleRegister(0), MemOperand(sp, -kDoubleSize));
- __ LoadlW(i.OutputRegister(),
- MemOperand(sp, -kDoubleSize + Register::kMantissaOffset));
+ __ lgdr(i.OutputRegister(), i.InputDoubleRegister(0));
+ __ llgfr(i.OutputRegister(), i.OutputRegister());
break;
case kS390_DoubleExtractHighWord32:
- // TODO(john.yan): this can cause problem when interrupting,
- // use freg->greg instruction
- __ stdy(i.InputDoubleRegister(0), MemOperand(sp, -kDoubleSize));
- __ LoadlW(i.OutputRegister(),
- MemOperand(sp, -kDoubleSize + Register::kExponentOffset));
+ __ lgdr(i.OutputRegister(), i.InputDoubleRegister(0));
+ __ srlg(i.OutputRegister(), i.OutputRegister(), Operand(32));
break;
case kS390_DoubleInsertLowWord32:
- __ InsertDoubleLow(i.OutputDoubleRegister(), i.InputRegister(1));
+ __ lgdr(kScratchReg, i.OutputDoubleRegister());
+ __ lr(kScratchReg, i.InputRegister(1));
+ __ ldgr(i.OutputDoubleRegister(), kScratchReg);
break;
case kS390_DoubleInsertHighWord32:
- __ InsertDoubleHigh(i.OutputDoubleRegister(), i.InputRegister(1));
+ __ sllg(kScratchReg, i.InputRegister(1), Operand(32));
+ __ lgdr(r0, i.OutputDoubleRegister());
+ __ lr(kScratchReg, r0);
+ __ ldgr(i.OutputDoubleRegister(), kScratchReg);
break;
case kS390_DoubleConstruct:
-// TODO(john.yan): this can cause problem when interrupting,
-// use greg->freg instruction
-#if V8_TARGET_LITTLE_ENDIAN
- __ StoreW(i.InputRegister(0), MemOperand(sp, -kDoubleSize / 2));
- __ StoreW(i.InputRegister(1), MemOperand(sp, -kDoubleSize));
-#else
- __ StoreW(i.InputRegister(1), MemOperand(sp, -kDoubleSize / 2));
- __ StoreW(i.InputRegister(0), MemOperand(sp, -kDoubleSize));
-#endif
- __ ldy(i.OutputDoubleRegister(), MemOperand(sp, -kDoubleSize));
+ __ sllg(kScratchReg, i.InputRegister(0), Operand(32));
+ __ lr(kScratchReg, i.InputRegister(1));
+
+ // Bitwise convert from GPR to FPR
+ __ ldgr(i.OutputDoubleRegister(), kScratchReg);
break;
case kS390_LoadWordS8:
ASSEMBLE_LOAD_INTEGER(LoadlB);
diff --git a/src/heap/spaces.cc b/src/heap/spaces.cc
index 63e7c33..a0a3752 100644
--- a/src/heap/spaces.cc
+++ b/src/heap/spaces.cc
@@ -792,7 +792,9 @@
const Address start = reinterpret_cast<Address>(chunk);
const Address area_start = start + MemoryChunk::kObjectStartOffset;
const Address area_end = start + size;
- CommitBlock(reinterpret_cast<Address>(chunk), size, NOT_EXECUTABLE);
+ if (!CommitBlock(reinterpret_cast<Address>(chunk), size, NOT_EXECUTABLE)) {
+ return nullptr;
+ }
base::VirtualMemory reservation(start, size);
MemoryChunk::Initialize(isolate_->heap(), start, size, area_start, area_end,
NOT_EXECUTABLE, owner, &reservation);
diff --git a/src/s390/macro-assembler-s390.cc b/src/s390/macro-assembler-s390.cc
index e6abf68..21058f4 100644
--- a/src/s390/macro-assembler-s390.cc
+++ b/src/s390/macro-assembler-s390.cc
@@ -205,26 +205,6 @@
}
}
-void MacroAssembler::InsertDoubleLow(DoubleRegister dst, Register src) {
- StoreDouble(dst, MemOperand(sp, -kDoubleSize));
-#if V8_TARGET_LITTLE_ENDIAN
- StoreW(src, MemOperand(sp, -kDoubleSize));
-#else
- StoreW(src, MemOperand(sp, -kDoubleSize / 2));
-#endif
- ldy(dst, MemOperand(sp, -kDoubleSize));
-}
-
-void MacroAssembler::InsertDoubleHigh(DoubleRegister dst, Register src) {
- StoreDouble(dst, MemOperand(sp, -kDoubleSize));
-#if V8_TARGET_LITTLE_ENDIAN
- StoreW(src, MemOperand(sp, -kDoubleSize / 2));
-#else
- StoreW(src, MemOperand(sp, -kDoubleSize));
-#endif
- ldy(dst, MemOperand(sp, -kDoubleSize));
-}
-
void MacroAssembler::MultiPush(RegList regs, Register location) {
int16_t num_to_push = NumberOfBitsSet(regs);
int16_t stack_offset = num_to_push * kPointerSize;
@@ -1113,9 +1093,8 @@
ClearRightImm(sp, sp, Operand(3)); // equivalent to &= -8
}
- StoreP(MemOperand(sp, -kNumRequiredStackFrameSlots * kPointerSize),
- Operand::Zero(), r0);
lay(sp, MemOperand(sp, -kNumRequiredStackFrameSlots * kPointerSize));
+ StoreP(MemOperand(sp), Operand::Zero(), r0);
// Set the exit frame sp value to point just before the return address
// location.
lay(r1, MemOperand(sp, kStackFrameSPSlot * kPointerSize));
@@ -2332,9 +2311,8 @@
}
void MacroAssembler::TestDoubleSign(DoubleRegister input, Register scratch) {
- stdy(input, MemOperand(sp, -kDoubleSize));
- LoadlW(scratch, MemOperand(sp, -kDoubleSize + Register::kExponentOffset));
- Cmp32(scratch, Operand::Zero());
+ lgdr(scratch, input);
+ cgfi(scratch, Operand::Zero());
}
void MacroAssembler::TestHeapNumberSign(Register input, Register scratch) {
@@ -2379,8 +2357,8 @@
Label exception;
// Move high word into input_high
- StoreDouble(double_input, MemOperand(sp, -kDoubleSize));
lay(sp, MemOperand(sp, -kDoubleSize));
+ StoreDouble(double_input, MemOperand(sp));
LoadlW(input_high, MemOperand(sp, Register::kExponentOffset));
la(sp, MemOperand(sp, kDoubleSize));
@@ -2446,8 +2424,8 @@
// If we fell through then inline version didn't succeed - call stub instead.
push(r14);
// Put input on stack.
- StoreDouble(double_input, MemOperand(sp, -kDoubleSize));
lay(sp, MemOperand(sp, -kDoubleSize));
+ StoreDouble(double_input, MemOperand(sp));
DoubleToIStub stub(isolate(), sp, result, 0, true, true);
CallStub(&stub);
@@ -5223,12 +5201,12 @@
// Shift right logical for 32-bit integer types.
void MacroAssembler::ShiftRight(Register dst, Register src, Register val) {
- DCHECK(!dst.is(val)); // The lr/srl path clobbers val.
if (dst.is(src)) {
srl(dst, val);
} else if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
srlk(dst, src, val);
} else {
+ DCHECK(!dst.is(val)); // The lr/srl path clobbers val.
lr(dst, src);
srl(dst, val);
}
@@ -5249,12 +5227,12 @@
// Shift left arithmetic for 32-bit integer types.
void MacroAssembler::ShiftLeftArith(Register dst, Register src, Register val) {
- DCHECK(!dst.is(val)); // The lr/sla path clobbers val.
if (dst.is(src)) {
sla(dst, val);
} else if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
slak(dst, src, val);
} else {
+ DCHECK(!dst.is(val)); // The lr/sla path clobbers val.
lr(dst, src);
sla(dst, val);
}
@@ -5275,12 +5253,12 @@
// Shift right arithmetic for 32-bit integer types.
void MacroAssembler::ShiftRightArith(Register dst, Register src, Register val) {
- DCHECK(!dst.is(val)); // The lr/sra path clobbers val.
if (dst.is(src)) {
sra(dst, val);
} else if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
srak(dst, src, val);
} else {
+ DCHECK(!dst.is(val)); // The lr/sra path clobbers val.
lr(dst, src);
sra(dst, val);
}
diff --git a/src/s390/macro-assembler-s390.h b/src/s390/macro-assembler-s390.h
index d8d543e..77fcccb 100644
--- a/src/s390/macro-assembler-s390.h
+++ b/src/s390/macro-assembler-s390.h
@@ -214,9 +214,6 @@
void Move(Register dst, Register src, Condition cond = al);
void Move(DoubleRegister dst, DoubleRegister src);
- void InsertDoubleLow(DoubleRegister dst, Register src);
- void InsertDoubleHigh(DoubleRegister dst, Register src);
-
void MultiPush(RegList regs, Register location = sp);
void MultiPop(RegList regs, Register location = sp);
