Skip to content

Commit 5294919

Browse files
Junliang YanBethGriggs
Junliang Yan
authored andcommitted
deps: V8: cherry-pick 9040405 from upstream
Original commit message: s390x: fix high 32-bit word corruption issue R=joransiu@ca.ibm.com Change-Id: I9a2cf0f3e4a33dc4b86c83acfefcd27968bbcdb4 Reviewed-on: https://chromium-review.googlesource.com/1176424 Reviewed-by: Joran Siu <joransiu@ca.ibm.com> Commit-Queue: Junliang Yan <jyan@ca.ibm.com> Cr-Commit-Position: refs/heads/master@{#55143} Refs: v8/v8@ca95cd9 PR-URL: #22375 Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
1 parent 01e2eba commit 5294919

File tree

3 files changed

+19
-7
lines changed

3 files changed

+19
-7
lines changed

deps/v8/include/v8-version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define V8_MAJOR_VERSION 6
1212
#define V8_MINOR_VERSION 2
1313
#define V8_BUILD_NUMBER 414
14-
#define V8_PATCH_LEVEL 65
14+
#define V8_PATCH_LEVEL 66
1515

1616
// Use 1 for candidates and 0 otherwise.
1717
// (Boolean macro values are not supported by all preprocessors.)

deps/v8/src/compiler/s390/instruction-selector-s390.cc

+6-6
Original file line numberDiff line numberDiff line change
@@ -318,12 +318,12 @@ ArchOpcode SelectLoadOpcode(Node* node) {
318318
/* Float unary op*/ \
319319
V(BitcastFloat32ToInt32) \
320320
/* V(TruncateFloat64ToWord32) */ \
321-
/* V(RoundFloat64ToInt32) */ \
322-
/* V(TruncateFloat32ToInt32) */ \
323-
/* V(TruncateFloat32ToUint32) */ \
324-
/* V(TruncateFloat64ToUint32) */ \
325-
/* V(ChangeFloat64ToInt32) */ \
326-
/* V(ChangeFloat64ToUint32) */ \
321+
V(RoundFloat64ToInt32) \
322+
V(TruncateFloat32ToInt32) \
323+
V(TruncateFloat32ToUint32) \
324+
V(TruncateFloat64ToUint32) \
325+
V(ChangeFloat64ToInt32) \
326+
V(ChangeFloat64ToUint32) \
327327
/* Word32 unary op */ \
328328
V(Word32Clz) \
329329
V(Word32Popcnt) \

deps/v8/src/s390/macro-assembler-s390.cc

+12
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,9 @@ void TurboAssembler::ConvertDoubleToInt32(const Register dst,
704704
UNIMPLEMENTED();
705705
break;
706706
}
707+
#ifdef V8_TARGET_ARCH_S390X
708+
lghi(dst, Operand::Zero());
709+
#endif
707710
cfdbr(m, dst, double_input);
708711
}
709712

@@ -728,6 +731,9 @@ void TurboAssembler::ConvertFloat32ToInt32(const Register result,
728731
UNIMPLEMENTED();
729732
break;
730733
}
734+
#ifdef V8_TARGET_ARCH_S390X
735+
lghi(result, Operand::Zero());
736+
#endif
731737
cfebr(m, result, double_input);
732738
}
733739

@@ -752,6 +758,9 @@ void TurboAssembler::ConvertFloat32ToUnsignedInt32(
752758
UNIMPLEMENTED();
753759
break;
754760
}
761+
#ifdef V8_TARGET_ARCH_S390X
762+
lghi(result, Operand::Zero());
763+
#endif
755764
clfebr(m, Condition(0), result, double_input);
756765
}
757766

@@ -824,6 +833,9 @@ void TurboAssembler::ConvertDoubleToUnsignedInt32(
824833
UNIMPLEMENTED();
825834
break;
826835
}
836+
#ifdef V8_TARGET_ARCH_S390X
837+
lghi(dst, Operand::Zero());
838+
#endif
827839
clfdbr(m, Condition(0), dst, double_input);
828840
}
829841

0 commit comments

Comments
 (0)