Move unops into it's own file

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

5 files changed, 233 insertions, 33 deletions

diff --git a/src/qml/jit/jit.pri b/src/qml/jit/jit.pri
index 7e3823e856..581eadc43a 100644
--- a/src/qml/jit/jit.pri
+++ b/src/qml/jit/jit.pri
@@ -7,10 +7,12 @@ HEADERS += \
     $$PWD/qv4assembler_p.h \
     $$PWD/qv4regalloc_p.h \
     $$PWD/qv4isel_masm_p.h \
+    $$PWD/qv4unop_p.h \
 
 SOURCES += \
     $$PWD/qv4assembler.cpp \
     $$PWD/qv4regalloc.cpp \
     $$PWD/qv4isel_masm.cpp \
+    $$PWD/qv4unop.cpp \
 
 include(../../3rdparty/masm/masm.pri)
diff --git a/src/qml/jit/qv4isel_masm.cpp b/src/qml/jit/qv4isel_masm.cpp
index 22e04a2170..4287cee9a3 100644
--- a/src/qml/jit/qv4isel_masm.cpp
+++ b/src/qml/jit/qv4isel_masm.cpp
@@ -49,6 +49,7 @@
 #include "qv4ssa_p.h"
 #include "qv4regalloc_p.h"
 #include "qv4assembler_p.h"
+#include "qv4unop_p.h"
 
 #include <assembler/LinkBuffer.h>
 #include <WTFStubs.h>
@@ -880,36 +881,8 @@ void InstructionSelection::swapValues(V4IR::Temp *sourceTemp, V4IR::Temp *target
 
 void InstructionSelection::unop(V4IR::AluOp oper, V4IR::Temp *sourceTemp, V4IR::Temp *targetTemp)
 {
-    UnaryOpName op = 0;
-    const char *opName = 0;
-    switch (oper) {
-    case V4IR::OpIfTrue: assert(!"unreachable"); break;
-    case V4IR::OpNot:
-        if (sourceTemp->type == V4IR::BoolType && targetTemp->type == V4IR::BoolType) {
-            Assembler::RegisterID tReg = Assembler::ScratchRegister;
-            if (targetTemp->kind == V4IR::Temp::PhysicalRegister)
-                tReg = (Assembler::RegisterID) targetTemp->index;
-            _as->xor32(Assembler::TrustedImm32(0x1),
-                       _as->toInt32Register(sourceTemp, Assembler::ScratchRegister),
-                       tReg);
-            if (targetTemp->kind != V4IR::Temp::PhysicalRegister)
-                _as->storeBool(tReg, targetTemp);
-            return;
-        } else {
-            setOp(op, opName, __qmljs_not); break;
-        }
-    case V4IR::OpUMinus: setOp(op, opName, __qmljs_uminus); break;
-    case V4IR::OpUPlus: setOp(op, opName, __qmljs_uplus); break;
-    case V4IR::OpCompl: setOp(op, opName, __qmljs_compl); break;
-    case V4IR::OpIncrement: setOp(op, opName, __qmljs_increment); break;
-    case V4IR::OpDecrement: setOp(op, opName, __qmljs_decrement); break;
-    default: assert(!"unreachable"); break;
-    } // switch
-
-    if (op) {
-        _as->generateFunctionCallImp(targetTemp, opName, op,
-                                     Assembler::PointerToValue(sourceTemp));
-    }
+    QV4::JIT::Unop unop(_as, oper);
+    unop.generate(sourceTemp, targetTemp);
 }
 
 static inline Assembler::FPRegisterID getFreeFPReg(V4IR::Expr *shouldNotOverlap, unsigned hint)
diff --git a/src/qml/jit/qv4isel_masm_p.h b/src/qml/jit/qv4isel_masm_p.h
index 85d24d5bab..ab8d33e300 100644
--- a/src/qml/jit/qv4isel_masm_p.h
+++ b/src/qml/jit/qv4isel_masm_p.h
@@ -42,9 +42,9 @@
 #define QV4ISEL_MASM_P_H
 
 #include "private/qv4global_p.h"
-#include "qv4jsir_p.h"
-#include "qv4isel_p.h"
-#include "qv4isel_util_p.h"
+#include "private/qv4jsir_p.h"
+#include "private/qv4isel_p.h"
+#include "private/qv4isel_util_p.h"
 #include "private/qv4value_p.h"
 #include "private/qv4lookup_p.h"
 
diff --git a/src/qml/jit/qv4unop.cpp b/src/qml/jit/qv4unop.cpp
new file mode 100644
index 0000000000..02a6f63a00
--- /dev/null
+++ b/src/qml/jit/qv4unop.cpp
@@ -0,0 +1,142 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qv4unop_p.h>
+#include <qv4assembler_p.h>
+
+#if ENABLE(ASSEMBLER)
+
+using namespace QV4;
+using namespace JIT;
+
+using namespace QQmlJS;
+using namespace MASM;
+
+#define stringIfyx(s) #s
+#define stringIfy(s) stringIfyx(s)
+#define setOp(operation) \
+    do { call = operation; name = stringIfy(operation); } while (0)
+
+void Unop::generate(QQmlJS::V4IR::Temp *source, QQmlJS::V4IR::Temp *target)
+{
+    UnaryOpName call = 0;
+    const char *name = 0;
+    switch (op) {
+    case V4IR::OpNot:
+        generateNot(source, target);
+        return;
+    case V4IR::OpUMinus:
+        generateUMinus(source, target);
+        return;
+    case V4IR::OpUPlus: setOp(__qmljs_uplus); break;
+    case V4IR::OpCompl:
+        generateCompl(source, target);
+        return;
+    case V4IR::OpIncrement: setOp(__qmljs_increment); break;
+    case V4IR::OpDecrement: setOp(__qmljs_decrement); break;
+    default:
+        Q_UNREACHABLE();
+    } // switch
+
+    if (call) {
+        as->generateFunctionCallImp(target, name, call, Assembler::PointerToValue(source));
+    }
+}
+
+void Unop::generateUMinus(V4IR::Temp *source, V4IR::Temp *target)
+{
+    if (source->type == V4IR::SInt32Type) {
+        Assembler::RegisterID tReg = Assembler::ScratchRegister;
+        if (target->kind == V4IR::Temp::PhysicalRegister)
+            tReg = (Assembler::RegisterID) target->index;
+        Assembler::RegisterID sReg = as->toInt32Register(source, tReg);
+        as->move(sReg, tReg);
+        as->neg32(tReg);
+        if (target->kind != V4IR::Temp::PhysicalRegister)
+            as->storeInt32(tReg, target);
+        return;
+    }
+
+    as->generateFunctionCallImp(target, "__qmljs_uminus", __qmljs_uminus, Assembler::PointerToValue(source));
+}
+
+void Unop::generateNot(V4IR::Temp *source, V4IR::Temp *target)
+{
+    if (source->type == V4IR::BoolType) {
+        Assembler::RegisterID tReg = Assembler::ScratchRegister;
+        if (target->kind == V4IR::Temp::PhysicalRegister)
+            tReg = (Assembler::RegisterID) target->index;
+        as->xor32(Assembler::TrustedImm32(0x1), as->toInt32Register(source, tReg), tReg);
+        if (target->kind != V4IR::Temp::PhysicalRegister)
+            as->storeBool(tReg, target);
+        return;
+    } else if (source->type == V4IR::SInt32Type) {
+        Assembler::RegisterID tReg = Assembler::ScratchRegister;
+        if (target->kind == V4IR::Temp::PhysicalRegister)
+            tReg = (Assembler::RegisterID) target->index;
+        as->compare32(Assembler::Equal,
+                      as->toInt32Register(source, Assembler::ScratchRegister), Assembler::TrustedImm32(0),
+                      tReg);
+        if (target->kind != V4IR::Temp::PhysicalRegister)
+            as->storeBool(tReg, target);
+        return;
+    } else if (source->type == V4IR::DoubleType) {
+        // ###
+    }
+    // ## generic implementation testing for int/bool
+
+    as->generateFunctionCallImp(target, "__qmljs_not", __qmljs_not, Assembler::PointerToValue(source));
+}
+
+void Unop::generateCompl(V4IR::Temp *source, V4IR::Temp *target)
+{
+    if (source->type == V4IR::SInt32Type) {
+        Assembler::RegisterID tReg = Assembler::ScratchRegister;
+        if (target->kind == V4IR::Temp::PhysicalRegister)
+            tReg = (Assembler::RegisterID) target->index;
+        as->xor32(Assembler::TrustedImm32(0xffffffff), as->toInt32Register(source, tReg), tReg);
+        if (target->kind != V4IR::Temp::PhysicalRegister)
+            as->storeInt32(tReg, target);
+        return;
+    }
+    as->generateFunctionCallImp(target, "__qmljs_compl", __qmljs_compl, Assembler::PointerToValue(source));
+}
+
+#endif
diff --git a/src/qml/jit/qv4unop_p.h b/src/qml/jit/qv4unop_p.h
new file mode 100644
index 0000000000..0ce81c5828
--- /dev/null
+++ b/src/qml/jit/qv4unop_p.h
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef QV4UNOP_P_H
+#define QV4UNOP_P_H
+
+#include <qv4jsir_p.h>
+#include <qv4isel_masm_p.h>
+
+QT_BEGIN_NAMESPACE
+
+#if ENABLE(ASSEMBLER)
+
+namespace QQmlJS {
+namespace MASM {
+class Assembler;
+}
+}
+
+namespace QV4 {
+namespace JIT {
+
+struct Unop {
+    Unop(QQmlJS::MASM::Assembler *assembler, QQmlJS::V4IR::AluOp operation)
+        : as(assembler)
+        , op(operation)
+    {}
+
+    void generate(QQmlJS::V4IR::Temp *source, QQmlJS::V4IR::Temp *target);
+
+    void generateUMinus(QQmlJS::V4IR::Temp *source, QQmlJS::V4IR::Temp *target);
+    void generateNot(QQmlJS::V4IR::Temp *source, QQmlJS::V4IR::Temp *target);
+    void generateCompl(QQmlJS::V4IR::Temp *source, QQmlJS::V4IR::Temp *target);
+
+    QQmlJS::MASM::Assembler *as;
+    QQmlJS::V4IR::AluOp op;
+};
+
+}
+}
+
+#endif
+
+QT_END_NAMESPACE
+
+#endif