Modified: trunk/Source/_javascript_Core/bytecode/Instruction.h (143389 => 143390)
--- trunk/Source/_javascript_Core/bytecode/Instruction.h 2013-02-19 23:04:34 UTC (rev 143389)
+++ trunk/Source/_javascript_Core/bytecode/Instruction.h 2013-02-19 23:10:35 UTC (rev 143390)
@@ -43,198 +43,198 @@
namespace JSC {
- // *Sigh*, If the JIT is enabled we need to track the stubRountine (of type CodeLocationLabel),
- // If the JIT is not in use we don't actually need the variable (that said, if the JIT is not in use we don't
- // curently actually use PolymorphicAccessStructureLists, which we should). Anyway, this seems like the best
- // solution for now - will need to something smarter if/when we actually want mixed-mode operation.
+// *Sigh*, If the JIT is enabled we need to track the stubRountine (of type CodeLocationLabel),
+// If the JIT is not in use we don't actually need the variable (that said, if the JIT is not in use we don't
+// curently actually use PolymorphicAccessStructureLists, which we should). Anyway, this seems like the best
+// solution for now - will need to something smarter if/when we actually want mixed-mode operation.
- class ArrayAllocationProfile;
- class ArrayProfile;
- class JSCell;
- class ObjectAllocationProfile;
- class Structure;
- class StructureChain;
- struct LLIntCallLinkInfo;
- struct ValueProfile;
+class ArrayAllocationProfile;
+class ArrayProfile;
+class JSCell;
+class ObjectAllocationProfile;
+class Structure;
+class StructureChain;
+struct LLIntCallLinkInfo;
+struct ValueProfile;
#if ENABLE(JIT)
- // Structure used by op_get_by_id_self_list and op_get_by_id_proto_list instruction to hold data off the main opcode stream.
- struct PolymorphicAccessStructureList {
- WTF_MAKE_FAST_ALLOCATED;
- public:
- struct PolymorphicStubInfo {
- bool isChain;
- bool isDirect;
- RefPtr<JITStubRoutine> stubRoutine;
- WriteBarrier<Structure> base;
- union {
- WriteBarrierBase<Structure> proto;
- WriteBarrierBase<StructureChain> chain;
- } u;
+// Structure used by op_get_by_id_self_list and op_get_by_id_proto_list instruction to hold data off the main opcode stream.
+struct PolymorphicAccessStructureList {
+ WTF_MAKE_FAST_ALLOCATED;
+public:
+ struct PolymorphicStubInfo {
+ bool isChain;
+ bool isDirect;
+ RefPtr<JITStubRoutine> stubRoutine;
+ WriteBarrier<Structure> base;
+ union {
+ WriteBarrierBase<Structure> proto;
+ WriteBarrierBase<StructureChain> chain;
+ } u;
- PolymorphicStubInfo()
- {
- u.proto.clear();
- }
-
- void set(JSGlobalData& globalData, JSCell* owner, PassRefPtr<JITStubRoutine> _stubRoutine, Structure* _base, bool isDirect)
- {
- stubRoutine = _stubRoutine;
- base.set(globalData, owner, _base);
- u.proto.clear();
- isChain = false;
- this->isDirect = isDirect;
- }
-
- void set(JSGlobalData& globalData, JSCell* owner, PassRefPtr<JITStubRoutine> _stubRoutine, Structure* _base, Structure* _proto, bool isDirect)
- {
- stubRoutine = _stubRoutine;
- base.set(globalData, owner, _base);
- u.proto.set(globalData, owner, _proto);
- isChain = false;
- this->isDirect = isDirect;
- }
-
- void set(JSGlobalData& globalData, JSCell* owner, PassRefPtr<JITStubRoutine> _stubRoutine, Structure* _base, StructureChain* _chain, bool isDirect)
- {
- stubRoutine = _stubRoutine;
- base.set(globalData, owner, _base);
- u.chain.set(globalData, owner, _chain);
- isChain = true;
- this->isDirect = isDirect;
- }
- } list[POLYMORPHIC_LIST_CACHE_SIZE];
-
- PolymorphicAccessStructureList()
+ PolymorphicStubInfo()
{
+ u.proto.clear();
}
-
- PolymorphicAccessStructureList(JSGlobalData& globalData, JSCell* owner, PassRefPtr<JITStubRoutine> stubRoutine, Structure* firstBase, bool isDirect)
+
+ void set(JSGlobalData& globalData, JSCell* owner, PassRefPtr<JITStubRoutine> _stubRoutine, Structure* _base, bool isDirect)
{
- list[0].set(globalData, owner, stubRoutine, firstBase, isDirect);
+ stubRoutine = _stubRoutine;
+ base.set(globalData, owner, _base);
+ u.proto.clear();
+ isChain = false;
+ this->isDirect = isDirect;
}
-
- PolymorphicAccessStructureList(JSGlobalData& globalData, JSCell* owner, PassRefPtr<JITStubRoutine> stubRoutine, Structure* firstBase, Structure* firstProto, bool isDirect)
+
+ void set(JSGlobalData& globalData, JSCell* owner, PassRefPtr<JITStubRoutine> _stubRoutine, Structure* _base, Structure* _proto, bool isDirect)
{
- list[0].set(globalData, owner, stubRoutine, firstBase, firstProto, isDirect);
+ stubRoutine = _stubRoutine;
+ base.set(globalData, owner, _base);
+ u.proto.set(globalData, owner, _proto);
+ isChain = false;
+ this->isDirect = isDirect;
}
-
- PolymorphicAccessStructureList(JSGlobalData& globalData, JSCell* owner, PassRefPtr<JITStubRoutine> stubRoutine, Structure* firstBase, StructureChain* firstChain, bool isDirect)
+
+ void set(JSGlobalData& globalData, JSCell* owner, PassRefPtr<JITStubRoutine> _stubRoutine, Structure* _base, StructureChain* _chain, bool isDirect)
{
- list[0].set(globalData, owner, stubRoutine, firstBase, firstChain, isDirect);
+ stubRoutine = _stubRoutine;
+ base.set(globalData, owner, _base);
+ u.chain.set(globalData, owner, _chain);
+ isChain = true;
+ this->isDirect = isDirect;
}
+ } list[POLYMORPHIC_LIST_CACHE_SIZE];
+
+ PolymorphicAccessStructureList()
+ {
+ }
+
+ PolymorphicAccessStructureList(JSGlobalData& globalData, JSCell* owner, PassRefPtr<JITStubRoutine> stubRoutine, Structure* firstBase, bool isDirect)
+ {
+ list[0].set(globalData, owner, stubRoutine, firstBase, isDirect);
+ }
- bool visitWeak(int count)
- {
- for (int i = 0; i < count; ++i) {
- PolymorphicStubInfo& info = list[i];
- if (!info.base) {
- // We're being marked during initialisation of an entry
- ASSERT(!info.u.proto);
- continue;
- }
+ PolymorphicAccessStructureList(JSGlobalData& globalData, JSCell* owner, PassRefPtr<JITStubRoutine> stubRoutine, Structure* firstBase, Structure* firstProto, bool isDirect)
+ {
+ list[0].set(globalData, owner, stubRoutine, firstBase, firstProto, isDirect);
+ }
+
+ PolymorphicAccessStructureList(JSGlobalData& globalData, JSCell* owner, PassRefPtr<JITStubRoutine> stubRoutine, Structure* firstBase, StructureChain* firstChain, bool isDirect)
+ {
+ list[0].set(globalData, owner, stubRoutine, firstBase, firstChain, isDirect);
+ }
+
+ bool visitWeak(int count)
+ {
+ for (int i = 0; i < count; ++i) {
+ PolymorphicStubInfo& info = list[i];
+ if (!info.base) {
+ // We're being marked during initialisation of an entry
+ ASSERT(!info.u.proto);
+ continue;
+ }
- if (!Heap::isMarked(info.base.get()))
- return false;
- if (info.u.proto && !info.isChain
- && !Heap::isMarked(info.u.proto.get()))
- return false;
- if (info.u.chain && info.isChain
- && !Heap::isMarked(info.u.chain.get()))
- return false;
- }
+ if (!Heap::isMarked(info.base.get()))
+ return false;
+ if (info.u.proto && !info.isChain
+ && !Heap::isMarked(info.u.proto.get()))
+ return false;
+ if (info.u.chain && info.isChain
+ && !Heap::isMarked(info.u.chain.get()))
+ return false;
+ }
- return true;
- }
- };
+ return true;
+ }
+};
#endif
- struct Instruction {
- Instruction()
- {
- u.jsCell.clear();
- }
+struct Instruction {
+ Instruction()
+ {
+ u.jsCell.clear();
+ }
- Instruction(Opcode opcode)
- {
+ Instruction(Opcode opcode)
+ {
#if !ENABLE(COMPUTED_GOTO_OPCODES)
- // We have to initialize one of the pointer members to ensure that
- // the entire struct is initialized, when opcode is not a pointer.
- u.jsCell.clear();
+ // We have to initialize one of the pointer members to ensure that
+ // the entire struct is initialized, when opcode is not a pointer.
+ u.jsCell.clear();
#endif
- u.opcode = opcode;
- }
+ u.opcode = opcode;
+ }
- Instruction(int operand)
- {
- // We have to initialize one of the pointer members to ensure that
- // the entire struct is initialized in 64-bit.
- u.jsCell.clear();
- u.operand = operand;
- }
+ Instruction(int operand)
+ {
+ // We have to initialize one of the pointer members to ensure that
+ // the entire struct is initialized in 64-bit.
+ u.jsCell.clear();
+ u.operand = operand;
+ }
- Instruction(JSGlobalData& globalData, JSCell* owner, Structure* structure)
- {
- u.structure.clear();
- u.structure.set(globalData, owner, structure);
- }
- Instruction(JSGlobalData& globalData, JSCell* owner, StructureChain* structureChain)
- {
- u.structureChain.clear();
- u.structureChain.set(globalData, owner, structureChain);
- }
- Instruction(JSGlobalData& globalData, JSCell* owner, JSCell* jsCell)
- {
- u.jsCell.clear();
- u.jsCell.set(globalData, owner, jsCell);
- }
+ Instruction(JSGlobalData& globalData, JSCell* owner, Structure* structure)
+ {
+ u.structure.clear();
+ u.structure.set(globalData, owner, structure);
+ }
+ Instruction(JSGlobalData& globalData, JSCell* owner, StructureChain* structureChain)
+ {
+ u.structureChain.clear();
+ u.structureChain.set(globalData, owner, structureChain);
+ }
+ Instruction(JSGlobalData& globalData, JSCell* owner, JSCell* jsCell)
+ {
+ u.jsCell.clear();
+ u.jsCell.set(globalData, owner, jsCell);
+ }
- Instruction(PropertySlot::GetValueFunc getterFunc) { u.getterFunc = getterFunc; }
+ Instruction(PropertySlot::GetValueFunc getterFunc) { u.getterFunc = getterFunc; }
- Instruction(LLIntCallLinkInfo* callLinkInfo) { u.callLinkInfo = callLinkInfo; }
+ Instruction(LLIntCallLinkInfo* callLinkInfo) { u.callLinkInfo = callLinkInfo; }
- Instruction(ValueProfile* profile) { u.profile = "" }
- Instruction(ArrayProfile* profile) { u.arrayProfile = profile; }
- Instruction(ArrayAllocationProfile* profile) { u.arrayAllocationProfile = profile; }
- Instruction(ObjectAllocationProfile* profile) { u.objectAllocationProfile = profile; }
+ Instruction(ValueProfile* profile) { u.profile = "" }
+ Instruction(ArrayProfile* profile) { u.arrayProfile = profile; }
+ Instruction(ArrayAllocationProfile* profile) { u.arrayAllocationProfile = profile; }
+ Instruction(ObjectAllocationProfile* profile) { u.objectAllocationProfile = profile; }
- Instruction(WriteBarrier<Unknown>* registerPointer) { u.registerPointer = registerPointer; }
+ Instruction(WriteBarrier<Unknown>* registerPointer) { u.registerPointer = registerPointer; }
- Instruction(Special::Pointer pointer) { u.specialPointer = pointer; }
+ Instruction(Special::Pointer pointer) { u.specialPointer = pointer; }
- Instruction(bool* predicatePointer) { u.predicatePointer = predicatePointer; }
+ Instruction(bool* predicatePointer) { u.predicatePointer = predicatePointer; }
- union {
- Opcode opcode;
- int operand;
- WriteBarrierBase<Structure> structure;
- WriteBarrierBase<StructureChain> structureChain;
- WriteBarrierBase<JSCell> jsCell;
- WriteBarrier<Unknown>* registerPointer;
- Special::Pointer specialPointer;
- PropertySlot::GetValueFunc getterFunc;
- LLIntCallLinkInfo* callLinkInfo;
- ValueProfile* profile;
- ArrayProfile* arrayProfile;
- ArrayAllocationProfile* arrayAllocationProfile;
- ObjectAllocationProfile* objectAllocationProfile;
- void* pointer;
- bool* predicatePointer;
- ResolveOperations* resolveOperations;
- PutToBaseOperation* putToBaseOperation;
- } u;
+ union {
+ Opcode opcode;
+ int operand;
+ WriteBarrierBase<Structure> structure;
+ WriteBarrierBase<StructureChain> structureChain;
+ WriteBarrierBase<JSCell> jsCell;
+ WriteBarrier<Unknown>* registerPointer;
+ Special::Pointer specialPointer;
+ PropertySlot::GetValueFunc getterFunc;
+ LLIntCallLinkInfo* callLinkInfo;
+ ValueProfile* profile;
+ ArrayProfile* arrayProfile;
+ ArrayAllocationProfile* arrayAllocationProfile;
+ ObjectAllocationProfile* objectAllocationProfile;
+ void* pointer;
+ bool* predicatePointer;
+ ResolveOperations* resolveOperations;
+ PutToBaseOperation* putToBaseOperation;
+ } u;
- private:
- Instruction(StructureChain*);
- Instruction(Structure*);
- };
+private:
+ Instruction(StructureChain*);
+ Instruction(Structure*);
+};
} // namespace JSC
namespace WTF {
- template<> struct VectorTraits<JSC::Instruction> : VectorTraitsBase<true, JSC::Instruction> { };
+template<> struct VectorTraits<JSC::Instruction> : VectorTraitsBase<true, JSC::Instruction> { };
} // namespace WTF
