Commit 201db1d3 authored by Ben Turner's avatar Ben Turner
Browse files

Bug 737911 - 'Shrink bits for CACHED_PROTO_KEYs and add two new JSClass flags... 

Bug 737911 - 'Shrink bits for CACHED_PROTO_KEYs and add two new JSClass flags for the new DOM bindings'. r=lukew.
parent ffde1d17

js/src/jsapi.h

+12 −2
Original line number Diff line number Diff line
@@ -3427,6 +3427,7 @@ struct JSClass { 
#define JSCLASS_IMPLEMENTS_BARRIERS     (1<<5)  /* Correctly implements GC read

                                                   and write barriers */

#define JSCLASS_DOCUMENT_OBSERVER       (1<<6)  /* DOM document observer */

#define JSCLASS_USERBIT1                (1<<7)  /* Reserved for embeddings. */



/*

 * To reserve slots fetched and stored via JS_Get/SetReservedSlot, bitwise-or
@@ -3462,6 +3463,15 @@ struct JSClass { 


#define JSCLASS_XPCONNECT_GLOBAL        (1<<(JSCLASS_HIGH_FLAGS_SHIFT+7))



/* Reserved for embeddings. */

#define JSCLASS_USERBIT2                (1<<(JSCLASS_HIGH_FLAGS_SHIFT+8))

#define JSCLASS_USERBIT3                (1<<(JSCLASS_HIGH_FLAGS_SHIFT+9))



/*

 * Bits 26 through 31 are reserved for the CACHED_PROTO_KEY mechanism, see

 * below.

 */



/* Global flags. */

#define JSGLOBAL_FLAGS_CLEARED          0x1
@@ -3486,8 +3496,8 @@ struct JSClass { 
   && JSCLASS_RESERVED_SLOTS(clasp) >= JSCLASS_GLOBAL_SLOT_COUNT)



/* Fast access to the original value of each standard class's prototype. */

#define JSCLASS_CACHED_PROTO_SHIFT      (JSCLASS_HIGH_FLAGS_SHIFT + 8)

#define JSCLASS_CACHED_PROTO_WIDTH      8

#define JSCLASS_CACHED_PROTO_SHIFT      (JSCLASS_HIGH_FLAGS_SHIFT + 10)

#define JSCLASS_CACHED_PROTO_WIDTH      6

#define JSCLASS_CACHED_PROTO_MASK       JS_BITMASK(JSCLASS_CACHED_PROTO_WIDTH)

#define JSCLASS_HAS_CACHED_PROTO(key)   ((key) << JSCLASS_CACHED_PROTO_SHIFT)

#define JSCLASS_CACHED_PROTO_KEY(clasp) ((JSProtoKey)                         \