Commit b002829b authored by Michael Starzinger's avatar Michael Starzinger Committed by Commit Bot

[wasm] Print runtime stub name with --print-wasm-code.

R=titzer@chromium.org

Change-Id: I543f7d65d04b54951be126ca1e30bb7e81f026a8
Reviewed-on: https://chromium-review.googlesource.com/1253606Reviewed-by: 's avatarBen Titzer <titzer@chromium.org>
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#56313}
parent c56ffe13
...@@ -454,15 +454,15 @@ void NativeModule::SetRuntimeStubs(Isolate* isolate) { ...@@ -454,15 +454,15 @@ void NativeModule::SetRuntimeStubs(Isolate* isolate) {
#define COPY_BUILTIN(Name) \ #define COPY_BUILTIN(Name) \
runtime_stub_table_[WasmCode::k##Name] = \ runtime_stub_table_[WasmCode::k##Name] = \
AddAnonymousCode(isolate->builtins()->builtin_handle(Builtins::k##Name), \ AddAnonymousCode(isolate->builtins()->builtin_handle(Builtins::k##Name), \
WasmCode::kRuntimeStub); WasmCode::kRuntimeStub, #Name);
#define COPY_BUILTIN_TRAP(Name) COPY_BUILTIN(ThrowWasm##Name) #define COPY_BUILTIN_TRAP(Name) COPY_BUILTIN(ThrowWasm##Name)
WASM_RUNTIME_STUB_LIST(COPY_BUILTIN, COPY_BUILTIN_TRAP); WASM_RUNTIME_STUB_LIST(COPY_BUILTIN, COPY_BUILTIN_TRAP);
#undef COPY_BUILTIN_TRAP #undef COPY_BUILTIN_TRAP
#undef COPY_BUILTIN #undef COPY_BUILTIN
} }
WasmCode* NativeModule::AddAnonymousCode(Handle<Code> code, WasmCode* NativeModule::AddAnonymousCode(Handle<Code> code, WasmCode::Kind kind,
WasmCode::Kind kind) { const char* name) {
// For off-heap builtins, we create a copy of the off-heap instruction stream // For off-heap builtins, we create a copy of the off-heap instruction stream
// instead of the on-heap code object containing the trampoline. Ensure that // instead of the on-heap code object containing the trampoline. Ensure that
// we do not apply the on-heap reloc info to the off-heap instructions. // we do not apply the on-heap reloc info to the off-heap instructions.
...@@ -519,7 +519,7 @@ WasmCode* NativeModule::AddAnonymousCode(Handle<Code> code, ...@@ -519,7 +519,7 @@ WasmCode* NativeModule::AddAnonymousCode(Handle<Code> code,
// made while iterating over the RelocInfo above. // made while iterating over the RelocInfo above.
Assembler::FlushICache(ret->instructions().start(), Assembler::FlushICache(ret->instructions().start(),
ret->instructions().size()); ret->instructions().size());
if (FLAG_print_code || FLAG_print_wasm_code) ret->Print(); if (FLAG_print_code || FLAG_print_wasm_code) ret->Print(name);
ret->Validate(); ret->Validate();
return ret; return ret;
} }
......
...@@ -347,7 +347,8 @@ class V8_EXPORT_PRIVATE NativeModule final { ...@@ -347,7 +347,8 @@ class V8_EXPORT_PRIVATE NativeModule final {
WasmCodeManager* code_manager, WasmCodeManager* code_manager,
std::shared_ptr<const WasmModule> module, const ModuleEnv& env); std::shared_ptr<const WasmModule> module, const ModuleEnv& env);
WasmCode* AddAnonymousCode(Handle<Code>, WasmCode::Kind kind); WasmCode* AddAnonymousCode(Handle<Code>, WasmCode::Kind kind,
const char* name = nullptr);
// Allocate code space. Returns a valid buffer or fails with OOM (crash). // Allocate code space. Returns a valid buffer or fails with OOM (crash).
Vector<byte> AllocateForCode(size_t size); Vector<byte> AllocateForCode(size_t size);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment