Changeset 846 for trunk/src/3rdparty/webkit/JavaScriptCore/bytecompiler

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/webkit/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (modified) (9 diffs)
• src/3rdparty/webkit/JavaScriptCore/bytecompiler/BytecodeGenerator.h (modified) (1 diff)
• src/3rdparty/webkit/JavaScriptCore/bytecompiler/NodesCodegen.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/3rdparty/webkit/JavaScriptCore/bytecompiler/NodesCodegen.cpp )

trunk/src/3rdparty/webkit/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

@@ -617 +617 @@
 PassRefPtr<Label> BytecodeGenerator::emitJumpIfTrue(RegisterID* cond, Label* target)
 {
-    if (m_lastOpcodeID == op_less && !target->isForward()) {
+    if (m_lastOpcodeID == op_less) {
         int dstIndex;
         int src1Index;
@@ -628 +628 @@
 
             size_t begin = instructions().size();
-            emitOpcode(op_loop_if_less);
+            emitOpcode(op_loop_if_less);
             instructions().append(src1Index);
             instructions().append(src2Index);
@@ -693 +693 @@
 PassRefPtr<Label> BytecodeGenerator::emitJumpIfFalse(RegisterID* cond, Label* target)
 {
-    ASSERT(target->isForward());
-
-    if (m_lastOpcodeID == op_less) {
+    if (m_lastOpcodeID == op_less && target->isForward()) {
         int dstIndex;
         int src1Index;
@@ -712 +710 @@
             return target;
         }
-    } else if (m_lastOpcodeID == op_lesseq) {
+    } else if (m_lastOpcodeID == op_lesseq) {
         int dstIndex;
         int src1Index;
@@ -739 +737 @@
 
             size_t begin = instructions().size();
-            emitOpcode(op_jtrue);
+            emitOpcode(true);
             instructions().append(srcIndex);
             instructions().append(target->bind(begin, instructions().size()));
             return target;
         }
-    } else if (m_lastOpcodeID == op_eq_null) {
+    } else if (m_lastOpcodeID == op_eq_null) {
         int dstIndex;
         int srcIndex;
@@ -759 +757 @@
             return target;
         }
-    } else if (m_lastOpcodeID == op_neq_null) {
+    } else if (m_lastOpcodeID == op_neq_null) {
         int dstIndex;
         int srcIndex;
@@ -777 +775 @@
 
     size_t begin = instructions().size();
-    emitOpcode(op_jfalse);
+    emitOpcode(false);
     instructions().append(cond->index());
     instructions().append(target->bind(begin, instructions().size()));
@@ -907 +905 @@
             && m_codeBlock->isConstantRegisterIndex(src2->index())
             && m_codeBlock->constantRegister(src2->index()).jsValue().isString()) {
-            const UString& value = asString(m_codeBlock->constantRegister(src2->index()).jsValue())->value();
+            const UString& value = asString(m_codeBlock->constantRegister(src2->index()).jsValue())->alue();
             if (value == "undefined") {
                 rewindUnaryOp();
@@ -1943 +1941 @@
     ASSERT(node->isString());
     UString::Rep* clause = static_cast<StringNode*>(node)->value().ustring().rep();
-    ASSERT(clause->size() == 1);
+    ASSERT(clause->() == 1);
     
-    int32_t key = clause->data()[0];
+    int32_t key = clause->()[0];
     ASSERT(key >= min);
     ASSERT(key <= max);

trunk/src/3rdparty/webkit/JavaScriptCore/bytecompiler/BytecodeGenerator.h

@@ -193 +193 @@
         }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
         void emitExpressionInfo(unsigned divot, unsigned startOffset, unsigned endOffset)
         {