JavaScriptCore-903.5.tar.gz

[apple/javascriptcore.git] / bytecode / Instruction.h

diff --git a/bytecode/Instruction.h b/bytecode/Instruction.h
index bcef7fb196a9c48b543315f3c0e6c0d4e78e0237..b3bb5b711fe6a8a51ee9a4bbff2c46385964c170 100644 (file)
--- a/bytecode/Instruction.h
+++ b/bytecode/Instruction.h
@@ -31,7 +31,9 @@
 
 #include "MacroAssembler.h"
 #include "Opcode.h"
 
 #include "MacroAssembler.h"
 #include "Opcode.h"

+#include "PropertySlot.h"

 #include "Structure.h"
 #include "Structure.h"

+#include "StructureChain.h"

 #include <wtf/VectorTraits.h>
 
 #define POLYMORPHIC_LIST_CACHE_SIZE 8
 #include <wtf/VectorTraits.h>
 
 #define POLYMORPHIC_LIST_CACHE_SIZE 8


@@ -53,70 +55,78 @@ namespace JSC {
     class StructureChain;
 
     // 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.
     class StructureChain;
 
     // 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 : FastAllocBase {
+    struct PolymorphicAccessStructureList {
+        WTF_MAKE_FAST_ALLOCATED;
+    public:

         struct PolymorphicStubInfo {
             bool isChain;
             PolymorphicAccessStructureListStubRoutineType stubRoutine;
         struct PolymorphicStubInfo {
             bool isChain;
             PolymorphicAccessStructureListStubRoutineType stubRoutine;

-            Structure* base;
+            WriteBarrier<Structure> base;

             union {
             union {

-                Structure* proto;
-                StructureChain* chain;
+                WriteBarrierBase<Structure> proto;
+                WriteBarrierBase<StructureChain> chain;

             } u;
 
             } u;
 

-            void set(PolymorphicAccessStructureListStubRoutineType _stubRoutine, Structure* _base)
+            PolymorphicStubInfo()
+            {
+                u.proto.clear();
+            }
+
+            void set(JSGlobalData& globalData, JSCell* owner, PolymorphicAccessStructureListStubRoutineType _stubRoutine, Structure* _base)

             {
                 stubRoutine = _stubRoutine;
             {
                 stubRoutine = _stubRoutine;

-                base = _base;
-                u.proto = 0;
+                base.set(globalData, owner, _base);
+                u.proto.clear();

                 isChain = false;
             }
             
                 isChain = false;
             }
             

-            void set(PolymorphicAccessStructureListStubRoutineType _stubRoutine, Structure* _base, Structure* _proto)
+            void set(JSGlobalData& globalData, JSCell* owner, PolymorphicAccessStructureListStubRoutineType _stubRoutine, Structure* _base, Structure* _proto)

             {
                 stubRoutine = _stubRoutine;
             {
                 stubRoutine = _stubRoutine;

-                base = _base;
-                u.proto = _proto;
+                base.set(globalData, owner, _base);
+                u.proto.set(globalData, owner, _proto);

                 isChain = false;
             }
             
                 isChain = false;
             }
             

-            void set(PolymorphicAccessStructureListStubRoutineType _stubRoutine, Structure* _base, StructureChain* _chain)
+            void set(JSGlobalData& globalData, JSCell* owner, PolymorphicAccessStructureListStubRoutineType _stubRoutine, Structure* _base, StructureChain* _chain)

             {
                 stubRoutine = _stubRoutine;
             {
                 stubRoutine = _stubRoutine;

-                base = _base;
-                u.chain = _chain;
+                base.set(globalData, owner, _base);
+                u.chain.set(globalData, owner, _chain);

                 isChain = true;
             }
         } list[POLYMORPHIC_LIST_CACHE_SIZE];
         
                 isChain = true;
             }
         } list[POLYMORPHIC_LIST_CACHE_SIZE];
         

-        PolymorphicAccessStructureList(PolymorphicAccessStructureListStubRoutineType stubRoutine, Structure* firstBase)
+        PolymorphicAccessStructureList(JSGlobalData& globalData, JSCell* owner, PolymorphicAccessStructureListStubRoutineType stubRoutine, Structure* firstBase)

         {
         {

-            list[0].set(stubRoutine, firstBase);
+            list[0].set(globalData, owner, stubRoutine, firstBase);

         }
 
         }
 

-        PolymorphicAccessStructureList(PolymorphicAccessStructureListStubRoutineType stubRoutine, Structure* firstBase, Structure* firstProto)
+        PolymorphicAccessStructureList(JSGlobalData& globalData, JSCell* owner, PolymorphicAccessStructureListStubRoutineType stubRoutine, Structure* firstBase, Structure* firstProto)

         {
         {

-            list[0].set(stubRoutine, firstBase, firstProto);
+            list[0].set(globalData, owner, stubRoutine, firstBase, firstProto);

         }
 
         }
 

-        PolymorphicAccessStructureList(PolymorphicAccessStructureListStubRoutineType stubRoutine, Structure* firstBase, StructureChain* firstChain)
+        PolymorphicAccessStructureList(JSGlobalData& globalData, JSCell* owner, PolymorphicAccessStructureListStubRoutineType stubRoutine, Structure* firstBase, StructureChain* firstChain)

         {
         {

-            list[0].set(stubRoutine, firstBase, firstChain);
+            list[0].set(globalData, owner, stubRoutine, firstBase, firstChain);

         }
 
         }
 

-        void derefStructures(int count)
+        void visitAggregate(SlotVisitor& visitor, int count)

         {
             for (int i = 0; i < count; ++i) {
                 PolymorphicStubInfo& info = list[i];
         {
             for (int i = 0; i < count; ++i) {
                 PolymorphicStubInfo& info = list[i];

-
-                ASSERT(info.base);
-                info.base->deref();
-
-                if (info.u.proto) {
-                    if (info.isChain)
-                        info.u.chain->deref();
-                    else
-                        info.u.proto->deref();
+                if (!info.base) {
+                    // We're being marked during initialisation of an entry
+                    ASSERT(!info.u.proto);
+                    continue;

                 }
                 }

+                
+                visitor.append(&info.base);
+                if (info.u.proto && !info.isChain)
+                    visitor.append(&info.u.proto);
+                if (info.u.chain && info.isChain)
+                    visitor.append(&info.u.chain);

             }
         }
     };
             }
         }
     };


@@ -124,10 +134,10 @@ namespace JSC {
     struct Instruction {
         Instruction(Opcode opcode)
         {
     struct Instruction {
         Instruction(Opcode opcode)
         {

-#if !HAVE(COMPUTED_GOTO)
+#if !ENABLE(COMPUTED_GOTO_INTERPRETER)

             // We have to initialize one of the pointer members to ensure that
             // the entire struct is initialized, when opcode is not a pointer.
             // 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 = 0;
+            u.jsCell.clear();

 #endif
             u.opcode = opcode;
         }
 #endif
             u.opcode = opcode;
         }


@@ -136,23 +146,41 @@ namespace JSC {
         {
             // We have to initialize one of the pointer members to ensure that
             // the entire struct is initialized in 64-bit.
         {
             // We have to initialize one of the pointer members to ensure that
             // the entire struct is initialized in 64-bit.

-            u.jsCell = 0;
+            u.jsCell.clear();

             u.operand = operand;
         }
 
             u.operand = operand;
         }
 

-        Instruction(Structure* structure) { u.structure = structure; }
-        Instruction(StructureChain* structureChain) { u.structureChain = structureChain; }
-        Instruction(JSCell* jsCell) { u.jsCell = 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(PolymorphicAccessStructureList* polymorphicStructures) { u.polymorphicStructures = polymorphicStructures; }
         Instruction(PolymorphicAccessStructureList* polymorphicStructures) { u.polymorphicStructures = polymorphicStructures; }

+        Instruction(PropertySlot::GetValueFunc getterFunc) { u.getterFunc = getterFunc; }

 
         union {
             Opcode opcode;
             int operand;
 
         union {
             Opcode opcode;
             int operand;

-            Structure* structure;
-            StructureChain* structureChain;
-            JSCell* jsCell;
+            WriteBarrierBase<Structure> structure;
+            WriteBarrierBase<StructureChain> structureChain;
+            WriteBarrierBase<JSCell> jsCell;

             PolymorphicAccessStructureList* polymorphicStructures;
             PolymorphicAccessStructureList* polymorphicStructures;

+            PropertySlot::GetValueFunc getterFunc;

         } u;
         } u;

+        
+    private:
+        Instruction(StructureChain*);
+        Instruction(Structure*);

     };
 
 } // namespace JSC
     };
 
 } // namespace JSC