2a3c2c73d5
I missed one required change which was hidden behind an #if. The fix is in the diff between Patch 1 and Patch 3. Original message: In this CL I remove the isolate from signatures of ExternalReference accessor functions where the isolate is not used. The uses of the isolate were already removed in previous CLs. Changes: * I split the ExternalReference list in external-reference.h into those which need the isolate for initialization and those which do not. * I removed the public constructors and replaced them by ExternalReference::Create(). The reason is to separate external creation more clearly from internal creation, because externally created ExternalReferences sometimes need redirection, whereas internally created ExternalReferences are just stored as they are. In addition, by removing the isolate from the signature of the public constructors, they suddenly exactly matched the interal constructor. * Replace all uses of the public constructors with ExternalReference::Create(). * Remove the isolate from all call sites where necessary. This is a step towards making WebAssembly compilation independent of the isolate. R=mstarzinger@chromium.org Bug: v8:7570 Cq-Include-Trybots: luci.v8.try:v8_linux_noi18n_rel_ng Change-Id: I750c162f5d58ed32e866722b0db920f8b9bd8057 Reviewed-on: https://chromium-review.googlesource.com/1026673 Reviewed-by: Michael Starzinger <mstarzinger@chromium.org> Commit-Queue: Andreas Haas <ahaas@chromium.org> Cr-Commit-Position: refs/heads/master@{#52777}
238 lines
8.1 KiB
C++
238 lines
8.1 KiB
C++
// Copyright 2016 the V8 project authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "src/external-reference-table.h"
|
|
|
|
#include "src/accessors.h"
|
|
#include "src/counters.h"
|
|
#include "src/external-reference.h"
|
|
#include "src/ic/stub-cache.h"
|
|
|
|
#if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
|
|
#define SYMBOLIZE_FUNCTION
|
|
#include <execinfo.h>
|
|
#include <vector>
|
|
#endif // DEBUG && V8_OS_LINUX && !V8_OS_ANDROID
|
|
|
|
namespace v8 {
|
|
namespace internal {
|
|
|
|
// Forward declarations for C++ builtins.
|
|
#define FORWARD_DECLARE(Name) \
|
|
Object* Builtin_##Name(int argc, Object** args, Isolate* isolate);
|
|
BUILTIN_LIST_C(FORWARD_DECLARE)
|
|
#undef FORWARD_DECLARE
|
|
|
|
void ExternalReferenceTable::Init(Isolate* isolate) {
|
|
int index = 0;
|
|
|
|
// kNullAddress is preserved through serialization/deserialization.
|
|
Add(kNullAddress, "nullptr", &index);
|
|
AddReferences(isolate, &index);
|
|
AddBuiltins(isolate, &index);
|
|
AddRuntimeFunctions(isolate, &index);
|
|
AddIsolateAddresses(isolate, &index);
|
|
AddAccessors(isolate, &index);
|
|
AddStubCache(isolate, &index);
|
|
is_initialized_ = true;
|
|
|
|
CHECK_EQ(kSize, index);
|
|
}
|
|
|
|
const char* ExternalReferenceTable::ResolveSymbol(void* address) {
|
|
#ifdef SYMBOLIZE_FUNCTION
|
|
char** names = backtrace_symbols(&address, 1);
|
|
const char* name = names[0];
|
|
// The array of names is malloc'ed. However, each name string is static
|
|
// and do not need to be freed.
|
|
free(names);
|
|
return name;
|
|
#else
|
|
return "<unresolved>";
|
|
#endif // SYMBOLIZE_FUNCTION
|
|
}
|
|
|
|
void ExternalReferenceTable::Add(Address address, const char* name,
|
|
int* index) {
|
|
refs_[(*index)++] = {address, name};
|
|
}
|
|
|
|
void ExternalReferenceTable::AddReferences(Isolate* isolate, int* index) {
|
|
CHECK_EQ(kSpecialReferenceCount, *index);
|
|
|
|
#define ADD_EXTERNAL_REFERENCE(name, desc) \
|
|
Add(ExternalReference::name().address(), desc, index);
|
|
EXTERNAL_REFERENCE_LIST(ADD_EXTERNAL_REFERENCE)
|
|
#undef ADD_EXTERNAL_REFERENCE
|
|
|
|
#define ADD_EXTERNAL_REFERENCE(name, desc) \
|
|
Add(ExternalReference::name(isolate).address(), desc, index);
|
|
EXTERNAL_REFERENCE_LIST_WITH_ISOLATE(ADD_EXTERNAL_REFERENCE)
|
|
#undef ADD_EXTERNAL_REFERENCE
|
|
|
|
CHECK_EQ(kSpecialReferenceCount + kExternalReferenceCount, *index);
|
|
}
|
|
|
|
void ExternalReferenceTable::AddBuiltins(Isolate* isolate, int* index) {
|
|
CHECK_EQ(kSpecialReferenceCount + kExternalReferenceCount, *index);
|
|
|
|
struct CBuiltinEntry {
|
|
Address address;
|
|
const char* name;
|
|
};
|
|
static const CBuiltinEntry c_builtins[] = {
|
|
#define DEF_ENTRY(Name, ...) {FUNCTION_ADDR(&Builtin_##Name), "Builtin_" #Name},
|
|
BUILTIN_LIST_C(DEF_ENTRY)
|
|
#undef DEF_ENTRY
|
|
};
|
|
for (unsigned i = 0; i < arraysize(c_builtins); ++i) {
|
|
Add(ExternalReference::Create(c_builtins[i].address).address(),
|
|
c_builtins[i].name, index);
|
|
}
|
|
|
|
CHECK_EQ(kSpecialReferenceCount + kExternalReferenceCount +
|
|
kBuiltinsReferenceCount,
|
|
*index);
|
|
}
|
|
|
|
void ExternalReferenceTable::AddRuntimeFunctions(Isolate* isolate, int* index) {
|
|
CHECK_EQ(kSpecialReferenceCount + kExternalReferenceCount +
|
|
kBuiltinsReferenceCount,
|
|
*index);
|
|
|
|
struct RuntimeEntry {
|
|
Runtime::FunctionId id;
|
|
const char* name;
|
|
};
|
|
|
|
static const RuntimeEntry runtime_functions[] = {
|
|
#define RUNTIME_ENTRY(name, i1, i2) {Runtime::k##name, "Runtime::" #name},
|
|
FOR_EACH_INTRINSIC(RUNTIME_ENTRY)
|
|
#undef RUNTIME_ENTRY
|
|
};
|
|
|
|
for (unsigned i = 0; i < arraysize(runtime_functions); ++i) {
|
|
ExternalReference ref = ExternalReference::Create(runtime_functions[i].id);
|
|
Add(ref.address(), runtime_functions[i].name, index);
|
|
}
|
|
|
|
CHECK_EQ(kSpecialReferenceCount + kExternalReferenceCount +
|
|
kBuiltinsReferenceCount + kRuntimeReferenceCount,
|
|
*index);
|
|
}
|
|
|
|
void ExternalReferenceTable::AddIsolateAddresses(Isolate* isolate, int* index) {
|
|
CHECK_EQ(kSpecialReferenceCount + kExternalReferenceCount +
|
|
kBuiltinsReferenceCount + kRuntimeReferenceCount,
|
|
*index);
|
|
|
|
// Top addresses
|
|
static const char* address_names[] = {
|
|
#define BUILD_NAME_LITERAL(Name, name) "Isolate::" #name "_address",
|
|
FOR_EACH_ISOLATE_ADDRESS_NAME(BUILD_NAME_LITERAL) nullptr
|
|
#undef BUILD_NAME_LITERAL
|
|
};
|
|
|
|
for (int i = 0; i < IsolateAddressId::kIsolateAddressCount; ++i) {
|
|
Add(isolate->get_address_from_id(static_cast<IsolateAddressId>(i)),
|
|
address_names[i], index);
|
|
}
|
|
|
|
CHECK_EQ(kSpecialReferenceCount + kExternalReferenceCount +
|
|
kBuiltinsReferenceCount + kRuntimeReferenceCount +
|
|
kIsolateAddressReferenceCount,
|
|
*index);
|
|
}
|
|
|
|
void ExternalReferenceTable::AddAccessors(Isolate* isolate, int* index) {
|
|
CHECK_EQ(kSpecialReferenceCount + kExternalReferenceCount +
|
|
kBuiltinsReferenceCount + kRuntimeReferenceCount +
|
|
kIsolateAddressReferenceCount,
|
|
*index);
|
|
|
|
// Accessors
|
|
struct AccessorRefTable {
|
|
Address address;
|
|
const char* name;
|
|
};
|
|
|
|
static const AccessorRefTable getters[] = {
|
|
#define ACCESSOR_INFO_DECLARATION(accessor_name, AccessorName) \
|
|
{FUNCTION_ADDR(&Accessors::AccessorName##Getter), \
|
|
"Accessors::" #AccessorName "Getter"}, /* NOLINT(whitespace/indent) */
|
|
ACCESSOR_INFO_LIST(ACCESSOR_INFO_DECLARATION)
|
|
#undef ACCESSOR_INFO_DECLARATION
|
|
};
|
|
static const AccessorRefTable setters[] = {
|
|
#define ACCESSOR_SETTER_DECLARATION(name) \
|
|
{ FUNCTION_ADDR(&Accessors::name), "Accessors::" #name},
|
|
ACCESSOR_SETTER_LIST(ACCESSOR_SETTER_DECLARATION)
|
|
#undef ACCESSOR_SETTER_DECLARATION
|
|
};
|
|
|
|
for (unsigned i = 0; i < arraysize(getters); ++i) {
|
|
Add(getters[i].address, getters[i].name, index);
|
|
}
|
|
|
|
for (unsigned i = 0; i < arraysize(setters); ++i) {
|
|
Add(setters[i].address, setters[i].name, index);
|
|
}
|
|
|
|
CHECK_EQ(kSpecialReferenceCount + kExternalReferenceCount +
|
|
kBuiltinsReferenceCount + kRuntimeReferenceCount +
|
|
kIsolateAddressReferenceCount + kAccessorReferenceCount,
|
|
*index);
|
|
}
|
|
|
|
void ExternalReferenceTable::AddStubCache(Isolate* isolate, int* index) {
|
|
CHECK_EQ(kSpecialReferenceCount + kExternalReferenceCount +
|
|
kBuiltinsReferenceCount + kRuntimeReferenceCount +
|
|
kIsolateAddressReferenceCount + kAccessorReferenceCount,
|
|
*index);
|
|
|
|
StubCache* load_stub_cache = isolate->load_stub_cache();
|
|
|
|
// Stub cache tables
|
|
Add(load_stub_cache->key_reference(StubCache::kPrimary).address(),
|
|
"Load StubCache::primary_->key", index);
|
|
Add(load_stub_cache->value_reference(StubCache::kPrimary).address(),
|
|
"Load StubCache::primary_->value", index);
|
|
Add(load_stub_cache->map_reference(StubCache::kPrimary).address(),
|
|
"Load StubCache::primary_->map", index);
|
|
Add(load_stub_cache->key_reference(StubCache::kSecondary).address(),
|
|
"Load StubCache::secondary_->key", index);
|
|
Add(load_stub_cache->value_reference(StubCache::kSecondary).address(),
|
|
"Load StubCache::secondary_->value", index);
|
|
Add(load_stub_cache->map_reference(StubCache::kSecondary).address(),
|
|
"Load StubCache::secondary_->map", index);
|
|
|
|
StubCache* store_stub_cache = isolate->store_stub_cache();
|
|
|
|
// Stub cache tables
|
|
Add(store_stub_cache->key_reference(StubCache::kPrimary).address(),
|
|
"Store StubCache::primary_->key", index);
|
|
Add(store_stub_cache->value_reference(StubCache::kPrimary).address(),
|
|
"Store StubCache::primary_->value", index);
|
|
Add(store_stub_cache->map_reference(StubCache::kPrimary).address(),
|
|
"Store StubCache::primary_->map", index);
|
|
Add(store_stub_cache->key_reference(StubCache::kSecondary).address(),
|
|
"Store StubCache::secondary_->key", index);
|
|
Add(store_stub_cache->value_reference(StubCache::kSecondary).address(),
|
|
"Store StubCache::secondary_->value", index);
|
|
Add(store_stub_cache->map_reference(StubCache::kSecondary).address(),
|
|
"Store StubCache::secondary_->map", index);
|
|
|
|
CHECK_EQ(kSpecialReferenceCount + kExternalReferenceCount +
|
|
kBuiltinsReferenceCount + kRuntimeReferenceCount +
|
|
kIsolateAddressReferenceCount + kAccessorReferenceCount +
|
|
kStubCacheReferenceCount,
|
|
*index);
|
|
CHECK_EQ(kSize, *index);
|
|
}
|
|
|
|
} // namespace internal
|
|
} // namespace v8
|
|
|
|
#undef SYMBOLIZE_FUNCTION
|