Move constants into the compiled data for the interpreter

This makes it possible to remove the Value stored as
part of the instruction stream. Reduces the size of the
instruction stream and will allow to optimize Param lookup.

Change-Id: I23dab5dbed76bf8d62df7042934064d4676bc43d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp
index 2408ba3f7a..a36d1d870a 100644
--- a/src/qml/jsruntime/qv4vme_moth.cpp
+++ b/src/qml/jsruntime/qv4vme_moth.cpp
@@ -134,7 +134,7 @@ static VMStats vmStats;
 #endif // WITH_STATS
 
 static inline QV4::Value *getValueRef(QV4::ExecutionContext *context,
-                                     QV4::SafeValue* stack,
+                                      QV4::SafeValue* stack,
                                      const Param &param
 #if !defined(QT_NO_DEBUG)
                                      , unsigned stackSize
@@ -157,9 +157,10 @@ static inline QV4::Value *getValueRef(QV4::ExecutionContext *context,
     }
 #endif // DO_TRACE_INSTR
 
-    if (param.isValue()) {
+    if (param.isConstant()) {
         VMSTATS(paramIsValue);
-        return const_cast<QV4::Value *>(&static_cast<const QV4::Value &>(param.value));
+        const QV4::SafeValue *v = context->compilationUnit->data->constants() + param.index;
+        return const_cast<QV4::SafeValue *>(v);
     } else if (param.isArgument()) {
         VMSTATS(paramIsArg);
         QV4::ExecutionContext *c = context;