Bug 50509 - set* methods on MacroAssembler are awfully named.
Rubber stamped by Oliver Hunt.
Methods set32 and setTest32 compare 32-bit operands, and set a 32-bit results based on the comparison.
set8 compares 32-bit operands, and sets an 8-bit result based on the comparison.
setTest8 compares 8-bit operands, and sets a 32-bit result based on the comparison.
Rename to clarify.
set32 -> set32Compare32
setTest32 -> set32Test32
set8 -> set8Compare32
setTest8 -> set32Test8
* assembler/MacroAssembler.h:
(JSC::MacroAssembler::setPtr):
* assembler/MacroAssemblerARM.h:
(JSC::MacroAssemblerARM::set32Compare32):
(JSC::MacroAssemblerARM::set8Compare32):
(JSC::MacroAssemblerARM::set32Test32):
(JSC::MacroAssemblerARM::set32Test8):
* assembler/MacroAssemblerARMv7.h:
(JSC::MacroAssemblerARMv7::set32Compare32):
(JSC::MacroAssemblerARMv7::set8Compare32):
(JSC::MacroAssemblerARMv7::set32Test32):
(JSC::MacroAssemblerARMv7::set32Test8):
* assembler/MacroAssemblerMIPS.h:
(JSC::MacroAssemblerMIPS::set8Compare32):
(JSC::MacroAssemblerMIPS::set32Compare32):
(JSC::MacroAssemblerMIPS::set32Test8):
(JSC::MacroAssemblerMIPS::set32Test32):
* assembler/MacroAssemblerX86Common.h:
(JSC::MacroAssemblerX86Common::set8Compare32):
(JSC::MacroAssemblerX86Common::set32Compare32):
(JSC::MacroAssemblerX86Common::set32Test8):
(JSC::MacroAssemblerX86Common::set32Test32):
* jit/JITOpcodes.cpp:
(JSC::JIT::emit_op_eq):
(JSC::JIT::emit_op_neq):
(JSC::JIT::compileOpStrictEq):
(JSC::JIT::emit_op_eq_null):
(JSC::JIT::emit_op_neq_null):
* jit/JITOpcodes32_64.cpp:
(JSC::JIT::emit_op_eq):
(JSC::JIT::emit_op_neq):
(JSC::JIT::compileOpStrictEq):
(JSC::JIT::emit_op_eq_null):
(JSC::JIT::emit_op_neq_null):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73323 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/assembler/MacroAssemblerARM.h b/JavaScriptCore/assembler/MacroAssemblerARM.h
index c51686a..73390f8 100644
--- a/JavaScriptCore/assembler/MacroAssemblerARM.h
+++ b/JavaScriptCore/assembler/MacroAssemblerARM.h
@@ -628,40 +628,40 @@
m_assembler.bx(linkRegister);
}
- void set32(Condition cond, RegisterID left, RegisterID right, RegisterID dest)
+ void set32Compare32(Condition cond, RegisterID left, RegisterID right, RegisterID dest)
{
m_assembler.cmp_r(left, right);
m_assembler.mov_r(dest, ARMAssembler::getOp2(0));
m_assembler.mov_r(dest, ARMAssembler::getOp2(1), ARMCondition(cond));
}
- void set32(Condition cond, RegisterID left, Imm32 right, RegisterID dest)
+ void set32Compare32(Condition cond, RegisterID left, Imm32 right, RegisterID dest)
{
m_assembler.cmp_r(left, m_assembler.getImm(right.m_value, ARMRegisters::S0));
m_assembler.mov_r(dest, ARMAssembler::getOp2(0));
m_assembler.mov_r(dest, ARMAssembler::getOp2(1), ARMCondition(cond));
}
- void set8(Condition cond, RegisterID left, RegisterID right, RegisterID dest)
+ void set8Compare32(Condition cond, RegisterID left, RegisterID right, RegisterID dest)
{
// ARM doesn't have byte registers
- set32(cond, left, right, dest);
+ set32Compare32(cond, left, right, dest);
}
- void set8(Condition cond, Address left, RegisterID right, RegisterID dest)
+ void set8Compare32(Condition cond, Address left, RegisterID right, RegisterID dest)
{
// ARM doesn't have byte registers
load32(left, ARMRegisters::S1);
- set32(cond, ARMRegisters::S1, right, dest);
+ set32Compare32(cond, ARMRegisters::S1, right, dest);
}
- void set8(Condition cond, RegisterID left, Imm32 right, RegisterID dest)
+ void set8Compare32(Condition cond, RegisterID left, Imm32 right, RegisterID dest)
{
// ARM doesn't have byte registers
- set32(cond, left, right, dest);
+ set32Compare32(cond, left, right, dest);
}
- void setTest32(Condition cond, Address address, Imm32 mask, RegisterID dest)
+ void set32Test32(Condition cond, Address address, Imm32 mask, RegisterID dest)
{
load32(address, ARMRegisters::S1);
if (mask.m_value == -1)
@@ -672,10 +672,10 @@
m_assembler.mov_r(dest, ARMAssembler::getOp2(1), ARMCondition(cond));
}
- void setTest8(Condition cond, Address address, Imm32 mask, RegisterID dest)
+ void set32Test8(Condition cond, Address address, Imm32 mask, RegisterID dest)
{
// ARM doesn't have byte registers
- setTest32(cond, address, mask, dest);
+ set32Test32(cond, address, mask, dest);
}
void add32(Imm32 imm, RegisterID src, RegisterID dest)
