Skip to content

v8: fix build on Windows. #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PiotrSikora merged 6 commits into from
Apr 15, 2021
Merged

v8: fix build on Windows. #117

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c97f356
v8: fix build on Windows.
PiotrSikora Dec 10, 2020
6030dcc
review: fix format.
PiotrSikora Dec 11, 2020
fcb5e2a
Merge remote-tracking branch 'origin/master' into PiotrSikora/fix_win…
PiotrSikora Dec 17, 2020
c10892a
Merge remote-tracking branch 'origin/master' into PiotrSikora/fix_win…
PiotrSikora Mar 10, 2021
9377114
Merge remote-tracking branch 'origin/master' into PiotrSikora/fix_win…
PiotrSikora Apr 12, 2021
8e2ac08
Merge branch 'master' into fix_windows
PiotrSikora Apr 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 29 additions & 13 deletions src/v8/v8.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,14 +572,22 @@ void V8::getModuleFunctionImpl(std::string_view function_name,
return;
}
*function = [func, function_name, this](ContextBase *context, Args... args) -> void {
wasm::Val params[] = {makeVal(args)...};
const bool log = cmpLogLevel(LogLevel::trace);
if (log) {
integration()->trace("[host->vm] " + std::string(function_name) + "(" +
printValues(params, sizeof...(Args)) + ")");
}
SaveRestoreContext saved_context(context);
auto trap = func->call(params, nullptr);
wasm::own<wasm::Trap> trap = nullptr;
if constexpr (sizeof...(args) > 0) {
wasm::Val params[] = {makeVal(args)...};
if (log) {
integration()->trace("[host->vm] " + std::string(function_name) + "(" +
printValues(params, sizeof...(Args)) + ")");
}
trap = func->call(params, nullptr);
} else {
if (log) {
integration()->trace("[host->vm] " + std::string(function_name) + "()");
}
trap = func->call(nullptr, nullptr);
}
if (trap) {
fail(FailState::RuntimeError, getFailMessage(std::string(function_name), std::move(trap)));
return;
Expand Down Expand Up @@ -612,15 +620,23 @@ void V8::getModuleFunctionImpl(std::string_view function_name,
return;
}
*function = [func, function_name, this](ContextBase *context, Args... args) -> R {
wasm::Val params[] = {makeVal(args)...};
wasm::Val results[1];
const bool log = cmpLogLevel(LogLevel::trace);
if (log) {
integration()->trace("[host->vm] " + std::string(function_name) + "(" +
printValues(params, sizeof...(Args)) + ")");
}
SaveRestoreContext saved_context(context);
auto trap = func->call(params, results);
wasm::Val results[1];
wasm::own<wasm::Trap> trap = nullptr;
if constexpr (sizeof...(args) > 0) {
wasm::Val params[] = {makeVal(args)...};
if (log) {
integration()->trace("[host->vm] " + std::string(function_name) + "(" +
printValues(params, sizeof...(Args)) + ")");
}
trap = func->call(params, results);
} else {
if (log) {
integration()->trace("[host->vm] " + std::string(function_name) + "()");
}
trap = func->call(nullptr, results);
}
if (trap) {
fail(FailState::RuntimeError, getFailMessage(std::string(function_name), std::move(trap)));
return R{};
Expand Down