1 files changed, 37 insertions, 78 deletions
diff --git a/src/qml/compiler/qv4compileddata.cpp b/src/qml/compiler/qv4compileddata.cpp
index cacc3752ee..86cdb3eade 100644
--- a/src/qml/compiler/qv4compileddata.cpp
+++ b/src/qml/compiler/qv4compileddata.cpp
@@ -38,7 +38,6 @@
 ****************************************************************************/
 
 #include "qv4compileddata_p.h"
-#include "qv4jsir_p.h"
 #include <private/qv4value_p.h>
 #ifndef V4_BOOTSTRAP
 #include <private/qv4engine_p.h>
@@ -50,6 +49,7 @@
 #include <private/qqmlpropertycache_p.h>
 #include <private/qqmltypeloader_p.h>
 #include <private/qqmlengine_p.h>
+#include <private/qv4vme_moth_p.h>
 #include "qv4compilationunitmapper_p.h"
 #include <QQmlPropertyMap>
 #include <QDateTime>
@@ -94,23 +94,11 @@ static QString cacheFilePath(const QUrl &url)
 }
 #endif
 
-#ifndef V4_BOOTSTRAP
-CompilationUnit::CompilationUnit()
-    : data(0)
-    , engine(0)
-    , qmlEngine(0)
-    , runtimeLookups(0)
-    , runtimeRegularExpressions(0)
-    , runtimeClasses(0)
-    , constants(nullptr)
-    , totalBindingsCount(0)
-    , totalParserStatusCount(0)
-    , totalObjectCount(0)
-    , metaTypeId(-1)
-    , listMetaTypeId(-1)
-    , isRegisteredWithEngine(false)
+CompilationUnit::CompilationUnit(const Unit *unitData)
+    : data(unitData)
 {}
 
+#ifndef V4_BOOTSTRAP
 CompilationUnit::~CompilationUnit()
 {
     unlink();
@@ -163,15 +151,6 @@ QV4::Function *CompilationUnit::linkToEngine(ExecutionEngine *engine)
                 l->setter = QV4::Lookup::setterGeneric;
             else if (type == CompiledData::Lookup::Type_GlobalGetter)
                 l->globalGetter = QV4::Lookup::globalGetterGeneric;
-            else if (type == CompiledData::Lookup::Type_IndexedGetter)
-                l->indexedGetter = QV4::Lookup::indexedGetterGeneric;
-            else if (type == CompiledData::Lookup::Type_IndexedSetter)
-                l->indexedSetter = QV4::Lookup::indexedSetterGeneric;
-
-            for (int j = 0; j < QV4::Lookup::Size; ++j)
-                l->classList[j] = 0;
-            l->level = -1;
-            l->index = UINT_MAX;
             l->nameIndex = compiledLookups[i].nameIndex;
         }
     }
@@ -201,6 +180,19 @@ QV4::Function *CompilationUnit::linkToEngine(ExecutionEngine *engine)
 
     linkBackendToEngine(engine);
 
+    static const bool showCode = qEnvironmentVariableIsSet("QV4_SHOW_BYTECODE");
+    if (showCode) {
+        qDebug() << "=== Constant table";
+        Moth::dumpConstantTable(constants, data->constantTableSize);
+        qDebug() << "=== String table";
+        for (uint i = 0; i < data->stringTableSize; ++i)
+            qDebug() << "    " << i << ":" << runtimeStrings[i]->toQString();
+        qDebug() << "=== Closure table";
+        for (uint i = 0; i < data->functionTableSize; ++i)
+            qDebug() << "    " << i << ":" << runtimeFunctions[i]->name()->toQString();
+        qDebug() << "root function at index " << (data->indexOfRootFunction != -1 ? data->indexOfRootFunction : 0);
+    }
+
     if (data->indexOfRootFunction != -1)
         return runtimeFunctions[data->indexOfRootFunction];
     else
@@ -260,19 +252,11 @@ void CompilationUnit::markObjects(QV4::MarkStack *markStack)
     }
 }
 
-void CompilationUnit::destroy()
-{
-    if (qmlEngine)
-        QQmlEnginePrivate::deleteInEngineThread(qmlEngine, this);
-    else
-        delete this;
-}
-
-IdentifierHash<int> CompilationUnit::namedObjectsPerComponent(int componentObjectIndex)
+IdentifierHash CompilationUnit::namedObjectsPerComponent(int componentObjectIndex)
 {
     auto it = namedObjectsPerComponentCache.find(componentObjectIndex);
     if (it == namedObjectsPerComponentCache.end()) {
-        IdentifierHash<int> namedObjectCache(engine);
+        IdentifierHash namedObjectCache(engine);
         const CompiledData::Object *component = data->objectAt(componentObjectIndex);
         const quint32_le *namedObjectIndexPtr = component->namedObjectsInComponentTable();
         for (quint32 i = 0; i < component->nNamedObjectsInComponent; ++i, ++namedObjectIndexPtr) {
@@ -349,7 +333,7 @@ bool CompilationUnit::verifyChecksum(const DependentTypesHasher &dependencyHashe
                   sizeof(data->dependencyMD5Checksum)) == 0;
 }
 
-bool CompilationUnit::loadFromDisk(const QUrl &url, const QDateTime &sourceTimeStamp, EvalISelFactory *iselFactory, QString *errorString)
+bool CompilationUnit::loadFromDisk(const QUrl &url, const QDateTime &sourceTimeStamp, QString *errorString)
 {
     if (!QQmlFile::isLocalFile(url)) {
         *errorString = QStringLiteral("File has to be a local file.");
@@ -371,37 +355,19 @@ bool CompilationUnit::loadFromDisk(const QUrl &url, const QDateTime &sourceTimeS
         return false;
     }
 
-    {
-        const QString foundArchitecture = stringAt(data->architectureIndex);
-        const QString expectedArchitecture = QSysInfo::buildAbi();
-        if (foundArchitecture != expectedArchitecture) {
-            *errorString = QString::fromUtf8("Architecture mismatch. Found %1 expected %2").arg(foundArchitecture).arg(expectedArchitecture);
-            return false;
-        }
-    }
-
-    {
-        const QString foundCodeGenerator = stringAt(data->codeGeneratorIndex);
-        const QString expectedCodeGenerator = iselFactory->codeGeneratorName;
-        if (foundCodeGenerator != expectedCodeGenerator) {
-            *errorString = QString::fromUtf8("Code generator mismatch. Found code generated by %1 but expected %2").arg(foundCodeGenerator).arg(expectedCodeGenerator);
-            return false;
-        }
-    }
-
-    if (!memoryMapCode(errorString))
-        return false;
-
     dataPtrChange.commit();
     free(const_cast<Unit*>(oldDataPtr));
     backingFile.reset(cacheFile.take());
     return true;
 }
 
-bool CompilationUnit::memoryMapCode(QString *errorString)
+void CompilationUnit::linkBackendToEngine(ExecutionEngine *engine)
 {
-    *errorString = QStringLiteral("Missing code mapping backend");
-    return false;
+    runtimeFunctions.resize(data->functionTableSize);
+    for (int i = 0 ;i < runtimeFunctions.size(); ++i) {
+        const QV4::CompiledData::Function *compiledFunction = data->functionAt(i);
+        runtimeFunctions[i] = new QV4::Function(engine, this, compiledFunction, &Moth::VME::exec);
+    }
 }
 
 #endif // V4_BOOTSTRAP
@@ -443,17 +409,12 @@ bool CompilationUnit::saveToDisk(const QUrl &unitUrl, QString *errorString)
     memcpy(&unitPtr, &dataPtr, sizeof(unitPtr));
     unitPtr->flags |= Unit::StaticData;
 
-    prepareCodeOffsetsForDiskStorage(unitPtr);
-
     qint64 headerWritten = cacheFile.write(modifiedUnit);
     if (headerWritten != modifiedUnit.size()) {
         *errorString = cacheFile.errorString();
         return false;
     }
 
-    if (!saveCodeToDisk(&cacheFile, unitPtr, errorString))
-        return false;
-
     if (!cacheFile.commit()) {
         *errorString = cacheFile.errorString();
         return false;
@@ -467,19 +428,6 @@ bool CompilationUnit::saveToDisk(const QUrl &unitUrl, QString *errorString)
 #endif // QT_CONFIG(temporaryfile)
 }
 
-void CompilationUnit::prepareCodeOffsetsForDiskStorage(Unit *unit)
-{
-    Q_UNUSED(unit);
-}
-
-bool CompilationUnit::saveCodeToDisk(QIODevice *device, const Unit *unit, QString *errorString)
-{
-    Q_UNUSED(device);
-    Q_UNUSED(unit);
-    *errorString = QStringLiteral("Saving code to disk is not supported in this configuration");
-    return false;
-}
-
 Unit *CompilationUnit::createUnitData(QmlIR::Document *irDocument)
 {
     if (!irDocument->javaScriptCompilationUnit->data)
@@ -775,6 +723,17 @@ bool ResolvedTypeReferenceMap::addToHash(QCryptographicHash *hash, QQmlEngine *e
 
 #endif
 
+void CompilationUnit::destroy()
+{
+#if !defined(V4_BOOTSTRAP)
+    if (qmlEngine)
+        QQmlEnginePrivate::deleteInEngineThread(qmlEngine, this);
+    else
+#endif
+        delete this;
+}
+
+
 void Unit::generateChecksum()
 {
 #ifndef V4_BOOTSTRAP