Changeset 46620 in webkit for trunk/JavaScriptCore/bytecode

Timestamp:

Jul 30, 2009, 7:57:31 PM (16 years ago)

Author:

[email protected]

Message:

2009-07-30 Gavin Barraclough <​[email protected]>

Reviewed by NOBODY (build fix).

Temporarily revert r46618 since this is b0rking on Linux.

Location:

trunk/JavaScriptCore/bytecode

Files:

• CodeBlock.cpp (modified) (1 diff)
• CodeBlock.h (modified) (5 diffs)
• StructureStubInfo.cpp (modified) (3 diffs)
• StructureStubInfo.h (modified) (9 diffs)

trunk/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -231 +231 @@
 static void printStructureStubInfo(const StructureStubInfo& stubInfo, unsigned instructionOffset)
 {
-    switch (stubInfo.accessType) {
-    case access_get_by_id_self:
+    switch (stubInfo.opcodeID) {
+    case op_get_by_id_self:
         printf("  [%4d] %s: %s\n", instructionOffset, "get_by_id_self", pointerToSourceString(stubInfo.u.getByIdSelf.baseObjectStructure).UTF8String().c_str());
         return;
-    case access_get_by_id_proto:
+    case op_get_by_id_proto:
         printf("  [%4d] %s: %s, %s\n", instructionOffset, "get_by_id_proto", pointerToSourceString(stubInfo.u.getByIdProto.baseObjectStructure).UTF8String().c_str(), pointerToSourceString(stubInfo.u.getByIdProto.prototypeStructure).UTF8String().c_str());
         return;
-    case access_get_by_id_chain:
+    case op_get_by_id_chain:
         printf("  [%4d] %s: %s, %s\n", instructionOffset, "get_by_id_chain", pointerToSourceString(stubInfo.u.getByIdChain.baseObjectStructure).UTF8String().c_str(), pointerToSourceString(stubInfo.u.getByIdChain.chain).UTF8String().c_str());
         return;
-    case access_get_by_id_self_list:
+    case op_get_by_id_self_list:
         printf("  [%4d] %s: %s (%d)\n", instructionOffset, "op_get_by_id_self_list", pointerToSourceString(stubInfo.u.getByIdSelfList.structureList).UTF8String().c_str(), stubInfo.u.getByIdSelfList.listSize);
         return;
-    case access_get_by_id_proto_list:
+    case op_get_by_id_proto_list:
         printf("  [%4d] %s: %s (%d)\n", instructionOffset, "op_get_by_id_proto_list", pointerToSourceString(stubInfo.u.getByIdProtoList.structureList).UTF8String().c_str(), stubInfo.u.getByIdProtoList.listSize);
         return;
-    case access_put_by_id_transition:
+    case op_put_by_id_transition:
         printf("  [%4d] %s: %s, %s, %s\n", instructionOffset, "put_by_id_transition", pointerToSourceString(stubInfo.u.putByIdTransition.previousStructure).UTF8String().c_str(), pointerToSourceString(stubInfo.u.putByIdTransition.structure).UTF8String().c_str(), pointerToSourceString(stubInfo.u.putByIdTransition.chain).UTF8String().c_str());
         return;
-    case access_put_by_id_replace:
+    case op_put_by_id_replace:
         printf("  [%4d] %s: %s\n", instructionOffset, "put_by_id_replace", pointerToSourceString(stubInfo.u.putByIdReplace.baseObjectStructure).UTF8String().c_str());
         return;
-    case access_get_by_id:
+    case op_get_by_id:
         printf("  [%4d] %s\n", instructionOffset, "get_by_id");
         return;
-    case access_put_by_id:
+    case op_put_by_id:
         printf("  [%4d] %s\n", instructionOffset, "put_by_id");
         return;
-    case access_get_by_id_generic:
+    case op_get_by_id_generic:
         printf("  [%4d] %s\n", instructionOffset, "op_get_by_id_generic");
         return;
-    case access_put_by_id_generic:
+    case op_put_by_id_generic:
         printf("  [%4d] %s\n", instructionOffset, "op_put_by_id_generic");
         return;
-    case access_get_array_length:
+    case op_get_array_length:
         printf("  [%4d] %s\n", instructionOffset, "op_get_array_length");
         return;
-    case access_get_string_length:
+    case op_get_string_length:
         printf("  [%4d] %s\n", instructionOffset, "op_get_string_length");
         return;

trunk/JavaScriptCore/bytecode/CodeBlock.h

@@ -37 +37 @@
 #include "JumpTable.h"
 #include "Nodes.h"
-#include "PtrAndFlags.h"
 #include "RegExp.h"
 #include "UString.h"
@@ -55 +54 @@
 
 namespace JSC {
-
-    enum HasSeenShouldRepatch {
-        hasSeenShouldRepatch
-    };
 
     class ExecState;
@@ -111 +106 @@
         CodeLocationDataLabelPtr hotPathBegin;
         CodeLocationNearCall hotPathOther;
-        PtrAndFlags<CodeBlock, HasSeenShouldRepatch> ownerCodeBlock;
+        CodeBlock* ownerCodeBlock;
         CodeBlock* callee;
         unsigned position;
@@ -117 +112 @@
         void setUnlinked() { callee = 0; }
         bool isLinked() { return callee; }
-
-        bool seenOnce()
-        {
-            return ownerCodeBlock.isFlagSet(hasSeenShouldRepatch);
-        }
-
-        void setSeen()
-        {
-            ownerCodeBlock.setFlag(hasSeenShouldRepatch);
-        }
     };
 
@@ -136 +121 @@
         }
 
-        bool seenOnce()
-        {
-            return cachedPrototypeStructure.isFlagSet(hasSeenShouldRepatch);
-        }
-
-        void setSeen()
-        {
-            cachedPrototypeStructure.setFlag(hasSeenShouldRepatch);
-        }
-
         CodeLocationCall callReturnLocation;
         CodeLocationDataLabelPtr structureLabel;
         Structure* cachedStructure;
-        PtrAndFlags<Structure, HasSeenShouldRepatch> cachedPrototypeStructure;
+        Structure* cachedPrototypeStructure;
     };
 

trunk/JavaScriptCore/bytecode/StructureStubInfo.cpp

@@ -32 +32 @@
 void StructureStubInfo::deref()
 {
-    switch (accessType) {
-    case access_get_by_id_self:
+    switch (opcodeID) {
+    case op_get_by_id_self:
         u.getByIdSelf.baseObjectStructure->deref();
         return;
-    case access_get_by_id_proto:
+    case op_get_by_id_proto:
         u.getByIdProto.baseObjectStructure->deref();
         u.getByIdProto.prototypeStructure->deref();
         return;
-    case access_get_by_id_chain:
+    case op_get_by_id_chain:
         u.getByIdChain.baseObjectStructure->deref();
         u.getByIdChain.chain->deref();
         return;
-    case access_get_by_id_self_list: {
+    case op_get_by_id_self_list: {
         PolymorphicAccessStructureList* polymorphicStructures = u.getByIdSelfList.structureList;
         polymorphicStructures->derefStructures(u.getByIdSelfList.listSize);
@@ -50 +50 @@
         return;
     }
-    case access_get_by_id_proto_list: {
+    case op_get_by_id_proto_list: {
         PolymorphicAccessStructureList* polymorphicStructures = u.getByIdProtoList.structureList;
         polymorphicStructures->derefStructures(u.getByIdProtoList.listSize);
@@ -56 +56 @@
         return;
     }
-    case access_put_by_id_transition:
+    case op_put_by_id_transition:
         u.putByIdTransition.previousStructure->deref();
         u.putByIdTransition.structure->deref();
         u.putByIdTransition.chain->deref();
         return;
-    case access_put_by_id_replace:
+    case op_put_by_id_replace:
         u.putByIdReplace.baseObjectStructure->deref();
         return;
-    case access_get_by_id:
-    case access_put_by_id:
-    case access_get_by_id_generic:
-    case access_put_by_id_generic:
-    case access_get_array_length:
-    case access_get_string_length:
+    case op_get_by_id:
+    case op_put_by_id:
+    case op_get_by_id_generic:
+    case op_put_by_id_generic:
+    case op_get_array_length:
+    case op_get_string_length:
         // These instructions don't ref their Structures.
         return;

trunk/JavaScriptCore/bytecode/StructureStubInfo.h

@@ -34 +34 @@
 #include "Structure.h"
 
-
 namespace JSC {
 
-    static const int access_get_by_id_self = 0;
-    static const int access_get_by_id_proto = 1;
-    static const int access_get_by_id_chain = 2;
-    static const int access_get_by_id_self_list = 3;
-    static const int access_get_by_id_proto_list = 4;
-    static const int access_put_by_id_transition = 5;
-    static const int access_put_by_id_replace = 6;
-    static const int access_get_by_id = 7;
-    static const int access_put_by_id = 8;
-    static const int access_get_by_id_generic = 9;
-    static const int access_put_by_id_generic = 10;
-    static const int access_get_array_length = 11;
-    static const int access_get_string_length = 12;
-
     struct StructureStubInfo {
-        StructureStubInfo(int accessType)
-            : accessType(accessType)
-            , seen(false)
+        StructureStubInfo(OpcodeID opcodeID)
+            : opcodeID(opcodeID)
         {
         }
@@ -60 +44 @@
         void initGetByIdSelf(Structure* baseObjectStructure)
         {
-            accessType = access_get_by_id_self;
+            opcodeID = op_get_by_id_self;
 
             u.getByIdSelf.baseObjectStructure = baseObjectStructure;
@@ -68 +52 @@
         void initGetByIdProto(Structure* baseObjectStructure, Structure* prototypeStructure)
         {
-            accessType = access_get_by_id_proto;
+            opcodeID = op_get_by_id_proto;
 
             u.getByIdProto.baseObjectStructure = baseObjectStructure;
@@ -79 +63 @@
         void initGetByIdChain(Structure* baseObjectStructure, StructureChain* chain)
         {
-            accessType = access_get_by_id_chain;
+            opcodeID = op_get_by_id_chain;
 
             u.getByIdChain.baseObjectStructure = baseObjectStructure;
@@ -90 +74 @@
         void initGetByIdSelfList(PolymorphicAccessStructureList* structureList, int listSize)
         {
-            accessType = access_get_by_id_self_list;
+            opcodeID = op_get_by_id_self_list;
 
             u.getByIdProtoList.structureList = structureList;
@@ -98 +82 @@
         void initGetByIdProtoList(PolymorphicAccessStructureList* structureList, int listSize)
         {
-            accessType = access_get_by_id_proto_list;
+            opcodeID = op_get_by_id_proto_list;
 
             u.getByIdProtoList.structureList = structureList;
@@ -108 +92 @@
         void initPutByIdTransition(Structure* previousStructure, Structure* structure, StructureChain* chain)
         {
-            accessType = access_put_by_id_transition;
+            opcodeID = op_put_by_id_transition;
 
             u.putByIdTransition.previousStructure = previousStructure;
@@ -122 +106 @@
         void initPutByIdReplace(Structure* baseObjectStructure)
         {
-            accessType = access_put_by_id_replace;
+            opcodeID = op_put_by_id_replace;
     
             u.putByIdReplace.baseObjectStructure = baseObjectStructure;
@@ -130 +114 @@
         void deref();
 
-        bool seenOnce()
-        {
-            return seen;
-        }
-
-        void setSeen()
-        {
-            seen = true;
-        }
-
-        int accessType : 31;
-        int seen : 1;
-
+        OpcodeID opcodeID;
         union {
             struct {