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 1158044 - Remove unused TypeWrapper class and untemplatize/cleanup some code. r=bhackett

Browse Source
This commit is contained in:
Jan de Mooij 2015-05-26 15:18:12 +02:00
parent 1058157ec3
commit 8bffa60d02
2 changed files with 8 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
js/src/jit/MacroAssembler.cpp
View File

@ -29,45 +29,8 @@ using namespace js::jit;
using JS::GenericNaN;
using JS::ToInt32;
namespace {
// Emulate a TypeSet logic from a Type object to avoid duplicating the guard
// logic.
class TypeWrapper {
TypeSet::Type t_;
public:
explicit TypeWrapper(TypeSet::Type t) : t_(t) {}
inline bool unknown() const {
return t_.isUnknown();
}
inline bool hasType(TypeSet::Type t) const {
if (t == TypeSet::Int32Type())
return t == t_ || t_ == TypeSet::DoubleType();
return t == t_;
}
inline unsigned getObjectCount() const {
if (t_.isAnyObject() || t_.isUnknown() || !t_.isObject())
return 0;
return 1;
}
inline JSObject* getSingletonNoBarrier(unsigned) const {
if (t_.isSingleton())
return t_.singletonNoBarrier();
return nullptr;
}
inline ObjectGroup* getGroupNoBarrier(unsigned) const {
if (t_.isGroup())
return t_.groupNoBarrier();
return nullptr;
}
};
} /* anonymous namespace */
template <typename Source, typename Set> void
MacroAssembler::guardTypeSet(const Source& address, const Set *types, BarrierKind kind,
template <typename Source> void
MacroAssembler::guardTypeSet(const Source& address, const TypeSet *types, BarrierKind kind,
Register scratch, Label* miss)
{
MOZ_ASSERT(kind == BarrierKind::TypeTagOnly || kind == BarrierKind::TypeSet);
@ -164,8 +127,8 @@ MacroAssembler::guardTypeSetMightBeIncomplete(Register obj, Register scratch, La
scratch, Imm32(ObjectGroup::addendumOriginalUnboxedGroupValue()), label);
}
template <typename Set> void
MacroAssembler::guardObjectType(Register obj, const Set *types,
void
MacroAssembler::guardObjectType(Register obj, const TypeSet *types,
Register scratch, Label* miss)
{
MOZ_ASSERT(!types->unknown());
@ -236,47 +199,12 @@ MacroAssembler::guardObjectType(Register obj, const Set *types,
return;
}
template <typename Source> void
MacroAssembler::guardType(const Source& address, TypeSet::Type type,
Register scratch, Label* miss)
{
TypeWrapper wrapper(type);
guardTypeSet(address, &wrapper, BarrierKind::TypeSet, scratch, miss);
}
template void MacroAssembler::guardTypeSet(const Address& address, const TemporaryTypeSet* types,
BarrierKind kind, Register scratch, Label* miss);
template void MacroAssembler::guardTypeSet(const ValueOperand& value, const TemporaryTypeSet* types,
BarrierKind kind, Register scratch, Label* miss);
template void MacroAssembler::guardTypeSet(const Address& address, const HeapTypeSet* types,
BarrierKind kind, Register scratch, Label* miss);
template void MacroAssembler::guardTypeSet(const ValueOperand& value, const HeapTypeSet* types,
BarrierKind kind, Register scratch, Label* miss);
template void MacroAssembler::guardTypeSet(const TypedOrValueRegister& reg, const HeapTypeSet* types,
BarrierKind kind, Register scratch, Label* miss);
template void MacroAssembler::guardTypeSet(const Address& address, const TypeSet* types,
BarrierKind kind, Register scratch, Label* miss);
template void MacroAssembler::guardTypeSet(const ValueOperand& value, const TypeSet* types,
BarrierKind kind, Register scratch, Label* miss);
template void MacroAssembler::guardTypeSet(const Address& address, const TypeWrapper* types,
template void MacroAssembler::guardTypeSet(const TypedOrValueRegister& value, const TypeSet* types,
BarrierKind kind, Register scratch, Label* miss);
template void MacroAssembler::guardTypeSet(const ValueOperand& value, const TypeWrapper* types,
BarrierKind kind, Register scratch, Label* miss);
template void MacroAssembler::guardObjectType(Register obj, const TemporaryTypeSet* types,
Register scratch, Label* miss);
template void MacroAssembler::guardObjectType(Register obj, const TypeSet* types,
Register scratch, Label* miss);
template void MacroAssembler::guardObjectType(Register obj, const TypeWrapper* types,
Register scratch, Label* miss);
template void MacroAssembler::guardType(const Address& address, TypeSet::Type type,
Register scratch, Label* miss);
template void MacroAssembler::guardType(const ValueOperand& value, TypeSet::Type type,
Register scratch, Label* miss);
template<typename S, typename T>
static void

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

@ -331,12 +331,10 @@ class MacroAssembler : public MacroAssemblerSpecific
// Emits a test of a value against all types in a TypeSet. A scratch
// register is required.
template <typename Source, typename TypeSet>
void guardTypeSet(const Source& address, const TypeSet* types, BarrierKind kind, Register scratch, Label* miss);
template <typename TypeSet>
void guardObjectType(Register obj, const TypeSet* types, Register scratch, Label* miss);
template <typename Source>
void guardType(const Source& address, TypeSet::Type type, Register scratch, Label* miss);
void guardTypeSet(const Source& address, const TypeSet* types, BarrierKind kind, Register scratch, Label* miss);
void guardObjectType(Register obj, const TypeSet* types, Register scratch, Label* miss);
void guardTypeSetMightBeIncomplete(Register obj, Register scratch, Label* label);