From d010e6e53c1f3c2704eb3c548e58e8f37febcc29 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Tue, 26 May 2009 17:46:40 +1000
Subject: Remove the NoOp instruction

---
 src/declarative/qml/qmlinstruction.cpp |  3 ---
 src/declarative/qml/qmlinstruction_p.h | 11 ++---------
 src/declarative/qml/qmlvme.cpp         | 10 ----------
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/declarative/qml/qmlinstruction.cpp b/src/declarative/qml/qmlinstruction.cpp
index 7103d87..31bd2f5 100644
--- a/src/declarative/qml/qmlinstruction.cpp
+++ b/src/declarative/qml/qmlinstruction.cpp
@@ -163,9 +163,6 @@ void QmlCompiledComponent::dump(QmlInstruction *instr, int idx)
     case QmlInstruction::PopQList:
         qWarning() << idx << "\t" << line << "\t" << "POP_QLIST";
         break;
-    case QmlInstruction::NoOp:
-        qWarning() << idx << "\t" << line << "\t" << "NOOP";
-        break;
     case QmlInstruction::PushProperty:
         qWarning() << idx << "\t" << line << "\t" << "PUSH_PROPERTY" << "\t\t" << instr->pushProperty.property;
         break;
diff --git a/src/declarative/qml/qmlinstruction_p.h b/src/declarative/qml/qmlinstruction_p.h
index bc696b1..47a8d76 100644
--- a/src/declarative/qml/qmlinstruction_p.h
+++ b/src/declarative/qml/qmlinstruction_p.h
@@ -143,17 +143,10 @@ public:
         //    StoreStackObject - Assign the stack object (no checks)
         PushProperty,            /* pushProperty */
         AssignStackObject,       /* assignStackObject */
-        StoreStackObject,        /* assignStackObject */
-
-
-        // 
-        // Miscellaneous
-        //
-        //    NoOp - Do nothing
-        NoOp
+        StoreStackObject         /* assignStackObject */
     };
     QmlInstruction()
-        : type(NoOp), line(0) {}
+        : line(0) {}
 
     Type type;
     unsigned short line;
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp
index 07165ec..e2441c6 100644
--- a/src/declarative/qml/qmlvme.cpp
+++ b/src/declarative/qml/qmlvme.cpp
@@ -103,7 +103,6 @@ Q_DECLARE_PERFORMANCE_LOG(QFxCompiler) {
     Q_DECLARE_PERFORMANCE_METRIC(InstrPushProperty);
     Q_DECLARE_PERFORMANCE_METRIC(InstrAssignStackObject);
     Q_DECLARE_PERFORMANCE_METRIC(InstrStoreStackObject);
-    Q_DECLARE_PERFORMANCE_METRIC(InstrNoOp);
     Q_DECLARE_PERFORMANCE_METRIC(Dummy);
 }
 
@@ -144,7 +143,6 @@ Q_DEFINE_PERFORMANCE_LOG(QFxCompiler, "QFxCompiler") {
     Q_DEFINE_PERFORMANCE_METRIC(InstrPushProperty, "PushProperty");
     Q_DEFINE_PERFORMANCE_METRIC(InstrAssignStackObject, "AssignStackObject");
     Q_DEFINE_PERFORMANCE_METRIC(InstrStoreStackObject, "StoreStackObject");
-    Q_DEFINE_PERFORMANCE_METRIC(InstrNoOp, "NoOp");
     Q_DEFINE_PERFORMANCE_METRIC(Dummy, "Dummy");
 }
 
@@ -986,14 +984,6 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in
             }
             break;
 
-        case QmlInstruction::NoOp:
-            {
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-                QFxCompilerTimer<QFxCompiler::InstrNoOp> cc;
-#endif
-            }
-            break;
-            
         default:
             qFatal("QmlCompiledComponent: Internal error - unknown instruction %d", instr.type);
             break;
-- 
cgit v0.12