Changeset 174401 in webkit for trunk/Source/JavaScriptCore/bytecode

Timestamp:

Oct 7, 2014, 11:57:57 AM (11 years ago)

Author:

[email protected]

Message:

Remove op_new_captured_func
​https://bugs.webkit.org/show_bug.cgi?id=137491

Reviewed by Mark Lam.

Removes the op_captured_new_func opcode as part of the work
towards having any magical opcodes that write directly to
named "registers" and then have a follow on op to ensure that
the environment record correctly represents the stack state.

For this we add a non-captured scratch register so we don't
have to have any kind of magic opcode, and instead simply
have sensible creation and move semantics for capturing new
functions.

• bytecode/BytecodeList.json:
• bytecode/BytecodeUseDef.h:

(JSC::computeUsesForBytecodeOffset):
(JSC::computeDefsForBytecodeOffset):

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::dumpBytecode):
(JSC::CodeBlock::CodeBlock):

• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::BytecodeGenerator):
(JSC::BytecodeGenerator::emitNewFunction):
(JSC::BytecodeGenerator::emitLazyNewFunction):
(JSC::BytecodeGenerator::emitNewFunctionInternal):

• bytecompiler/BytecodeGenerator.h:
• dfg/DFGByteCodeParser.cpp:

(JSC::DFG::ByteCodeParser::parseBlock):

• dfg/DFGCapabilities.cpp:

(JSC::DFG::capabilityLevel):

• jit/JIT.cpp:

(JSC::JIT::privateCompileMainPass):

• jit/JIT.h:
• jit/JITOpcodes.cpp:

(JSC::JIT::emit_op_new_captured_func): Deleted.

• llint/LowLevelInterpreter32_64.asm:
• llint/LowLevelInterpreter64.asm:
• runtime/CommonSlowPaths.cpp:

(JSC::SLOW_PATH_DECL): Deleted.

• runtime/CommonSlowPaths.h:

Location:

trunk/Source/JavaScriptCore/bytecode

Files:

• BytecodeList.json (modified) (1 diff)
• BytecodeUseDef.h (modified) (2 diffs)
• CodeBlock.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/bytecode/BytecodeList.json

@@ -94 +94 @@
             { "name" : "op_switch_string", "length" : 4 },
             { "name" : "op_new_func", "length" : 4 },
-            { "name" : "op_new_captured_func", "length" : 4 },
             { "name" : "op_new_func_exp", "length" : 3 },
             { "name" : "op_call", "length" : 9 },

trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h

@@ -59 +59 @@
         return;
     case op_new_func:
-    case op_new_captured_func:
     case op_create_lexical_environment: 
     case op_create_arguments:
@@ -312 +311 @@
     case op_new_regexp:
     case op_new_func:
-    case op_new_captured_func:
     case op_new_func_exp:
     case op_call_varargs:

trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -1271 +1271 @@
             break;
         }
-        case op_new_captured_func: {
-            int r0 = (++it)->u.operand;
-            int f0 = (++it)->u.operand;
-            printLocationAndOp(out, exec, location, it, "new_captured_func");
-            out.printf("%s, f%d", registerName(r0).data(), f0);
-            ++it;
-            break;
-        }
         case op_new_func_exp: {
             int r0 = (++it)->u.operand;
@@ -2103 +2095 @@
 
             instructions[i + 2].u.location = location;
-            break;
-        }
-
-        case op_new_captured_func: {
-            if (pc[3].u.index == UINT_MAX) {
-                instructions[i + 3].u.watchpointSet = 0;
-                break;
-            }
-            StringImpl* uid = identifier(pc[3].u.index).impl();
-            RELEASE_ASSERT(didCloneSymbolTable);
-            ConcurrentJITLocker locker(m_symbolTable->m_lock);
-            SymbolTable::Map::iterator iter = m_symbolTable->find(locker, uid);
-            ASSERT(iter != m_symbolTable->end(locker));
-            iter->value.prepareToWatch(symbolTable());
-            instructions[i + 3].u.watchpointSet = iter->value.watchpointSet();
             break;
         }
@@ -3900 +3877 @@
         case op_init_lazy_reg:
         case op_create_arguments:
-        case op_new_captured_func:
             return;
         default: