Allow Const's as operands to Binop in moth.

Change-Id: Ic0954c8170bc720a02fa88f3ab50112bff4767a7
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

diff --git a/moth/qv4instr_moth_p.h b/moth/qv4instr_moth_p.h
index 8073aba..3227b6c 100644 (file)
--- a/moth/qv4instr_moth_p.h
+++ b/moth/qv4instr_moth_p.h
@@ -59,6 +59,11 @@ namespace Moth {
 
 union Instr
 {
+    union ValueOrTemp {
+        VM::Value value;
+        int tempIndex;
+    };
+
     enum Type {
         FOR_EACH_MOTH_INSTR(MOTH_INSTR_ENUM)
     };
@@ -180,8 +185,10 @@ union Instr
     };
     struct instr_binop {
         MOTH_INSTR_HEADER
-        int lhsTempIndex;
-        int rhsTempIndex;
+        ValueOrTemp lhs;
+        ValueOrTemp rhs;
+        unsigned lhsIsTemp:1;
+        unsigned rhsIsTemp:1;
         VM::Value (*alu)(const VM::Value , const VM::Value, VM::Context *);
     };
     struct instr_loadThis {

diff --git a/moth/qv4isel_moth.cpp b/moth/qv4isel_moth.cpp
index 23cef69..7af4a31 100644 (file)
--- a/moth/qv4isel_moth.cpp
+++ b/moth/qv4isel_moth.cpp
@@ -1,3 +1,4 @@
+#include "qv4isel_util_p.h"
 #include "qv4isel_moth_p.h"
 #include "qv4vme_moth_p.h"
 
@@ -5,9 +6,24 @@ using namespace QQmlJS;
 using namespace QQmlJS::Moth;
 
 namespace {
+
 QTextStream qout(stderr, QIODevice::WriteOnly);
+
+static unsigned toValueOrTemp(IR::Expr *e, Instr::ValueOrTemp &vot)
+{
+    if (IR::Const *c = e->asConst()) {
+        vot.value = convertToValue(c);
+        return 0;
+    } else if (IR::Temp *t = e->asTemp()) {
+        vot.tempIndex = t->index;
+        return 1;
+    } else {
+        Q_UNREACHABLE();
+    }
 }
 
+} // anonymous namespace
+
 InstructionSelection::InstructionSelection(VM::ExecutionEngine *engine, IR::Module * /*module*/,
                                            uchar *code)
 : _engine(engine), _code(code), _ccode(code)
@@ -394,8 +410,8 @@ void InstructionSelection::visitMove(IR::Move *s)
         } else if (IR::Binop *b = s->source->asBinop()) {
             Instruction::Binop binop;
             binop.alu = aluOpFunction(b->op);
-//            binop.lhsTempIndex = b->left->index;
-//            binop.rhsTempIndex = b->right->index;
+            binop.lhsIsTemp = toValueOrTemp(b->left, binop.lhs);
+            binop.rhsIsTemp = toValueOrTemp(b->right, binop.rhs);
             addInstruction(binop);
         } else if (IR::Call *c = s->source->asCall()) {
             if (c->base->asName()) {
@@ -554,8 +570,8 @@ void InstructionSelection::visitCJump(IR::CJump *s)
     } else if (IR::Binop *b = s->cond->asBinop()) {
         Instruction::Binop binop;
         binop.alu = aluOpFunction(b->op);
-//        binop.lhsTempIndex = b->left->index;
-//        binop.rhsTempIndex = b->right->index;
+        binop.lhsIsTemp = toValueOrTemp(b->left, binop.lhs);
+        binop.rhsIsTemp = toValueOrTemp(b->right, binop.rhs);
         addInstruction(binop);
     } else {
         Q_UNREACHABLE();

diff --git a/moth/qv4vme_moth.cpp b/moth/qv4vme_moth.cpp
index 82a61ef..8a9638d 100644 (file)
--- a/moth/qv4vme_moth.cpp
+++ b/moth/qv4vme_moth.cpp
@@ -234,7 +234,9 @@ void VME::operator()(QQmlJS::VM::Context *context, const uchar *code
     MOTH_END_INSTR(Unop)
 
     MOTH_BEGIN_INSTR(Binop)
-        tempRegister = instr.alu(TEMP(instr.lhsTempIndex), TEMP(instr.rhsTempIndex), context);
+        VM::Value lhs = instr.lhsIsTemp ? TEMP(instr.lhs.tempIndex) : instr.lhs.value;
+        VM::Value rhs = instr.rhsIsTemp ? TEMP(instr.rhs.tempIndex) : instr.rhs.value;
+        tempRegister = instr.alu(lhs, rhs, context);
     MOTH_END_INSTR(Binop)
 
     MOTH_BEGIN_INSTR(Ret)

diff --git a/qv4isel_masm_p.h b/qv4isel_masm_p.h
index a4ab604..e38ce60 100644 (file)
--- a/qv4isel_masm_p.h
+++ b/qv4isel_masm_p.h
@@ -42,6 +42,7 @@
 #define QV4ISEL_MASM_P_H
 
 #include "qv4ir_p.h"
+#include "qv4isel_util_p.h"
 #include "qmljs_objects.h"
 #include "qmljs_runtime.h"
 
@@ -286,26 +287,7 @@ private:
 
     void loadArgument(IR::Const* c, RegisterID dest)
     {
-        VM::Value v;
-        switch (c->type) {
-        case IR::NullType:
-            v = VM::Value::nullValue();
-            break;
-        case IR::UndefinedType:
-            v = VM::Value::undefinedValue();
-            break;
-        case IR::BoolType:
-            v = VM::Value::fromBoolean(c->value != 0);
-            break;
-        case IR::NumberType: {
-            int ival = (int)c->value;
-            if (ival == c->value) {
-                v = VM::Value::fromInt32(ival);
-            } else {
-                v = VM::Value::fromDouble(c->value);
-            }
-        }
-        }
+        VM::Value v = convertToValue(c);
         move(TrustedImm64(v.val), dest);
     }
 

diff --git a/qv4isel_util_p.h b/qv4isel_util_p.h
new file mode 100644 (file)
index 0000000..ff6cc21
--- /dev/null
+++ b/qv4isel_util_p.h
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef QV4ISEL_UTIL_P_H
+#define QV4ISEL_UTIL_P_H
+
+#include "qmljs_runtime.h"
+#include "qv4ir_p.h"
+
+namespace QQmlJS {
+
+inline VM::Value convertToValue(IR::Const *c)
+{
+    switch (c->type) {
+    case IR::NullType:
+        return VM::Value::nullValue();
+    case IR::UndefinedType:
+        return VM::Value::undefinedValue();
+    case IR::BoolType:
+        return VM::Value::fromBoolean(c->value != 0);
+    case IR::NumberType: {
+        int ival = (int)c->value;
+        if (ival == c->value) {
+            return VM::Value::fromInt32(ival);
+        } else {
+            return VM::Value::fromDouble(c->value);
+        }
+    }
+    default:
+        Q_UNREACHABLE();
+    }
+}
+
+} // namespace QQmlJS
+
+#endif // QV4ISEL_UTIL_P_H

diff --git a/v4.pro b/v4.pro
index 701e503..bc8ada4 100644 (file)
--- a/v4.pro
+++ b/v4.pro
@@ -30,7 +30,8 @@ HEADERS += \
     qv4syntaxchecker_p.h \
     qv4ecmaobjects_p.h \
     qv4array_p.h \
-    qv4isel_masm_p.h
+    qv4isel_masm_p.h \
+    qv4isel_util_p.h
 
 llvm {