Bug 1199719 part 6 - Move MacroAssembler::xor32 into the generic macro assembler. r=jandem

This commit is contained in:
Nicolas B. Pierron 2015-09-11 13:47:54 +02:00
parent bc4d773a3f
commit 1e88d14e73
12 changed files with 33 additions and 24 deletions

View File

@ -685,6 +685,9 @@ class MacroAssembler : public MacroAssemblerSpecific
inline void orPtr(Register src, Register dest) PER_ARCH;
inline void orPtr(Imm32 imm, Register dest) PER_ARCH;
inline void xor32(Register src, Register dest) DEFINED_ON(x86_shared);
inline void xor32(Imm32 imm, Register dest) PER_SHARED_ARCH;
//}}} check_macroassembler_style
public:

View File

@ -90,6 +90,12 @@ MacroAssembler::orPtr(Imm32 imm, Register dest)
ma_orr(imm, dest);
}
void
MacroAssembler::xor32(Imm32 imm, Register dest)
{
ma_eor(imm, dest, SetCC);
}
//}}} check_macroassembler_style
// ===============================================================

View File

@ -1912,12 +1912,6 @@ MacroAssemblerARMCompat::add32(Imm32 imm, Register dest)
ma_add(imm, dest, SetCC);
}
void
MacroAssemblerARMCompat::xor32(Imm32 imm, Register dest)
{
ma_eor(imm, dest, SetCC);
}
void
MacroAssemblerARMCompat::add32(Imm32 imm, const Address& dest)
{

View File

@ -1200,7 +1200,6 @@ class MacroAssemblerARMCompat : public MacroAssemblerARM
sub32(src, dest);
j(cond, label);
}
void xor32(Imm32 imm, Register dest);
void xorPtr(Imm32 imm, Register dest);
void xorPtr(Register src, Register dest);

View File

@ -102,6 +102,12 @@ MacroAssembler::orPtr(Imm32 imm, Register dest)
Orr(ARMRegister(dest, 64), ARMRegister(dest, 64), Operand(imm.value));
}
void
MacroAssembler::xor32(Imm32 imm, Register dest)
{
Eor(ARMRegister(dest, 32), ARMRegister(dest, 32), Operand(imm.value));
}
//}}} check_macroassembler_style
// ===============================================================

View File

@ -1081,9 +1081,6 @@ class MacroAssemblerCompat : public vixl::MacroAssembler
void xorPtr(Imm32 imm, Register dest) {
Eor(ARMRegister(dest, 64), ARMRegister(dest, 64), Operand(imm.value));
}
void xor32(Imm32 imm, Register dest) {
Eor(ARMRegister(dest, 32), ARMRegister(dest, 32), Operand(imm.value));
}
void xorPtr(Register src, Register dest) {
Eor(ARMRegister(dest, 64), ARMRegister(dest, 64), Operand(ARMRegister(src, 64)));

View File

@ -87,6 +87,12 @@ MacroAssembler::orPtr(Imm32 imm, Register dest)
ma_or(dest, imm);
}
void
MacroAssembler::xor32(Imm32 imm, Register dest)
{
ma_xor(dest, imm);
}
//}}} check_macroassembler_style
// ===============================================================

View File

@ -1573,12 +1573,6 @@ MacroAssemblerMIPSCompat::not32(Register reg)
}
// Logical operations
void
MacroAssemblerMIPSCompat::xor32(Imm32 imm, Register dest)
{
ma_xor(dest, imm);
}
void
MacroAssemblerMIPSCompat::xorPtr(Imm32 imm, Register dest)
{

View File

@ -1131,7 +1131,6 @@ class MacroAssemblerMIPSCompat : public MacroAssemblerMIPS
}
}
void xor32(Imm32 imm, Register dest);
void xorPtr(Imm32 imm, Register dest);
void xorPtr(Register src, Register dest);
void addPtr(Register src, Register dest);

View File

@ -426,7 +426,6 @@ class MacroAssemblerNone : public Assembler
void rshiftPtrArithmetic(Imm32, Register) { MOZ_CRASH(); }
void lshiftPtr(Imm32, Register) { MOZ_CRASH(); }
template <typename T, typename S> void xorPtr(T, S) { MOZ_CRASH(); }
template <typename T, typename S> void xor32(T, S) { MOZ_CRASH(); }
template <typename T> void not32(T) { MOZ_CRASH(); }
void convertUInt32ToDouble(Register, FloatRegister) { MOZ_CRASH(); }
void convertUInt32ToFloat32(Register, FloatRegister) { MOZ_CRASH(); }

View File

@ -58,6 +58,18 @@ MacroAssembler::or32(Imm32 imm, const Address& dest)
orl(imm, Operand(dest));
}
void
MacroAssembler::xor32(Register src, Register dest)
{
xorl(src, dest);
}
void
MacroAssembler::xor32(Imm32 imm, Register dest)
{
xorl(imm, dest);
}
//}}} check_macroassembler_style
// ===============================================================

View File

@ -190,12 +190,6 @@ class MacroAssemblerX86Shared : public Assembler
sub32(src, dest);
j(cond, label);
}
void xor32(Imm32 imm, Register dest) {
xorl(imm, dest);
}
void xor32(Register src, Register dest) {
xorl(src, dest);
}
void not32(Register reg) {
notl(reg);
}