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

Merge mozilla-central to tracemonkey.

Browse Source
This commit is contained in:
Chris Leary 2010-12-30 00:36:53 -05:00
commit 5c3dd7b9ca
4 changed files with 7 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/jsobj.cpp
View File

@ -106,7 +106,7 @@
using namespace js;
using namespace js::gc;
JS_FRIEND_DATA(const JSObjectMap) JSObjectMap::sharedNonNative(JSObjectMap::NON_NATIVE_START_MARKER, JSObjectMap::SHAPELESS, 0);
JS_FRIEND_DATA(const JSObjectMap) JSObjectMap::sharedNonNative(JSObjectMap::SHAPELESS);
Class js_ObjectClass = {
js_Object_str,

10
js/src/jsobj.h
View File

@ -176,21 +176,15 @@ typedef Vector<PropDesc, 1> PropDescArray;
} /* namespace js */
struct JSObjectMap {
uint32 startMarker; /* start marker for diagnostics */
uint32 shape; /* shape identifier */
uint32 slotSpan; /* one more than maximum live slot number */
static JS_FRIEND_DATA(const JSObjectMap) sharedNonNative;
JSObjectMap(uint32 startMarker, uint32 shape, uint32 slotSpan)
: startMarker(startMarker), shape(shape), slotSpan(slotSpan) {}
explicit JSObjectMap(uint32 shape) : shape(shape), slotSpan(0) {}
JSObjectMap(uint32 shape, uint32 slotSpan) : shape(shape), slotSpan(slotSpan) {}
enum { INVALID_SHAPE = 0x8fffffff, SHAPELESS = 0xffffffff };
enum { NON_NATIVE_START_MARKER = 0xeaeaeaea,
SHAPE_START_MARKER = 0xebebebeb,
SHAPE_MARKER_1 = 0xecececec,
SHAPE_MARKER_2 = 0xedededed,
SHAPE_END_MARKER = 0xefefefef };
bool isNative() const { return this != &sharedNonNative; }

25
js/src/jsscope.h
View File

@ -297,7 +297,6 @@ struct Shape : public JSObjectMap
friend class js::PropertyTree;
friend bool HasUnreachableGCThings(TreeFragment *f);
uint32 marker1;
protected:
mutable js::PropertyTable *table;
@ -336,7 +335,6 @@ struct Shape : public JSObjectMap
null if shape->hasSetterValue() */
};
uint32 marker2;
public:
uint32 slot; /* abstract index in object slots */
private:
@ -355,7 +353,6 @@ struct Shape : public JSObjectMap
either to shape->parent if not last,
else to obj->lastProp */
};
uint32 endMarker; /* end marker for diagnostics */
static inline js::Shape **search(js::Shape **startp, jsid id, bool adding = false);
static js::Shape *newDictionaryShape(JSContext *cx, const js::Shape &child, js::Shape **listp);
@ -666,24 +663,9 @@ struct EmptyShape : public js::Shape
#define SHAPE_STORE_PRESERVING_COLLISION(spp, shape) \
(*(spp) = (js::Shape *) (jsuword(shape) | SHAPE_HAD_COLLISION(*(spp))))
inline static volatile int *vcopy(volatile int *dst, int *src, size_t bytes)
{
int *end = src + bytes / sizeof(int);
for (; src < end; ++src, ++dst)
*dst = *src;
return dst;
}
inline js::Shape **
JSObject::nativeSearch(jsid id, bool adding)
{
{
char blackbox[sizeof(JSObject) + 8];
volatile int *p = (int *) blackbox;
*p++ = 0xacacacac;
p = vcopy(p, (int *) this, sizeof(JSObject));
*p = 0xadadadad;
}
return js::Shape::search(&lastProp, id, adding);
}
@ -886,13 +868,6 @@ Shape::search(js::Shape **startp, jsid id, bool adding)
METER(misses);
return spp;
}
{
char blackbox[sizeof(Shape) + 8];
volatile int *p = (int *) blackbox;
*p++ = 0xfcfcfcfc;
p = vcopy(p, (int *) *startp, sizeof(Shape));
*p = 0xfdfdfdfd;
}
return (*startp)->table->search(id, adding);
}

12
js/src/jsscopeinlines.h
View File

@ -169,11 +169,9 @@ namespace js {
inline
Shape::Shape(jsid id, js::PropertyOp getter, js::PropertyOp setter, uint32 slot, uintN attrs,
uintN flags, intN shortid, uint32 shape, uint32 slotSpan)
: JSObjectMap(JSObjectMap::SHAPE_START_MARKER, shape, slotSpan),
: JSObjectMap(shape, slotSpan),
table(NULL), id(id), rawGetter(getter), rawSetter(setter), slot(slot), attrs(uint8(attrs)),
flags(uint8(flags)), shortid(int16(shortid)), parent(NULL),
marker1(JSObjectMap::SHAPE_MARKER_1), marker2(JSObjectMap::SHAPE_MARKER_2),
endMarker(JSObjectMap::SHAPE_END_MARKER)
flags(uint8(flags)), shortid(int16(shortid)), parent(NULL)
{
JS_ASSERT_IF(slotSpan != SHAPE_INVALID_SLOT, slotSpan < JSObject::NSLOTS_LIMIT);
JS_ASSERT_IF(getter && (attrs & JSPROP_GETTER), getterObj->isCallable());
@ -183,11 +181,9 @@ Shape::Shape(jsid id, js::PropertyOp getter, js::PropertyOp setter, uint32 slot,
inline
Shape::Shape(JSContext *cx, Class *aclasp)
: JSObjectMap(JSObjectMap::SHAPE_START_MARKER, js_GenerateShape(cx, false), JSSLOT_FREE(aclasp)), table(NULL),
: JSObjectMap(js_GenerateShape(cx, false), JSSLOT_FREE(aclasp)), table(NULL),
id(JSID_EMPTY), clasp(aclasp), rawSetter(NULL), slot(SHAPE_INVALID_SLOT), attrs(0),
flags(SHARED_EMPTY), shortid(0), parent(NULL),
marker1(JSObjectMap::SHAPE_MARKER_1), marker2(JSObjectMap::SHAPE_MARKER_2),
endMarker(JSObjectMap::SHAPE_END_MARKER)
flags(SHARED_EMPTY), shortid(0), parent(NULL)
{
kids.setNull();
}