зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1451198 part 1 - Move GetUnboxedValue and SetUnboxedValue to cpp file. r=bhackett
This commit is contained in:
Jan de Mooij
Родитель
3e9f2bcf1f
Коммит
83a0922b01
|
|
@ -15,103 +15,6 @@
|
||||||
|
|
||||||
namespace js {
|
namespace js {
|
||||||
|
|
||||||
static inline Value
|
|
||||||
GetUnboxedValue(uint8_t* p, JSValueType type, bool maybeUninitialized)
|
|
||||||
{
|
|
||||||
switch (type) {
|
|
||||||
case JSVAL_TYPE_BOOLEAN:
|
|
||||||
return BooleanValue(*p != 0);
|
|
||||||
|
|
||||||
case JSVAL_TYPE_INT32:
|
|
||||||
return Int32Value(*reinterpret_cast<int32_t*>(p));
|
|
||||||
|
|
||||||
case JSVAL_TYPE_DOUBLE: {
|
|
||||||
// During unboxed plain object creation, non-GC thing properties are
|
|
||||||
// left uninitialized. This is normally fine, since the properties will
|
|
||||||
// be filled in shortly, but if they are read before that happens we
|
|
||||||
// need to make sure that doubles are canonical.
|
|
||||||
double d = *reinterpret_cast<double*>(p);
|
|
||||||
if (maybeUninitialized)
|
|
||||||
return DoubleValue(JS::CanonicalizeNaN(d));
|
|
||||||
return DoubleValue(d);
|
|
||||||
}
|
|
||||||
|
|
||||||
case JSVAL_TYPE_STRING:
|
|
||||||
return StringValue(*reinterpret_cast<JSString**>(p));
|
|
||||||
|
|
||||||
case JSVAL_TYPE_OBJECT:
|
|
||||||
return ObjectOrNullValue(*reinterpret_cast<JSObject**>(p));
|
|
||||||
|
|
||||||
default:
|
|
||||||
MOZ_CRASH("Invalid type for unboxed value");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline bool
|
|
||||||
SetUnboxedValue(JSContext* cx, JSObject* unboxedObject, jsid id,
|
|
||||||
uint8_t* p, JSValueType type, const Value& v, bool preBarrier)
|
|
||||||
{
|
|
||||||
switch (type) {
|
|
||||||
case JSVAL_TYPE_BOOLEAN:
|
|
||||||
if (v.isBoolean()) {
|
|
||||||
*p = v.toBoolean();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
|
|
||||||
case JSVAL_TYPE_INT32:
|
|
||||||
if (v.isInt32()) {
|
|
||||||
*reinterpret_cast<int32_t*>(p) = v.toInt32();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
|
|
||||||
case JSVAL_TYPE_DOUBLE:
|
|
||||||
if (v.isNumber()) {
|
|
||||||
*reinterpret_cast<double*>(p) = v.toNumber();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
|
|
||||||
case JSVAL_TYPE_STRING:
|
|
||||||
if (v.isString()) {
|
|
||||||
JSString** np = reinterpret_cast<JSString**>(p);
|
|
||||||
if (IsInsideNursery(v.toString()) && !IsInsideNursery(unboxedObject))
|
|
||||||
v.toString()->storeBuffer()->putWholeCell(unboxedObject);
|
|
||||||
|
|
||||||
if (preBarrier)
|
|
||||||
JSString::writeBarrierPre(*np);
|
|
||||||
*np = v.toString();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
|
|
||||||
case JSVAL_TYPE_OBJECT:
|
|
||||||
if (v.isObjectOrNull()) {
|
|
||||||
JSObject** np = reinterpret_cast<JSObject**>(p);
|
|
||||||
|
|
||||||
// Update property types when writing object properties. Types for
|
|
||||||
// other properties were captured when the unboxed layout was
|
|
||||||
// created.
|
|
||||||
AddTypePropertyId(cx, unboxedObject, id, v);
|
|
||||||
|
|
||||||
// As above, trigger post barriers on the whole object.
|
|
||||||
JSObject* obj = v.toObjectOrNull();
|
|
||||||
if (IsInsideNursery(obj) && !IsInsideNursery(unboxedObject))
|
|
||||||
obj->storeBuffer()->putWholeCell(unboxedObject);
|
|
||||||
|
|
||||||
if (preBarrier)
|
|
||||||
JSObject::writeBarrierPre(*np);
|
|
||||||
*np = obj;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
|
|
||||||
default:
|
|
||||||
MOZ_CRASH("Invalid type for unboxed value");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////
|
||||||
// UnboxedPlainObject
|
// UnboxedPlainObject
|
||||||
/////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////
|
||||||
|
|
|
||||||
|
|
@ -306,6 +306,103 @@ UnboxedLayout::detachFromCompartment()
|
||||||
remove();
|
remove();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static Value
|
||||||
|
GetUnboxedValue(uint8_t* p, JSValueType type, bool maybeUninitialized)
|
||||||
|
{
|
||||||
|
switch (type) {
|
||||||
|
case JSVAL_TYPE_BOOLEAN:
|
||||||
|
return BooleanValue(*p != 0);
|
||||||
|
|
||||||
|
case JSVAL_TYPE_INT32:
|
||||||
|
return Int32Value(*reinterpret_cast<int32_t*>(p));
|
||||||
|
|
||||||
|
case JSVAL_TYPE_DOUBLE: {
|
||||||
|
// During unboxed plain object creation, non-GC thing properties are
|
||||||
|
// left uninitialized. This is normally fine, since the properties will
|
||||||
|
// be filled in shortly, but if they are read before that happens we
|
||||||
|
// need to make sure that doubles are canonical.
|
||||||
|
double d = *reinterpret_cast<double*>(p);
|
||||||
|
if (maybeUninitialized)
|
||||||
|
return DoubleValue(JS::CanonicalizeNaN(d));
|
||||||
|
return DoubleValue(d);
|
||||||
|
}
|
||||||
|
|
||||||
|
case JSVAL_TYPE_STRING:
|
||||||
|
return StringValue(*reinterpret_cast<JSString**>(p));
|
||||||
|
|
||||||
|
case JSVAL_TYPE_OBJECT:
|
||||||
|
return ObjectOrNullValue(*reinterpret_cast<JSObject**>(p));
|
||||||
|
|
||||||
|
default:
|
||||||
|
MOZ_CRASH("Invalid type for unboxed value");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool
|
||||||
|
SetUnboxedValue(JSContext* cx, JSObject* unboxedObject, jsid id,
|
||||||
|
uint8_t* p, JSValueType type, const Value& v, bool preBarrier)
|
||||||
|
{
|
||||||
|
switch (type) {
|
||||||
|
case JSVAL_TYPE_BOOLEAN:
|
||||||
|
if (v.isBoolean()) {
|
||||||
|
*p = v.toBoolean();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
|
||||||
|
case JSVAL_TYPE_INT32:
|
||||||
|
if (v.isInt32()) {
|
||||||
|
*reinterpret_cast<int32_t*>(p) = v.toInt32();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
|
||||||
|
case JSVAL_TYPE_DOUBLE:
|
||||||
|
if (v.isNumber()) {
|
||||||
|
*reinterpret_cast<double*>(p) = v.toNumber();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
|
||||||
|
case JSVAL_TYPE_STRING:
|
||||||
|
if (v.isString()) {
|
||||||
|
JSString** np = reinterpret_cast<JSString**>(p);
|
||||||
|
if (IsInsideNursery(v.toString()) && !IsInsideNursery(unboxedObject))
|
||||||
|
v.toString()->storeBuffer()->putWholeCell(unboxedObject);
|
||||||
|
|
||||||
|
if (preBarrier)
|
||||||
|
JSString::writeBarrierPre(*np);
|
||||||
|
*np = v.toString();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
|
||||||
|
case JSVAL_TYPE_OBJECT:
|
||||||
|
if (v.isObjectOrNull()) {
|
||||||
|
JSObject** np = reinterpret_cast<JSObject**>(p);
|
||||||
|
|
||||||
|
// Update property types when writing object properties. Types for
|
||||||
|
// other properties were captured when the unboxed layout was
|
||||||
|
// created.
|
||||||
|
AddTypePropertyId(cx, unboxedObject, id, v);
|
||||||
|
|
||||||
|
// As above, trigger post barriers on the whole object.
|
||||||
|
JSObject* obj = v.toObjectOrNull();
|
||||||
|
if (IsInsideNursery(obj) && !IsInsideNursery(unboxedObject))
|
||||||
|
obj->storeBuffer()->putWholeCell(unboxedObject);
|
||||||
|
|
||||||
|
if (preBarrier)
|
||||||
|
JSObject::writeBarrierPre(*np);
|
||||||
|
*np = obj;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
|
||||||
|
default:
|
||||||
|
MOZ_CRASH("Invalid type for unboxed value");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////
|
||||||
// UnboxedPlainObject
|
// UnboxedPlainObject
|
||||||
/////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////
|
||||||
|
|
|
||||||
Загрузка…
Ссылка в новой задаче