Reviewers: Benedikt Meurer,
Description:
TF: Clear upper bits of ConvertFloat64ToUint32 because Win64.
[email protected]
BUG=
Please review this at https://codereview.chromium.org/436623002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+23, -16 lines):
M src/compiler/x64/code-generator-x64.cc
M src/compiler/x64/linkage-x64.cc
Index: src/compiler/x64/code-generator-x64.cc
diff --git a/src/compiler/x64/code-generator-x64.cc
b/src/compiler/x64/code-generator-x64.cc
index
abe921b045f0a69596a8ddb5e8094de9a88b54e6..dd97bb338ffbfb1cb91713c6f9a7eba27888763c
100644
--- a/src/compiler/x64/code-generator-x64.cc
+++ b/src/compiler/x64/code-generator-x64.cc
@@ -496,6 +496,9 @@ void
CodeGenerator::AssembleArchInstruction(Instruction* instr) {
case kSSEFloat64ToUint32: {
// TODO(turbofan): X64 SSE cvttsd2siq should support operands.
__ cvttsd2siq(i.OutputRegister(), i.InputDoubleRegister(0));
+ __ andl(i.OutputRegister(), i.OutputRegister()); // clear upper
bits.
+ // TODO(turbofan): generated code should not look at the upper 32
bits
+ // of the result, but those bits could escape to the outside world.
break;
}
case kSSEInt32ToFloat64: {
Index: src/compiler/x64/linkage-x64.cc
diff --git a/src/compiler/x64/linkage-x64.cc
b/src/compiler/x64/linkage-x64.cc
index
3a92bb16c7a1a8abef0faa1f714f5c3de259a65c..7d34ef2cfae42b602fe2ce5105f790897c52cc92
100644
--- a/src/compiler/x64/linkage-x64.cc
+++ b/src/compiler/x64/linkage-x64.cc
@@ -14,6 +14,12 @@ namespace v8 {
namespace internal {
namespace compiler {
+#ifdef _WIN64
+const bool kWin64 = true;
+#else
+const bool kWin64 = false;
+#endif
+
struct LinkageHelperTraits {
static Register ReturnValueReg() { return rax; }
static Register ReturnValue2Reg() { return rdx; }
@@ -21,26 +27,24 @@ struct LinkageHelperTraits {
static Register ContextReg() { return rsi; }
static Register RuntimeCallFunctionReg() { return rbx; }
static Register RuntimeCallArgCountReg() { return rax; }
-#ifdef _WIN64
static RegList CCalleeSaveRegisters() {
- return rbx.bit() | rdi.bit() | rsi.bit() | r12.bit() | r13.bit() |
- r14.bit() | r15.bit();
+ if (kWin64) {
+ return rbx.bit() | rdi.bit() | rsi.bit() | r12.bit() | r13.bit() |
+ r14.bit() | r15.bit();
+ } else {
+ return rbx.bit() | r12.bit() | r13.bit() | r14.bit() | r15.bit();
+ }
}
static Register CRegisterParameter(int i) {
- static Register register_parameters[] = {rcx, rdx, r8, r9};
- return register_parameters[i];
+ if (kWin64) {
+ static Register register_parameters[] = {rcx, rdx, r8, r9};
+ return register_parameters[i];
+ } else {
+ static Register register_parameters[] = {rdi, rsi, rdx, rcx, r8, r9};
+ return register_parameters[i];
+ }
}
- static int CRegisterParametersLength() { return 4; }
-#else
- static RegList CCalleeSaveRegisters() {
- return rbx.bit() | r12.bit() | r13.bit() | r14.bit() | r15.bit();
- }
- static Register CRegisterParameter(int i) {
- static Register register_parameters[] = {rdi, rsi, rdx, rcx, r8, r9};
- return register_parameters[i];
- }
- static int CRegisterParametersLength() { return 6; }
-#endif
+ static int CRegisterParametersLength() { return kWin64 ? 4 : 6; }
};
--
--
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.
