From c93588f2e2e7077cd5e16f5498251c120a4f5c48 Mon Sep 17 00:00:00 2001 From: Makoto Kato Date: Sun, 19 Sep 2010 00:06:26 +0900 Subject: [PATCH] Bug 597288 - alignment on call stack isn't 16byte on x86_64 CPU. r=dvander --- js/src/methodjit/Compiler.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/src/methodjit/Compiler.cpp b/js/src/methodjit/Compiler.cpp index fecc1edd78c..396ac1b81ff 100644 --- a/js/src/methodjit/Compiler.cpp +++ b/js/src/methodjit/Compiler.cpp @@ -2041,8 +2041,8 @@ mjit::Compiler::inlineCallHelper(uint32 argc, bool callingNew) FrameAddress(offsetof(VMFrame, regs) + offsetof(JSFrameRegs, pc))); stubcc.masm.fixScriptStack(frame.frameDepth()); stubcc.masm.setupVMFrame(); -#if defined(JS_CPU_X86) || defined(JS_CPU_X64) - /* Need to stay 16-byte aligned on x86/x64. */ +#if defined(JS_CPU_X86) + /* Need to stay 16-byte aligned on x86. */ stubcc.masm.subPtr(Imm32(8), JSC::MacroAssembler::stackPointerRegister); #endif stubcc.masm.push(dataReg); @@ -2051,7 +2051,7 @@ mjit::Compiler::inlineCallHelper(uint32 argc, bool callingNew) stubcc.masm.wrapCall(pfun); stubcc.masm.pop(t0); stubcc.masm.pop(dataReg); -#if defined(JS_CPU_X86) || defined(JS_CPU_X64) +#if defined(JS_CPU_X86) stubcc.masm.addPtr(Imm32(8), JSC::MacroAssembler::stackPointerRegister); #endif }