Changeset 34781 in webkit for trunk/JavaScriptCore

Timestamp:

Jun 24, 2008, 4:03:11 PM (17 years ago)

Author:

[email protected]

Message:

2008-06-24 Cameron Zwarich <​[email protected]>

Rubber stamped by Oliver.

Roll out r34777 due to multiple assertion failures on tests.

• ChangeLog:
• VM/CodeGenerator.cpp: (KJS::CodeGenerator::emitJump): (KJS::CodeGenerator::emitJumpIfTrueMayCombine): (KJS::CodeGenerator::emitJumpIfTrue): (KJS::CodeGenerator::emitJumpIfFalse): (KJS::CodeGenerator::emitJumpScopes):
• VM/LabelID.h:
• VM/Machine.cpp: (KJS::Machine::privateExecute):
• VM/Machine.h:
• VM/Opcode.h:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/CodeGenerator.cpp (modified) (5 diffs)
• VM/LabelID.h (modified) (1 diff)
• VM/Machine.cpp (modified) (4 diffs)
• VM/Machine.h (modified) (1 diff)
• VM/Opcode.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ -23 +23 @@
         (KJS::ProfileNode::removeChild): Should reset the sibling pointers since
         one of them has been removed.
-
-2008-06-24  Oliver Hunt  <[email protected]>
-
-        Reviewed by Cameron.
-
-        Add special loop opcodes as groundwork for slow script
-        termination.  Also added a few assertions to prevent us
-        from accidentally coalescing conditional jump operands
-        in a way that might bypass the slow script opcodes.
-
-        * JavaScriptCore.xcodeproj/project.pbxproj:
-        * VM/CodeGenerator.cpp:
-        (KJS::CodeGenerator::emitJumpIfTrueMayCombine):
-        (KJS::CodeGenerator::emitJumpScopes):
-        * VM/LabelID.h:
-        * VM/Machine.cpp:
-        (KJS::Machine::privateExecute):
-        * VM/Machine.h:
-        * VM/Opcode.h:
 
 2008-06-24  Darin Adler  <[email protected]>

trunk/JavaScriptCore/VM/CodeGenerator.cpp

@@ -421 +421 @@
 PassRefPtr<LabelID> CodeGenerator::emitJump(LabelID* target)
 {
-    ASSERT(target->isForwardLabel());
     emitOpcode(op_jmp);
     instructions().append(target->offsetFrom(instructions().size()));
@@ -438 +437 @@
         if (cond->index() == dstIndex) {
             rewindBinaryOp();
-            emitOpcode(target->isForwardLabel() ? op_jless : op_loop_if_less);
+            emitOpcode(op_jless);
             instructions().append(src1Index);
             instructions().append(src2Index);
@@ -451 +450 @@
 PassRefPtr<LabelID> CodeGenerator::emitJumpIfTrue(RegisterID* cond, LabelID* target)
 {
-    emitOpcode(target->isForwardLabel() ? op_jtrue : op_loop_if_true);
+    emitOpcode(op_jtrue);
     instructions().append(cond->index());
     instructions().append(target->offsetFrom(instructions().size()));
@@ -459 +458 @@
 PassRefPtr<LabelID> CodeGenerator::emitJumpIfFalse(RegisterID* cond, LabelID* target)
 {
-    ASSERT(target->isForwardLabel());
     emitOpcode(op_jfalse);
     instructions().append(cond->index());
@@ -1034 +1032 @@
 {
     ASSERT(scopeDepth() - targetScopeDepth >= 0);
-    ASSERT(target->isForwardLabel());
 
     size_t scopeDelta = scopeDepth() - targetScopeDepth;

trunk/JavaScriptCore/VM/LabelID.h

@@ -99 +99 @@
         }
 
-        bool isForwardLabel() { return m_location == invalidLocation; }
     private:
         typedef Vector<int, 8> JumpVector;

trunk/JavaScriptCore/VM/Machine.cpp

@@ -896 +896 @@
     JSValue** k = codeBlock->jsValues.data();
     Profiler** enabledProfilerReference = Profiler::enabledProfilerReference();
-    
+
     registerFile->setSafeForReentry(false);
 #define VM_CHECK_EXCEPTION() \
@@ -909 +909 @@
     OpcodeStats::resetLastInstruction();
 #endif
-    
-#define CHECK_FOR_TIMEOUT() 
-    
+
 #if HAVE(COMPUTED_GOTO)
     #define NEXT_OPCODE goto *vPC->u.opcode
@@ -1890 +1888 @@
         NEXT_OPCODE;
     }
-    BEGIN_OPCODE(op_loop_if_true) {
-        /* loop_if_true cond(r) target(offset)
-         
-           Jumps to offset target from the current instruction, if and
-           only if register cond converts to boolean as true.
-
-           Additionally this loop instruction may terminate JS execution is
-           the JS timeout is reached.
-         */
-        int cond = (++vPC)->u.operand;
-        int target = (++vPC)->u.operand;
-        if (r[cond].u.jsValue->toBoolean(exec)) {
-            vPC += target;
-            CHECK_FOR_TIMEOUT();
-            NEXT_OPCODE;
-        }
-        
-        ++vPC;
-        NEXT_OPCODE;
-    }
     BEGIN_OPCODE(op_jtrue) {
         /* jtrue cond(r) target(offset)
@@ -1939 +1917 @@
         }
 
-        ++vPC;
-        NEXT_OPCODE;
-    }
-    BEGIN_OPCODE(op_loop_if_less) {
-        /* loop_if_less src1(r) src2(r) target(offset)
-
-           Checks whether register src1 is less than register src2, as
-           with the ECMAScript '<' operator, and then jumps to offset
-           target from the current instruction, if and only if the 
-           result of the comparison is true.
-
-           Additionally this loop instruction may terminate JS execution is
-           the JS timeout is reached.
-         */
-        JSValue* src1 = r[(++vPC)->u.operand].u.jsValue;
-        JSValue* src2 = r[(++vPC)->u.operand].u.jsValue;
-        int target = (++vPC)->u.operand;
-        
-        bool result = jsLess(exec, src1, src2);
-        VM_CHECK_EXCEPTION();
-        
-        if (result) {
-            vPC += target;
-            CHECK_FOR_TIMEOUT();
-            NEXT_OPCODE;
-        }
-        
         ++vPC;
         NEXT_OPCODE;

trunk/JavaScriptCore/VM/Machine.h

@@ -128 +128 @@
 
         int m_reentryDepth;
-
 #if HAVE(COMPUTED_GOTO)
         Opcode m_opcodeTable[numOpcodeIDs]; // Maps OpcodeID => Opcode for compiling

trunk/JavaScriptCore/VM/Opcode.h

@@ -98 +98 @@
         macro(op_jless) \
         macro(op_jmp_scopes) \
-        macro(op_loop_if_true) \
-        macro(op_loop_if_less) \
         \
         macro(op_new_func) \