Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: src/IceCompiler.cpp

Issue 1837663002: Initial Subzero WASM prototype. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Code review feedback and merging master Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/IceClFlags.def ('k') | src/IceDefs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/IceCompiler.cpp
diff --git a/src/IceCompiler.cpp b/src/IceCompiler.cpp
index 3120beaa0d69187ae57bc2f0a219db7d7c944091..6a853d0e5028f9ca36b3371678f9a9a73748036e 100644
--- a/src/IceCompiler.cpp
+++ b/src/IceCompiler.cpp
@@ -25,6 +25,7 @@
#include "IceConverter.h"
#include "IceELFObjectWriter.h"
#include "PNaClTranslator.h"
+#include "WasmTranslator.h"
#ifdef __clang__
#pragma clang diagnostic push
@@ -54,6 +55,11 @@ bool llvmIRInput(const std::string &Filename) {
std::regex_match(Filename, std::regex(".*\\.ll"));
}
+bool wasmInput(const std::string &Filename) {
+ return BuildDefs::llvmIrAsInput() &&
+ std::regex_match(Filename, std::regex(".*\\.wasm"));
+}
+
} // end of anonymous namespace
void Compiler::run(const Ice::ClFlags &Flags, GlobalContext &Ctx,
@@ -75,13 +81,27 @@ void Compiler::run(const Ice::ClFlags &Flags, GlobalContext &Ctx,
std::unique_ptr<Translator> Translator;
const std::string IRFilename = Flags.getIRFilename();
- const bool BuildOnRead = Flags.getBuildOnRead() && !llvmIRInput(IRFilename);
+ const bool BuildOnRead = Flags.getBuildOnRead() && !llvmIRInput(IRFilename) &&
+ !wasmInput(IRFilename);
+ const bool WasmBuildOnRead = Flags.getBuildOnRead() && wasmInput(IRFilename);
if (BuildOnRead) {
std::unique_ptr<PNaClTranslator> PTranslator(new PNaClTranslator(&Ctx));
std::unique_ptr<llvm::StreamingMemoryObject> MemObj(
new llvm::StreamingMemoryObjectImpl(InputStream.release()));
PTranslator->translate(IRFilename, std::move(MemObj));
Translator.reset(PTranslator.release());
+ } else if (WasmBuildOnRead) {
+ if (BuildDefs::wasm()) {
+ std::unique_ptr<WasmTranslator> WTranslator(new WasmTranslator(&Ctx));
+
+ WTranslator->translate(IRFilename, std::move(InputStream));
+
+ Translator.reset(WTranslator.release());
+ } else {
+ Ctx.getStrError() << "WASM support not enabled\n";
+ Ctx.getErrorStatus()->assign(EC_Args);
+ return;
+ }
} else if (BuildDefs::llvmIr()) {
if (BuildDefs::browser()) {
Ctx.getStrError()
« no previous file with comments | « src/IceClFlags.def ('k') | src/IceDefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698