AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[wasm] remove raw mode from wasm translation

Browse Source 
R=clemensh@chromium.org,kozyatinskiy@chromium.org

Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: Ic6c7e2eaa4463d945d00eb1e1123d7d1731b34db
Reviewed-on: https://chromium-review.googlesource.com/c/1297671
Reviewed-by: Clemens Hammacher <clemensh@chromium.org>
Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Commit-Queue: Aseem Garg <aseemgarg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#56959}
This commit is contained in:
Aseem Garg 2018-10-23 18:25:10 -07:00 committed by Commit Bot
parent f6a8576897
commit 6bc73a287f
2 changed files with 8 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/inspector/wasm-translation.cc
View File

@ -67,52 +67,11 @@ class WasmTranslation::TranslatorImpl {
column(column) {}
};
virtual void Init(v8::Isolate*, WasmTranslation*, V8DebuggerAgentImpl*) = 0;
virtual void Translate(TransLocation*) = 0;
virtual void TranslateBack(TransLocation*) = 0;
virtual const WasmSourceInformation& GetSourceInformation(v8::Isolate*,
int index) = 0;
virtual const String16 GetHash(v8::Isolate*, int index) = 0;
virtual ~TranslatorImpl() = default;
class RawTranslator;
class DisassemblingTranslator;
};
class WasmTranslation::TranslatorImpl::RawTranslator
: public WasmTranslation::TranslatorImpl {
public:
void Init(v8::Isolate*, WasmTranslation*, V8DebuggerAgentImpl*) override {}
void Translate(TransLocation*) override {}
void TranslateBack(TransLocation*) override {}
const WasmSourceInformation& GetSourceInformation(v8::Isolate*,
int index) override {
// NOTE(mmarchini): prior to 3.9, clang won't accept const object
// instantiations with non-user-provided default constructors, unless an
// empty initializer is explicitly given. Node.js still supports older
// clang versions, therefore we must take care when using const objects
// with default constructors. For more informations, please refer to CWG
// 253 (http://open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#253)
static const WasmSourceInformation singleEmptySourceInformation = {};
return singleEmptySourceInformation;
}
const String16 GetHash(v8::Isolate*, int index) override {
// TODO(herhut): Find useful hash default value.
return String16();
}
};
class WasmTranslation::TranslatorImpl::DisassemblingTranslator
: public WasmTranslation::TranslatorImpl {
public:
DisassemblingTranslator(v8::Isolate* isolate,
v8::Local<v8::debug::WasmScript> script)
TranslatorImpl(v8::Isolate* isolate, v8::Local<v8::debug::WasmScript> script)
: script_(isolate, script) {}
void Init(v8::Isolate* isolate, WasmTranslation* translation,
V8DebuggerAgentImpl* agent) override {
V8DebuggerAgentImpl* agent) {
// Register fake scripts for each function in this wasm module/script.
v8::Local<v8::debug::WasmScript> script = script_.Get(isolate);
int num_functions = script->NumFunctions();
@ -127,7 +86,7 @@ class WasmTranslation::TranslatorImpl::DisassemblingTranslator
}
}
void Translate(TransLocation* loc) override {
void Translate(TransLocation* loc) {
const OffsetTable& offset_table = GetOffsetTable(loc);
DCHECK(!offset_table.empty());
uint32_t byte_offset = static_cast<uint32_t>(loc->column);
@ -160,7 +119,7 @@ class WasmTranslation::TranslatorImpl::DisassemblingTranslator
(entry.line == loc.line && entry.column < loc.column);
}
void TranslateBack(TransLocation* loc) override {
void TranslateBack(TransLocation* loc) {
v8::Isolate* isolate = loc->translation->isolate_;
int func_index = GetFunctionIndexFromFakeScriptId(loc->script_id);
const OffsetTable& reverse_table = GetReverseTable(isolate, func_index);
@ -192,7 +151,7 @@ class WasmTranslation::TranslatorImpl::DisassemblingTranslator
}
const WasmSourceInformation& GetSourceInformation(v8::Isolate* isolate,
int index) override {
int index) {
auto it = source_informations_.find(index);
if (it != source_informations_.end()) return it->second;
v8::HandleScope scope(isolate);
@ -207,7 +166,7 @@ class WasmTranslation::TranslatorImpl::DisassemblingTranslator
return inserted.first->second;
}
const String16 GetHash(v8::Isolate* isolate, int index) override {
const String16 GetHash(v8::Isolate* isolate, int index) {
v8::HandleScope scope(isolate);
v8::Local<v8::debug::WasmScript> script = script_.Get(isolate);
uint32_t hash = script->GetFunctionHash(index);
@ -286,22 +245,14 @@ class WasmTranslation::TranslatorImpl::DisassemblingTranslator
std::unordered_map<int, WasmSourceInformation> source_informations_;
};
WasmTranslation::WasmTranslation(v8::Isolate* isolate)
: isolate_(isolate), mode_(Disassemble) {}
WasmTranslation::WasmTranslation(v8::Isolate* isolate) : isolate_(isolate) {}
WasmTranslation::~WasmTranslation() { Clear(); }
void WasmTranslation::AddScript(v8::Local<v8::debug::WasmScript> script,
V8DebuggerAgentImpl* agent) {
std::unique_ptr<TranslatorImpl> impl;
switch (mode_) {
case Raw:
impl.reset(new TranslatorImpl::RawTranslator());
break;
case Disassemble:
impl.reset(new TranslatorImpl::DisassemblingTranslator(isolate_, script));
break;
}
impl.reset(new TranslatorImpl(isolate_, script));
DCHECK(impl);
auto inserted =
wasm_translators_.insert(std::make_pair(script->Id(), std::move(impl)));

6
src/inspector/wasm-translation.h
View File

@ -19,14 +19,9 @@ class V8DebuggerAgentImpl;
class WasmTranslation {
public:
enum Mode { Raw, Disassemble };
explicit WasmTranslation(v8::Isolate* isolate);
~WasmTranslation();
// Set translation mode.
void SetMode(Mode mode) { mode_ = mode; }
// Make a wasm script known to the translation. This will trigger a number of
// didParseScript calls to the given debugger agent.
// Only locations referencing a registered script will be translated by the
@ -72,7 +67,6 @@ class WasmTranslation {
v8::Isolate* isolate_;
std::unordered_map<int, std::unique_ptr<TranslatorImpl>> wasm_translators_;
std::unordered_map<String16, TranslatorImpl*> fake_scripts_;
Mode mode_;
DISALLOW_COPY_AND_ASSIGN(WasmTranslation);
};