Reviewers: Toon Verwaest,
Message:
Mac WebKit buildbot failed. I am afraid this is not caused by this commit
from
the log:
"
19:44:15.969 5627 Test configuration: <snowleopard, x86, release>
Content Shell Helper(5667,0xa0797540) malloc: *** error for object
0x692244a0:
pointer being freed was not allocated
"
It seems that this buildbot is for ia32 port, not x64 port.
Description:
Revert "Adjust various constants for x32 port"
This reverts commit r20420 for breaking the WebKit Mac buildbot.
Please review this at https://codereview.chromium.org/212223013/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+9, -13 lines):
M src/x64/assembler-x64-inl.h
M src/x64/code-stubs-x64.cc
M src/x64/full-codegen-x64.cc
Index: src/x64/assembler-x64-inl.h
diff --git a/src/x64/assembler-x64-inl.h b/src/x64/assembler-x64-inl.h
index
1c52f009441ca134011143d95108b630683ab56c..a559b62758ac88b4ff4ce0f6561cd96eefd172bb
100644
--- a/src/x64/assembler-x64-inl.h
+++ b/src/x64/assembler-x64-inl.h
@@ -43,8 +43,7 @@ namespace internal {
static const byte kCallOpcode = 0xE8;
-// The length of pushq(rbp), movp(rbp, rsp), Push(rsi) and Push(rdi).
-static const int kNoCodeAgeSequenceLength = kPointerSize == kInt64Size ?
6 : 17;
+static const int kNoCodeAgeSequenceLength = 6;
void Assembler::emitl(uint32_t x) {
Index: src/x64/code-stubs-x64.cc
diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc
index
11699e9f9c819471db0e745b91037c311fb9d5b7..f1c45c92b5a507665b226be666c95d0767d7b57a
100644
--- a/src/x64/code-stubs-x64.cc
+++ b/src/x64/code-stubs-x64.cc
@@ -2800,19 +2800,17 @@ void InstanceofStub::Generate(MacroAssembler* masm)
{
// indicate that the value is not an instance.
static const int kOffsetToMapCheckValue = 2;
- static const int kOffsetToResultValue = kPointerSize == kInt64Size ?
18 : 14;
+ static const int kOffsetToResultValue = 18;
// The last 4 bytes of the instruction sequence
- // movp(rdi, FieldOperand(rax, HeapObject::kMapOffset))
+ // movq(rdi, FieldOperand(rax, HeapObject::kMapOffset))
// Move(kScratchRegister, Factory::the_hole_value())
// in front of the hole value address.
- static const unsigned int kWordBeforeMapCheckValue =
- kPointerSize == kInt64Size ? 0xBA49FF78 : 0xBA41FF78;
+ static const unsigned int kWordBeforeMapCheckValue = 0xBA49FF78;
// The last 4 bytes of the instruction sequence
// __ j(not_equal, &cache_miss);
// __ LoadRoot(ToRegister(instr->result()),
Heap::kTheHoleValueRootIndex);
// before the offset of the hole value in the root array.
- static const unsigned int kWordBeforeResultValue =
- kPointerSize == kInt64Size ? 0x458B4906 : 0x458B4106;
+ static const unsigned int kWordBeforeResultValue = 0x458B4906;
// Only the inline check flag is supported on X64.
ASSERT(flags_ == kNoFlags || HasCallSiteInlineCheck());
int extra_argument_offset = HasCallSiteInlineCheck() ? 1 : 0;
Index: src/x64/full-codegen-x64.cc
diff --git a/src/x64/full-codegen-x64.cc b/src/x64/full-codegen-x64.cc
index
3d4c2a92e207891b48b6cc131f202d7d294e6739..97cd460eeba0de2b8525c7866fa7f84a9d7090fe
100644
--- a/src/x64/full-codegen-x64.cc
+++ b/src/x64/full-codegen-x64.cc
@@ -438,10 +438,9 @@ void FullCodeGenerator::EmitReturnSequence() {
#ifdef ENABLE_DEBUGGER_SUPPORT
// Add padding that will be overwritten by a debugger breakpoint. We
- // have just generated at least 7 bytes: "movp rsp, rbp; pop rbp; ret
k"
- // (3 + 1 + 3) for x64 and at least 6 (2 + 1 + 3) bytes for x32.
- const int kPadding = Assembler::kJSReturnSequenceLength -
- kPointerSize == kInt64Size ? 7 : 6;
+ // have just generated at least 7 bytes: "movq rsp, rbp; pop rbp; ret
k"
+ // (3 + 1 + 3).
+ const int kPadding = Assembler::kJSReturnSequenceLength - 7;
for (int i = 0; i < kPadding; ++i) {
masm_->int3();
}
@@ -4844,7 +4843,7 @@ FullCodeGenerator::NestedStatement*
FullCodeGenerator::TryFinally::Exit(
static const byte kJnsInstruction = 0x79;
-static const byte kJnsOffset = kPointerSize == kInt64Size ? 0x1d : 0x14;
+static const byte kJnsOffset = 0x1d;
static const byte kNopByteOne = 0x66;
static const byte kNopByteTwo = 0x90;
#ifdef DEBUG
--
--
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.
