mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
746e6ca3e6
- Bug 1225605: Describe the SIMD type descriptors in terms of a concept; r=jolesen (dc938099ad)
- Bug 1225605: Rename SIMD descriptors toType -> Cast, setReturn -> ToValue, and remove one-argument toType; r=jolesen (b74a4e702e)
- Bug 1225605: Remove non standard SIMD.Int{32x4,16x8,8x16}.bool; r=jolesen (c533d96fdd)
- Bug 1225605: Store SIMD type descriptors on the global SIMD object rather than on the global; r=jolesen (b4ad3e2b39)
- Bug 1221285 - Part 1: Add "-S" option to disassemble() to omit source notes from the output. Not strictly necessary, but convenient. r=efaust. (a74a46dff9)
- Bug 1213111 - Extract progressbar from jittest's process_test_results; r=sfink (fa9e6737b5)
- Bug 1213127 - Switch jit-tests over to using jstest's task runner; r=sfink (87baae32c5)
- Bug 1213129 - Share worker count derivation code between jit and js test suites; r=sfink (be70b49724)
- Bug 1218587 - Add -G option for running jit-tests under rr. r=terrence (110fa2d1c2)
- Bug 1215063 - Add jit-tests support for running a test as a module and add some tests r=shu (82006f2b11)
- Bug 1213133 - Remove jit-test's legacy multiprocessing and serial task runners; r=sfink (f1f1e06695)
- Bug 1221285 - Part 2: Test harness support for --test-reflect-stringify. r=efaust. (6f835487d3)
- Bug 1195198 - Octane: Restore run.js broken by Bug 1179063. r=terrence (0346782401)
- Bug 1225908 - SimdTypeToLaneType. r=bbouvier (f3782f5fa8)
- Bug 1226445: SharedStubs - Keep track of the pushed frames correctly in GetPropCallNative, r=jandem (89deea6955)
- Bug 1228259 - jitspew is #ifdef JS_JITSPEW not DEBUG. r=h4writer (cf6ef8b871)
- missing bits of Bug 1231224 part 6 - Handle Vector OOM in some copy constructors. r=bhackett (29af1bfd2f)
- Bug 1147430 - Optimize load followed by unbox. r=jandem (a4c17ed873)
- Bug 1225908 - SimdTypeToArrayElementType. r=bbouvier (a31ecf633d)
- Bug 1132183 followup - Bump smallFunctionMaxBytecodeLength to 120. r=h4writer (008b612d7b)
- Bug 1132183 followup - Bump inlineMaxCalleeInlinedBytecodeLength to 3350. r=h4writer on IRC (6ca0102c81)
- Bug 1221421 - Fix Ion JSPropertyOp getter stub. r=bz (d1d8e07432)
- Bug 1222905 - Fix some issues related to Ion's AddSlot IC code. r=bhackett (77edef4115)
- Bug 1226732 - Use stable hashing and builtin sweeping for ipc::ObjectIdMap; r=billm (155058eb41)
- Bug 1226888 - Remove an incorrect assertion about store buffer state; r=jandem (69f16b9526)
- Bug 1227774 - Encapsulate markCompartments logic; r=jonco (33f0fd5fe5)
228 lines
7.2 KiB
C++
228 lines
7.2 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
|
* vim: set ts=8 sw=4 et tw=80:
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#ifndef mozilla_jsipc_JavaScriptShared_h__
|
|
#define mozilla_jsipc_JavaScriptShared_h__
|
|
|
|
#include "mozilla/dom/DOMTypes.h"
|
|
#include "mozilla/jsipc/CrossProcessObjectWrappers.h"
|
|
#include "mozilla/jsipc/PJavaScript.h"
|
|
#include "js/GCHashTable.h"
|
|
#include "nsJSUtils.h"
|
|
|
|
namespace mozilla {
|
|
namespace jsipc {
|
|
|
|
class ObjectId {
|
|
public:
|
|
// Use 47 bits at most, to be safe, since jsval privates are encoded as
|
|
// doubles. See bug 1065811 comment 12 for an explanation.
|
|
static const size_t SERIAL_NUMBER_BITS = 47;
|
|
static const size_t FLAG_BITS = 1;
|
|
static const uint64_t SERIAL_NUMBER_MAX = (uint64_t(1) << SERIAL_NUMBER_BITS) - 1;
|
|
|
|
explicit ObjectId(uint64_t serialNumber, bool hasXrayWaiver)
|
|
: serialNumber_(serialNumber), hasXrayWaiver_(hasXrayWaiver)
|
|
{
|
|
if (MOZ_UNLIKELY(serialNumber == 0 || serialNumber > SERIAL_NUMBER_MAX))
|
|
MOZ_CRASH("Bad CPOW Id");
|
|
}
|
|
|
|
bool operator==(const ObjectId& other) const {
|
|
bool equal = serialNumber() == other.serialNumber();
|
|
MOZ_ASSERT_IF(equal, hasXrayWaiver() == other.hasXrayWaiver());
|
|
return equal;
|
|
}
|
|
|
|
bool isNull() { return !serialNumber_; }
|
|
|
|
uint64_t serialNumber() const { return serialNumber_; }
|
|
bool hasXrayWaiver() const { return hasXrayWaiver_; }
|
|
uint64_t serialize() const {
|
|
MOZ_ASSERT(serialNumber(), "Don't send a null ObjectId over IPC");
|
|
return uint64_t((serialNumber() << FLAG_BITS) | ((hasXrayWaiver() ? 1 : 0) << 0));
|
|
}
|
|
|
|
static ObjectId nullId() { return ObjectId(); }
|
|
static ObjectId deserialize(uint64_t data) {
|
|
return ObjectId(data >> FLAG_BITS, data & 1);
|
|
}
|
|
|
|
// For use with StructGCPolicy.
|
|
void trace(JSTracer*) const {}
|
|
bool needsSweep() const { return false; }
|
|
|
|
private:
|
|
ObjectId() : serialNumber_(0), hasXrayWaiver_(false) {}
|
|
|
|
uint64_t serialNumber_ : SERIAL_NUMBER_BITS;
|
|
bool hasXrayWaiver_ : 1;
|
|
};
|
|
|
|
class JavaScriptShared;
|
|
|
|
// DefaultHasher<T> requires that T coerce to an integral type. We could make
|
|
// ObjectId do that, but doing so would weaken our type invariants, so we just
|
|
// reimplement it manually.
|
|
struct ObjectIdHasher
|
|
{
|
|
typedef ObjectId Lookup;
|
|
static js::HashNumber hash(const Lookup& l) {
|
|
return l.serialize();
|
|
}
|
|
static bool match(const ObjectId& k, const ObjectId& l) {
|
|
return k == l;
|
|
}
|
|
static void rekey(ObjectId& k, const ObjectId& newKey) {
|
|
k = newKey;
|
|
}
|
|
};
|
|
|
|
// Map ids -> JSObjects
|
|
class IdToObjectMap
|
|
{
|
|
typedef js::HashMap<ObjectId, JS::Heap<JSObject*>, ObjectIdHasher, js::SystemAllocPolicy> Table;
|
|
|
|
public:
|
|
IdToObjectMap();
|
|
|
|
bool init();
|
|
void trace(JSTracer* trc);
|
|
void sweep();
|
|
|
|
bool add(ObjectId id, JSObject* obj);
|
|
JSObject* find(ObjectId id);
|
|
void remove(ObjectId id);
|
|
|
|
void clear();
|
|
bool empty() const;
|
|
|
|
private:
|
|
Table table_;
|
|
};
|
|
|
|
// Map JSObjects -> ids
|
|
class ObjectToIdMap
|
|
{
|
|
using Hasher = js::MovableCellHasher<JS::Heap<JSObject*>>;
|
|
using Table = js::GCHashMap<JS::Heap<JSObject*>, ObjectId, Hasher, js::SystemAllocPolicy>;
|
|
|
|
public:
|
|
explicit ObjectToIdMap(JSRuntime* rt);
|
|
~ObjectToIdMap();
|
|
|
|
bool init();
|
|
void trace(JSTracer* trc);
|
|
void sweep();
|
|
|
|
bool add(JSContext* cx, JSObject* obj, ObjectId id);
|
|
ObjectId find(JSObject* obj);
|
|
void remove(JSObject* obj);
|
|
void clear();
|
|
|
|
private:
|
|
JSRuntime* rt_;
|
|
Table table_;
|
|
};
|
|
|
|
class Logging;
|
|
|
|
class JavaScriptShared : public CPOWManager
|
|
{
|
|
public:
|
|
explicit JavaScriptShared(JSRuntime* rt);
|
|
virtual ~JavaScriptShared();
|
|
|
|
bool init();
|
|
|
|
void decref();
|
|
void incref();
|
|
|
|
bool Unwrap(JSContext* cx, const InfallibleTArray<CpowEntry>& aCpows, JS::MutableHandleObject objp);
|
|
bool Wrap(JSContext* cx, JS::HandleObject aObj, InfallibleTArray<CpowEntry>* outCpows);
|
|
|
|
protected:
|
|
bool toVariant(JSContext* cx, JS::HandleValue from, JSVariant* to);
|
|
bool fromVariant(JSContext* cx, const JSVariant& from, JS::MutableHandleValue to);
|
|
|
|
bool toJSIDVariant(JSContext* cx, JS::HandleId from, JSIDVariant* to);
|
|
bool fromJSIDVariant(JSContext* cx, const JSIDVariant& from, JS::MutableHandleId to);
|
|
|
|
bool toSymbolVariant(JSContext* cx, JS::Symbol* sym, SymbolVariant* symVarp);
|
|
JS::Symbol* fromSymbolVariant(JSContext* cx, SymbolVariant symVar);
|
|
|
|
bool fromDescriptor(JSContext* cx, JS::Handle<JSPropertyDescriptor> desc,
|
|
PPropertyDescriptor* out);
|
|
bool toDescriptor(JSContext* cx, const PPropertyDescriptor& in,
|
|
JS::MutableHandle<JSPropertyDescriptor> out);
|
|
|
|
bool toObjectOrNullVariant(JSContext* cx, JSObject* obj, ObjectOrNullVariant* objVarp);
|
|
JSObject* fromObjectOrNullVariant(JSContext* cx, ObjectOrNullVariant objVar);
|
|
|
|
bool convertIdToGeckoString(JSContext* cx, JS::HandleId id, nsString* to);
|
|
bool convertGeckoStringToId(JSContext* cx, const nsString& from, JS::MutableHandleId id);
|
|
|
|
virtual bool toObjectVariant(JSContext* cx, JSObject* obj, ObjectVariant* objVarp) = 0;
|
|
virtual JSObject* fromObjectVariant(JSContext* cx, ObjectVariant objVar) = 0;
|
|
|
|
static void ConvertID(const nsID& from, JSIID* to);
|
|
static void ConvertID(const JSIID& from, nsID* to);
|
|
|
|
JSObject* findCPOWById(const ObjectId& objId) {
|
|
return cpows_.find(objId);
|
|
}
|
|
JSObject* findObjectById(JSContext* cx, const ObjectId& objId);
|
|
|
|
static bool LoggingEnabled() { return sLoggingEnabled; }
|
|
static bool StackLoggingEnabled() { return sStackLoggingEnabled; }
|
|
|
|
friend class Logging;
|
|
|
|
virtual bool isParent() = 0;
|
|
|
|
virtual JSObject* scopeForTargetObjects() = 0;
|
|
|
|
protected:
|
|
JSRuntime* rt_;
|
|
uintptr_t refcount_;
|
|
|
|
IdToObjectMap objects_;
|
|
IdToObjectMap cpows_;
|
|
|
|
uint64_t nextSerialNumber_;
|
|
|
|
// CPOW references can be weak, and any object we store in a map may be
|
|
// GCed (at which point the CPOW will report itself "dead" to the owner).
|
|
// This means that we don't want to store any js::Wrappers in the CPOW map,
|
|
// because CPOW will die if the wrapper is GCed, even if the underlying
|
|
// object is still alive.
|
|
//
|
|
// This presents a tricky situation for Xray waivers, since they're normally
|
|
// represented as a special same-compartment wrapper. We have to strip them
|
|
// off before putting them in the id-to-object and object-to-id maps, so we
|
|
// need a way of distinguishing them at lookup-time.
|
|
//
|
|
// For the id-to-object map, we encode waiver-or-not information into the id
|
|
// itself, which lets us do the right thing when accessing the object.
|
|
//
|
|
// For the object-to-id map, we just keep two maps, one for each type.
|
|
ObjectToIdMap unwaivedObjectIds_;
|
|
ObjectToIdMap waivedObjectIds_;
|
|
ObjectToIdMap& objectIdMap(bool waiver) {
|
|
return waiver ? waivedObjectIds_ : unwaivedObjectIds_;
|
|
}
|
|
|
|
static bool sLoggingInitialized;
|
|
static bool sLoggingEnabled;
|
|
static bool sStackLoggingEnabled;
|
|
};
|
|
|
|
} // namespace jsipc
|
|
} // namespace mozilla
|
|
|
|
#endif
|