aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/abi.cpp
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@qt.io>2019-07-12 13:40:00 +0200
committerAlessandro Portale <alessandro.portale@qt.io>2019-07-25 13:17:51 +0000
commitb89ad81293bb11d9ed1936f82679bd520ae9e323 (patch)
tree77e15e5ba78202db2679a028f79a8bbe8e2bf94f /src/plugins/projectexplorer/abi.cpp
parent16a2241e7de4366fafe9a5df5b33a099fa2a4f60 (diff)
WebAssembly: Initial commit
This change adds WebAssembly support in the shape of a plugin. - Auto-detection of the emsdk toolchain - Handling of "asmjs-unknown-emscripten" Abi - Binary detection of WebAssembly libraries - Auto-creation of a "WebAssembly runtime" device (with icon) - Runconfiguration that launches the application via the "emrun" tool which spawns a local web server and runs the application on the chosen web browser. Limitations: - So far only tested on Windows/MinGW and Linux - Not yet tested with Qt WebAssembly installation form the installer Only tested with self-built Qt and manually added kit - The attempt to launch an application via emrun, while a previous application is still running, will fail. The reason is that the web servers spawned by emrun listen to the same default port but serve only the content of one application. Possible solutions: We could either spawn the different web servers with different ports, or we could use one single web server instance which serves the whole default project location (home directory). Task-number: QTCREATORBUG-21068 Task-number: QTCREATORBUG-22249 Change-Id: I1a16fbe52382d45c37e9bc624a943a6ca475fa09 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/abi.cpp')
-rw-r--r--src/plugins/projectexplorer/abi.cpp27
1 files changed, 27 insertions, 0 deletions
diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp
index abce4d4617..971636dc7b 100644
--- a/src/plugins/projectexplorer/abi.cpp
+++ b/src/plugins/projectexplorer/abi.cpp
@@ -161,6 +161,8 @@ static Abi::Architecture architectureFromQt()
return Abi::ShArchitecture;
if (arch.startsWith("avr")) // Not in Qt documentation!
return Abi::AvrArchitecture;
+ if (arch.startsWith("asmjs"))
+ return Abi::AsmJsArchitecture;
return Abi::UnknownArchitecture;
}
@@ -411,6 +413,11 @@ static Abis abiOf(const QByteArray &data)
result.append(macAbiForCpu(type));
pos += 20;
}
+ } else if (getUint8(data, 0) == 'B' && getUint8(data, 1) == 'C'
+ && getUint8(data, 2) == 0xc0 && getUint8(data, 3) == 0xde) {
+ // https://llvm.org/docs/BitCodeFormat.html#llvm-ir-magic-number
+ result.append(Abi(Abi::AsmJsArchitecture, Abi::UnknownOS, Abi::UnknownFlavor,
+ Abi::EmscriptenFormat, 32));
} else if (data.size() >= 64){
// Windows PE: values are LE (except for a few exceptions which we will not use here).
@@ -543,6 +550,11 @@ Abi Abi::abiFromTargetTriplet(const QString &triple)
os = QnxOS;
flavor = GenericFlavor;
format = ElfFormat;
+ } else if (p.startsWith("emscripten")) {
+ format = EmscriptenFormat;
+ width = 32;
+ } else if (p.startsWith("asmjs")) {
+ arch = AsmJsArchitecture;
} else if (p == "none") {
os = BareMetalOS;
flavor = GenericFlavor;
@@ -677,6 +689,8 @@ QString Abi::toString(const Architecture &a)
return QLatin1String("itanium");
case ShArchitecture:
return QLatin1String("sh");
+ case AsmJsArchitecture:
+ return QLatin1String("asmjs");
case UnknownArchitecture:
Q_FALLTHROUGH();
default:
@@ -734,6 +748,8 @@ QString Abi::toString(const BinaryFormat &bf)
return QLatin1String("ubrof");
case OmfFormat:
return QLatin1String("omf");
+ case EmscriptenFormat:
+ return QLatin1String("emscripten");
case UnknownFormat:
Q_FALLTHROUGH();
default:
@@ -813,6 +829,8 @@ Abi::Architecture Abi::architectureFromString(const QStringRef &a)
return ShArchitecture;
else if (a == "xtensa")
return XtensaArchitecture;
+ if (a == "asmjs")
+ return AsmJsArchitecture;
return UnknownArchitecture;
}
@@ -865,6 +883,8 @@ Abi::BinaryFormat Abi::binaryFormatFromString(const QStringRef &bf)
return OmfFormat;
if (bf == "qml_rt")
return RuntimeQmlFormat;
+ if (bf == "emscripten")
+ return EmscriptenFormat;
return UnknownFormat;
}
@@ -1150,6 +1170,9 @@ void ProjectExplorer::ProjectExplorerPlugin::testAbiOfBinary_data()
QTest::newRow("static QtCore: linux 64bit")
<< QString::fromLatin1("%1/static/linux-64bit-release.a").arg(prefix)
<< (QStringList() << QString::fromLatin1("x86-linux-generic-elf-64bit"));
+ QTest::newRow("static QtCore: asmjs emscripten 32bit")
+ << QString::fromLatin1("%1/static/asmjs-emscripten.a").arg(prefix)
+ << (QStringList() << QString::fromLatin1("asmjs-unknown-unknown-emscripten-32bit"));
QTest::newRow("static stdc++: mac fat")
<< QString::fromLatin1("%1/static/mac-fat.a").arg(prefix)
@@ -1350,6 +1373,10 @@ void ProjectExplorer::ProjectExplorerPlugin::testAbiFromTargetTriplet_data()
QTest::newRow("avr") << int(Abi::AvrArchitecture)
<< int(Abi::BareMetalOS) << int(Abi::GenericFlavor)
<< int(Abi::ElfFormat) << 16;
+
+ QTest::newRow("asmjs-unknown-emscripten") << int(Abi::AsmJsArchitecture)
+ << int(Abi::UnknownOS) << int(Abi::UnknownFlavor)
+ << int(Abi::EmscriptenFormat) << 32;
}
void ProjectExplorer::ProjectExplorerPlugin::testAbiFromTargetTriplet()