wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1245112 - Part 7: Move MacroAssembler::branchFloat into generic macro assembler. r=bbouvier

Browse Source
This commit is contained in:
Tooru Fujisawa 2016-02-15 23:01:49 +09:00
parent 23fe314b98
commit 69765774c0
15 changed files with 91 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/src/jit/MacroAssembler-inl.h
View File

@ -516,6 +516,15 @@ MacroAssembler::addStackPtrTo(T t)
#endif // !JS_CODEGEN_ARM64
void
MacroAssembler::canonicalizeFloat(FloatRegister reg)
{
Label notNaN;
branchFloat(DoubleOrdered, reg, reg, &notNaN);
loadConstantFloat32(float(JS::GenericNaN()), reg);
bind(&notNaN);
}
template <typename T>
void
MacroAssembler::storeObjectOrNull(Register src, const T& dest)

10
js/src/jit/MacroAssembler.h
View File

@ -841,6 +841,9 @@ class MacroAssembler : public MacroAssemblerSpecific
// boxed inside a js::Value, with a raw pointer (rhs).
inline void branchPrivatePtr(Condition cond, const Address& lhs, Register rhs, Label* label) PER_ARCH;
inline void branchFloat(DoubleCondition cond, FloatRegister lhs, FloatRegister rhs,
Label* label) PER_SHARED_ARCH;
template <class L>
inline void branchTest32(Condition cond, Register lhs, Register rhs, L label) PER_SHARED_ARCH;
template <class L>
@ -1122,12 +1125,7 @@ class MacroAssembler : public MacroAssemblerSpecific
bind(&notNaN);
}
void canonicalizeFloat(FloatRegister reg) {
Label notNaN;
branchFloat(DoubleOrdered, reg, reg, &notNaN);
loadConstantFloat32(float(JS::GenericNaN()), reg);
bind(&notNaN);
}
inline void canonicalizeFloat(FloatRegister reg);
template<typename T>
void loadFromTypedArray(Scalar::Type arrayType, const T& src, AnyRegister dest, Register temp, Label* fail,

24
js/src/jit/arm/MacroAssembler-arm-inl.h
View File

@ -575,6 +575,30 @@ MacroAssembler::branchPrivatePtr(Condition cond, const Address& lhs, Register rh
branchPtr(cond, lhs, rhs, label);
}
void
MacroAssembler::branchFloat(DoubleCondition cond, FloatRegister lhs, FloatRegister rhs,
Label* label)
{
compareFloat(lhs, rhs);
if (cond == DoubleNotEqual) {
// Force the unordered cases not to jump.
Label unordered;
ma_b(&unordered, VFP_Unordered);
ma_b(label, VFP_NotEqualOrUnordered);
bind(&unordered);
return;
}
if (cond == DoubleEqualOrUnordered) {
ma_b(label, VFP_Unordered);
ma_b(label, VFP_Equal);
return;
}
ma_b(label, ConditionFromDoubleCondition(cond));
}
template <class L>
void
MacroAssembler::branchTest32(Condition cond, Register lhs, Register rhs, L label)

24
js/src/jit/arm/MacroAssembler-arm.cpp
View File

@ -2539,30 +2539,6 @@ MacroAssemblerARMCompat::compareFloat(FloatRegister lhs, FloatRegister rhs)
as_vmrs(pc);
}
void
MacroAssemblerARMCompat::branchFloat(DoubleCondition cond, FloatRegister lhs,
FloatRegister rhs, Label* label)
{
compareFloat(lhs, rhs);
if (cond == DoubleNotEqual) {
// Force the unordered cases not to jump.
Label unordered;
ma_b(&unordered, VFP_Unordered);
ma_b(label, VFP_NotEqualOrUnordered);
bind(&unordered);
return;
}
if (cond == DoubleEqualOrUnordered) {
ma_b(label, VFP_Unordered);
ma_b(label, VFP_Equal);
return;
}
ma_b(label, ConditionFromDoubleCondition(cond));
}
Assembler::Condition
MacroAssemblerARMCompat::testInt32(Assembler::Condition cond, const ValueOperand& value)
{

2
js/src/jit/arm/MacroAssembler-arm.h
View File

@ -1456,8 +1456,6 @@ class MacroAssemblerARMCompat : public MacroAssemblerARM
Label* label);
void compareFloat(FloatRegister lhs, FloatRegister rhs);
void branchFloat(DoubleCondition cond, FloatRegister lhs, FloatRegister rhs,
Label* label);
void checkStackAlignment();

23
js/src/jit/arm64/MacroAssembler-arm64-inl.h
View File

@ -652,6 +652,29 @@ MacroAssembler::branchPrivatePtr(Condition cond, const Address& lhs, Register rh
branchPtr(cond, lhs, scratch, label);
}
void
MacroAssembler::branchFloat(DoubleCondition cond, FloatRegister lhs, FloatRegister rhs,
Label* label)
{
compareFloat(cond, lhs, rhs);
switch (cond) {
case DoubleNotEqual: {
Label unordered;
// not equal *and* ordered
branch(Overflow, &unordered);
branch(NotEqual, label);
bind(&unordered);
break;
}
case DoubleEqualOrUnordered:
branch(Overflow, label);
branch(Equal, label);
break;
default:
branch(Condition(cond), label);
}
}
template <class L>
void
MacroAssembler::branchTest32(Condition cond, Register lhs, Register rhs, L label)

19
js/src/jit/arm64/MacroAssembler-arm64.h
View File

@ -1620,25 +1620,6 @@ class MacroAssemblerCompat : public vixl::MacroAssembler
void compareFloat(DoubleCondition cond, FloatRegister lhs, FloatRegister rhs) {
Fcmp(ARMFPRegister(lhs, 32), ARMFPRegister(rhs, 32));
}
void branchFloat(DoubleCondition cond, FloatRegister lhs, FloatRegister rhs, Label* label) {
compareFloat(cond, lhs, rhs);
switch (cond) {
case DoubleNotEqual: {
Label unordered;
// not equal *and* ordered
branch(Overflow, &unordered);
branch(NotEqual, label);
bind(&unordered);
break;
}
case DoubleEqualOrUnordered:
branch(Overflow, label);
branch(Equal, label);
break;
default:
branch(Condition(cond), label);
}
}
void branchNegativeZero(FloatRegister reg, Register scratch, Label* label) {
MOZ_CRASH("branchNegativeZero");

7
js/src/jit/mips-shared/MacroAssembler-mips-shared-inl.h
View File

@ -345,6 +345,13 @@ MacroAssembler::branchPtr(Condition cond, wasm::SymbolicAddress lhs, Register rh
branchPtr(cond, SecondScratchReg, rhs, label);
}
void
MacroAssembler::branchFloat(DoubleCondition cond, FloatRegister lhs, FloatRegister rhs,
Label* label)
{
ma_bc1s(lhs, rhs, label, cond);
}
template <class L>
void
MacroAssembler::branchTest32(Condition cond, Register lhs, Register rhs, L label)

7
js/src/jit/mips32/MacroAssembler-mips32.cpp
View File

@ -1116,13 +1116,6 @@ MacroAssemblerMIPSCompat::branchDouble(DoubleCondition cond, FloatRegister lhs,
ma_bc1d(lhs, rhs, label, cond);
}
void
MacroAssemblerMIPSCompat::branchFloat(DoubleCondition cond, FloatRegister lhs,
FloatRegister rhs, Label* label)
{
ma_bc1s(lhs, rhs, label, cond);
}
// higher level tag testing code
Operand
MacroAssemblerMIPSCompat::ToPayload(Operand base)

3
js/src/jit/mips32/MacroAssembler-mips32.h
View File

@ -1078,9 +1078,6 @@ class MacroAssemblerMIPSCompat : public MacroAssemblerMIPS
void branchDouble(DoubleCondition cond, FloatRegister lhs, FloatRegister rhs,
Label* label);
void branchFloat(DoubleCondition cond, FloatRegister lhs, FloatRegister rhs,
Label* label);
void checkStackAlignment();
void alignStackPointer();

7
js/src/jit/mips64/MacroAssembler-mips64.cpp
View File

@ -1256,13 +1256,6 @@ MacroAssemblerMIPS64Compat::branchDouble(DoubleCondition cond, FloatRegister lhs
ma_bc1d(lhs, rhs, label, cond);
}
void
MacroAssemblerMIPS64Compat::branchFloat(DoubleCondition cond, FloatRegister lhs,
FloatRegister rhs, Label* label)
{
ma_bc1s(lhs, rhs, label, cond);
}
void
MacroAssemblerMIPS64Compat::branchTestGCThing(Condition cond, const Address& address, Label* label)
{

3
js/src/jit/mips64/MacroAssembler-mips64.h
View File

@ -1088,9 +1088,6 @@ class MacroAssemblerMIPS64Compat : public MacroAssemblerMIPS64
void branchDouble(DoubleCondition cond, FloatRegister lhs, FloatRegister rhs,
Label* label);
void branchFloat(DoubleCondition cond, FloatRegister lhs, FloatRegister rhs,
Label* label);
void checkStackAlignment();
static void calculateAlignedStackPointer(void** stackPointer);

1
js/src/jit/none/MacroAssembler-none.h
View File

@ -247,7 +247,6 @@ class MacroAssemblerNone : public Assembler
template <typename T, typename S> void branchAdd32(Condition, T, S, Label*) { MOZ_CRASH(); }
template <typename T, typename S> void branchSub32(Condition, T, S, Label*) { MOZ_CRASH(); }
template <typename T, typename S> void branchDouble(DoubleCondition, T, S, Label*) { MOZ_CRASH(); }
template <typename T, typename S> void branchFloat(DoubleCondition, T, S, Label*) { MOZ_CRASH(); }
template <typename T, typename S> void decBranchPtr(Condition, T, S, Label*) { MOZ_CRASH(); }
template <typename T, typename S> void mov(T, S) { MOZ_CRASH(); }
template <typename T, typename S> void movq(T, S) { MOZ_CRASH(); }

24
js/src/jit/x86-shared/MacroAssembler-x86-shared-inl.h
View File

@ -294,6 +294,30 @@ MacroAssembler::branchPtr(Condition cond, const Address& lhs, ImmWord rhs, Label
branchPtrImpl(cond, lhs, rhs, label);
}
void
MacroAssembler::branchFloat(DoubleCondition cond, FloatRegister lhs, FloatRegister rhs,
Label* label)
{
compareFloat(cond, lhs, rhs);
if (cond == DoubleEqual) {
Label unordered;
j(Parity, &unordered);
j(Equal, label);
bind(&unordered);
return;
}
if (cond == DoubleNotEqualOrUnordered) {
j(NotEqual, label);
j(Parity, label);
return;
}
MOZ_ASSERT(!(cond & DoubleConditionBitSpecial));
j(ConditionFromDoubleCondition(cond), label);
}
template <class L>
void
MacroAssembler::branchTest32(Condition cond, Register lhs, Register rhs, L label)

20
js/src/jit/x86-shared/MacroAssembler-x86-shared.h
View File

@ -136,26 +136,6 @@ class MacroAssemblerX86Shared : public Assembler
else
vucomiss(rhs, lhs);
}
void branchFloat(DoubleCondition cond, FloatRegister lhs, FloatRegister rhs, Label* label)
{
compareFloat(cond, lhs, rhs);
if (cond == DoubleEqual) {
Label unordered;
j(Parity, &unordered);
j(Equal, label);
bind(&unordered);
return;
}
if (cond == DoubleNotEqualOrUnordered) {
j(NotEqual, label);
j(Parity, label);
return;
}
MOZ_ASSERT(!(cond & DoubleConditionBitSpecial));
j(ConditionFromDoubleCondition(cond), label);
}
void branchNegativeZero(FloatRegister reg, Register scratch, Label* label, bool maybeNonZero = true);
void branchNegativeZeroFloat32(FloatRegister reg, Register scratch, Label* label);