Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (159854 => 159855)
--- trunk/Source/_javascript_Core/ChangeLog 2013-11-28 19:43:50 UTC (rev 159854)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-11-28 20:33:44 UTC (rev 159855)
@@ -1,3 +1,25 @@
+2013-11-28 Nadav Rotem <nro...@apple.com>
+
+ Revert the X86 assembler peephole changes
+ https://bugs.webkit.org/show_bug.cgi?id=124988
+
+ Reviewed by Csaba Osztrogonác.
+
+ * assembler/MacroAssemblerX86.h:
+ (JSC::MacroAssemblerX86::add32):
+ (JSC::MacroAssemblerX86::add64):
+ (JSC::MacroAssemblerX86::or32):
+ * assembler/MacroAssemblerX86Common.h:
+ (JSC::MacroAssemblerX86Common::add32):
+ (JSC::MacroAssemblerX86Common::or32):
+ (JSC::MacroAssemblerX86Common::branchAdd32):
+ * assembler/MacroAssemblerX86_64.h:
+ (JSC::MacroAssemblerX86_64::add32):
+ (JSC::MacroAssemblerX86_64::or32):
+ (JSC::MacroAssemblerX86_64::add64):
+ (JSC::MacroAssemblerX86_64::or64):
+ (JSC::MacroAssemblerX86_64::xor64):
+
2013-11-28 Antti Koivisto <an...@apple.com>
Remove feature: CSS variables
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerX86.h (159854 => 159855)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerX86.h 2013-11-28 19:43:50 UTC (rev 159854)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerX86.h 2013-11-28 20:33:44 UTC (rev 159855)
@@ -62,14 +62,12 @@
void add32(TrustedImm32 imm, RegisterID src, RegisterID dest)
{
- if (imm.m_value)
- m_assembler.leal_mr(imm.m_value, src, dest);
+ m_assembler.leal_mr(imm.m_value, src, dest);
}
void add32(TrustedImm32 imm, AbsoluteAddress address)
{
- if (imm.m_value)
- m_assembler.addl_im(imm.m_value, address.m_ptr);
+ m_assembler.addl_im(imm.m_value, address.m_ptr);
}
void add32(AbsoluteAddress address, RegisterID dest)
@@ -79,8 +77,6 @@
void add64(TrustedImm32 imm, AbsoluteAddress address)
{
- if (!imm.m_value)
- return;
m_assembler.addl_im(imm.m_value, address.m_ptr);
m_assembler.adcl_im(imm.m_value >> 31, reinterpret_cast<const char*>(address.m_ptr) + sizeof(int32_t));
}
@@ -92,8 +88,7 @@
void or32(TrustedImm32 imm, AbsoluteAddress address)
{
- if (imm.m_value)
- m_assembler.orl_im(imm.m_value, address.m_ptr);
+ m_assembler.orl_im(imm.m_value, address.m_ptr);
}
void or32(RegisterID reg, AbsoluteAddress address)
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h (159854 => 159855)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h 2013-11-28 19:43:50 UTC (rev 159854)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h 2013-11-28 20:33:44 UTC (rev 159855)
@@ -114,14 +114,11 @@
void add32(TrustedImm32 imm, Address address)
{
- if (imm.m_value)
- m_assembler.addl_im(imm.m_value, address.offset, address.base);
+ m_assembler.addl_im(imm.m_value, address.offset, address.base);
}
void add32(TrustedImm32 imm, RegisterID dest)
{
- if (!imm.m_value)
- return;
if (imm.m_value == 1)
m_assembler.inc_r(dest);
else
@@ -140,8 +137,7 @@
void add32(TrustedImm32 imm, RegisterID src, RegisterID dest)
{
- if (imm.m_value)
- m_assembler.leal_mr(imm.m_value, src, dest);
+ m_assembler.leal_mr(imm.m_value, src, dest);
}
void and32(RegisterID src, RegisterID dest)
@@ -256,8 +252,7 @@
void or32(TrustedImm32 imm, RegisterID dest)
{
- if (imm.m_value)
- m_assembler.orl_ir(imm.m_value, dest);
+ m_assembler.orl_ir(imm.m_value, dest);
}
void or32(RegisterID src, Address dest)
@@ -272,8 +267,7 @@
void or32(TrustedImm32 imm, Address address)
{
- if (imm.m_value)
- m_assembler.orl_im(imm.m_value, address.offset, address.base);
+ m_assembler.orl_im(imm.m_value, address.offset, address.base);
}
void or32(RegisterID op1, RegisterID op2, RegisterID dest)
@@ -1243,34 +1237,31 @@
Jump branchAdd32(ResultCondition cond, RegisterID src, RegisterID dest)
{
- m_assembler.addl_rr(src, dest);
+ add32(src, dest);
return Jump(m_assembler.jCC(x86Condition(cond)));
}
Jump branchAdd32(ResultCondition cond, TrustedImm32 imm, RegisterID dest)
{
- if (imm.m_value == 1)
- m_assembler.inc_r(dest);
- else
- m_assembler.addl_ir(imm.m_value, dest);
+ add32(imm, dest);
return Jump(m_assembler.jCC(x86Condition(cond)));
}
Jump branchAdd32(ResultCondition cond, TrustedImm32 src, Address dest)
{
- m_assembler.addl_im(src.m_value, dest.offset, dest.base);
+ add32(src, dest);
return Jump(m_assembler.jCC(x86Condition(cond)));
}
Jump branchAdd32(ResultCondition cond, RegisterID src, Address dest)
{
- m_assembler.addl_rm(src, dest.offset, dest.base);
+ add32(src, dest);
return Jump(m_assembler.jCC(x86Condition(cond)));
}
Jump branchAdd32(ResultCondition cond, Address src, RegisterID dest)
{
- m_assembler.addl_mr(src.offset, src.base, dest);
+ add32(src, dest);
return Jump(m_assembler.jCC(x86Condition(cond)));
}
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerX86_64.h (159854 => 159855)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerX86_64.h 2013-11-28 19:43:50 UTC (rev 159854)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerX86_64.h 2013-11-28 20:33:44 UTC (rev 159855)
@@ -59,8 +59,6 @@
void add32(TrustedImm32 imm, AbsoluteAddress address)
{
- if (!imm.m_value)
- return;
move(TrustedImmPtr(address.m_ptr), scratchRegister);
add32(imm, Address(scratchRegister));
}
@@ -79,8 +77,6 @@
void or32(TrustedImm32 imm, AbsoluteAddress address)
{
- if (!imm.m_value)
- return;
move(TrustedImmPtr(address.m_ptr), scratchRegister);
or32(imm, Address(scratchRegister));
}
@@ -200,8 +196,6 @@
void add64(TrustedImm32 imm, RegisterID srcDest)
{
- if (!imm.m_value)
- return;
if (imm.m_value == 1)
m_assembler.incq_r(srcDest);
else
@@ -210,8 +204,6 @@
void add64(TrustedImm64 imm, RegisterID dest)
{
- if (!imm.m_value)
- return;
if (imm.m_value == 1)
m_assembler.incq_r(dest);
else {
@@ -222,20 +214,16 @@
void add64(TrustedImm32 imm, RegisterID src, RegisterID dest)
{
- if (imm.m_value)
- m_assembler.leaq_mr(imm.m_value, src, dest);
+ m_assembler.leaq_mr(imm.m_value, src, dest);
}
void add64(TrustedImm32 imm, Address address)
{
- if (imm.m_value)
- m_assembler.addq_im(imm.m_value, address.offset, address.base);
+ m_assembler.addq_im(imm.m_value, address.offset, address.base);
}
void add64(TrustedImm32 imm, AbsoluteAddress address)
{
- if (!imm.m_value)
- return;
move(TrustedImmPtr(address.m_ptr), scratchRegister);
add64(imm, Address(scratchRegister));
}
@@ -283,16 +271,13 @@
void or64(TrustedImm64 imm, RegisterID dest)
{
- if (!imm.m_value)
- return;
move(imm, scratchRegister);
or64(scratchRegister, dest);
}
void or64(TrustedImm32 imm, RegisterID dest)
{
- if (imm.m_value)
- m_assembler.orq_ir(imm.m_value, dest);
+ m_assembler.orq_ir(imm.m_value, dest);
}
void or64(RegisterID op1, RegisterID op2, RegisterID dest)
@@ -309,8 +294,6 @@
void or64(TrustedImm32 imm, RegisterID src, RegisterID dest)
{
- if (!imm.m_value)
- return;
move(src, dest);
or64(imm, dest);
}
@@ -355,8 +338,7 @@
void xor64(TrustedImm32 imm, RegisterID srcDest)
{
- if (imm.m_value)
- m_assembler.xorq_ir(imm.m_value, srcDest);
+ m_assembler.xorq_ir(imm.m_value, srcDest);
}
void load64(ImplicitAddress address, RegisterID dest)
