Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (116672 => 116673)
--- trunk/Source/_javascript_Core/ChangeLog 2012-05-10 18:47:04 UTC (rev 116672)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-05-10 19:01:07 UTC (rev 116673)
@@ -1,5 +1,34 @@
2012-05-10 Gavin Barraclough <[email protected]>
+ Remove op_get_callee
+
+ Rubber stamped by Geoff Garen.
+
+ This is now redundant.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::dump):
+ * bytecode/Opcode.h:
+ (JSC):
+ (JSC::padOpcodeName):
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::parseBlock):
+ * dfg/DFGCapabilities.h:
+ (JSC::DFG::canCompileOpcode):
+ * interpreter/Interpreter.cpp:
+ (JSC::Interpreter::privateExecute):
+ * jit/JIT.cpp:
+ (JSC::JIT::privateCompileMainPass):
+ * jit/JIT.h:
+ * jit/JITOpcodes.cpp:
+ (JSC):
+ * jit/JITOpcodes32_64.cpp:
+ (JSC):
+ * llint/LowLevelInterpreter32_64.asm:
+ * llint/LowLevelInterpreter64.asm:
+
+2012-05-10 Gavin Barraclough <[email protected]>
+
Cache inheritorID on JSFunction
https://bugs.webkit.org/show_bug.cgi?id=85853
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (116672 => 116673)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2012-05-10 18:47:04 UTC (rev 116672)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2012-05-10 19:01:07 UTC (rev 116673)
@@ -512,11 +512,6 @@
dataLog("[%4d] init_lazy_reg\t %s\n", location, registerName(exec, r0).data());
break;
}
- case op_get_callee: {
- int r0 = (++it)->u.operand;
- dataLog("[%4d] op_get_callee %s\n", location, registerName(exec, r0).data());
- break;
- }
case op_create_this: {
int r0 = (++it)->u.operand;
dataLog("[%4d] create_this %s\n", location, registerName(exec, r0).data());
Modified: trunk/Source/_javascript_Core/bytecode/Opcode.h (116672 => 116673)
--- trunk/Source/_javascript_Core/bytecode/Opcode.h 2012-05-10 18:47:04 UTC (rev 116672)
+++ trunk/Source/_javascript_Core/bytecode/Opcode.h 2012-05-10 19:01:07 UTC (rev 116673)
@@ -43,7 +43,6 @@
macro(op_init_lazy_reg, 2) \
macro(op_create_arguments, 2) \
macro(op_create_this, 2) \
- macro(op_get_callee, 2) \
macro(op_convert_this, 2) \
\
macro(op_new_object, 2) \
Modified: trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp (116672 => 116673)
--- trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp 2012-05-10 18:47:04 UTC (rev 116672)
+++ trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp 2012-05-10 19:01:07 UTC (rev 116673)
@@ -1567,14 +1567,6 @@
NEXT_OPCODE(op_new_regexp);
}
- case op_get_callee: {
- if (m_inlineStackTop->m_inlineCallFrame)
- set(currentInstruction[1].u.operand, getDirect(m_inlineStackTop->m_calleeVR));
- else
- set(currentInstruction[1].u.operand, addToGraph(GetCallee));
- NEXT_OPCODE(op_get_callee);
- }
-
// === Bitwise operations ===
case op_bitand: {
Modified: trunk/Source/_javascript_Core/dfg/DFGCapabilities.h (116672 => 116673)
--- trunk/Source/_javascript_Core/dfg/DFGCapabilities.h 2012-05-10 18:47:04 UTC (rev 116672)
+++ trunk/Source/_javascript_Core/dfg/DFGCapabilities.h 2012-05-10 19:01:07 UTC (rev 116673)
@@ -73,7 +73,6 @@
case op_enter:
case op_convert_this:
case op_create_this:
- case op_get_callee:
case op_bitand:
case op_bitor:
case op_bitxor:
Modified: trunk/Source/_javascript_Core/interpreter/Interpreter.cpp (116672 => 116673)
--- trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2012-05-10 18:47:04 UTC (rev 116672)
+++ trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2012-05-10 19:01:07 UTC (rev 116673)
@@ -4788,17 +4788,6 @@
vPC += OPCODE_LENGTH(op_create_activation);
NEXT_INSTRUCTION();
}
- DEFINE_OPCODE(op_get_callee) {
- /* op_get_callee callee(r)
-
- Move callee into a register.
- */
-
- callFrame->uncheckedR(vPC[1].u.operand) = JSValue(callFrame->callee());
-
- vPC += OPCODE_LENGTH(op_get_callee);
- NEXT_INSTRUCTION();
- }
DEFINE_OPCODE(op_create_this) {
/* op_create_this this(r) proto(r)
Modified: trunk/Source/_javascript_Core/jit/JIT.cpp (116672 => 116673)
--- trunk/Source/_javascript_Core/jit/JIT.cpp 2012-05-10 18:47:04 UTC (rev 116672)
+++ trunk/Source/_javascript_Core/jit/JIT.cpp 2012-05-10 19:01:07 UTC (rev 116673)
@@ -242,7 +242,6 @@
DEFINE_OP(op_call_varargs)
DEFINE_OP(op_catch)
DEFINE_OP(op_construct)
- DEFINE_OP(op_get_callee)
DEFINE_OP(op_create_this)
DEFINE_OP(op_convert_this)
DEFINE_OP(op_init_lazy_reg)
Modified: trunk/Source/_javascript_Core/jit/JIT.h (116672 => 116673)
--- trunk/Source/_javascript_Core/jit/JIT.h 2012-05-10 18:47:04 UTC (rev 116672)
+++ trunk/Source/_javascript_Core/jit/JIT.h 2012-05-10 19:01:07 UTC (rev 116673)
@@ -582,7 +582,6 @@
void emit_op_call_put_result(Instruction*);
void emit_op_catch(Instruction*);
void emit_op_construct(Instruction*);
- void emit_op_get_callee(Instruction*);
void emit_op_create_this(Instruction*);
void emit_op_convert_this(Instruction*);
void emit_op_create_arguments(Instruction*);
Modified: trunk/Source/_javascript_Core/jit/JITOpcodes.cpp (116672 => 116673)
--- trunk/Source/_javascript_Core/jit/JITOpcodes.cpp 2012-05-10 18:47:04 UTC (rev 116672)
+++ trunk/Source/_javascript_Core/jit/JITOpcodes.cpp 2012-05-10 19:01:07 UTC (rev 116673)
@@ -1263,13 +1263,6 @@
addSlowCase(branchPtr(Equal, Address(regT0, JSCell::classInfoOffset()), TrustedImmPtr(&JSString::s_info)));
}
-void JIT::emit_op_get_callee(Instruction* currentInstruction)
-{
- unsigned result = currentInstruction[1].u.operand;
- emitGetFromCallFrameHeaderPtr(RegisterFile::Callee, regT0);
- emitPutVirtualRegister(result);
-}
-
void JIT::emit_op_create_this(Instruction* currentInstruction)
{
emitGetFromCallFrameHeaderPtr(RegisterFile::Callee, regT0);
Modified: trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp (116672 => 116673)
--- trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp 2012-05-10 18:47:04 UTC (rev 116672)
+++ trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp 2012-05-10 19:01:07 UTC (rev 116673)
@@ -1523,13 +1523,6 @@
emitStore(dst, JSValue());
}
-void JIT::emit_op_get_callee(Instruction* currentInstruction)
-{
- int dst = currentInstruction[1].u.operand;
- emitGetFromCallFrameHeaderPtr(RegisterFile::Callee, regT0);
- emitStoreCell(dst, regT0);
-}
-
void JIT::emit_op_create_this(Instruction* currentInstruction)
{
emitGetFromCallFrameHeaderPtr(RegisterFile::Callee, regT0);
Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm (116672 => 116673)
--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm 2012-05-10 18:47:04 UTC (rev 116672)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm 2012-05-10 19:01:07 UTC (rev 116673)
@@ -357,15 +357,6 @@
dispatch(2)
-_llint_op_get_callee:
- traceExecution()
- loadi 4[PC], t0
- loadp PayloadOffset + Callee[cfr], t1
- storei CellTag, TagOffset[cfr, t0, 8]
- storei t1, PayloadOffset[cfr, t0, 8]
- dispatch(2)
-
-
_llint_op_convert_this:
traceExecution()
loadi 4[PC], t0
Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm (116672 => 116673)
--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm 2012-05-10 18:47:04 UTC (rev 116672)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm 2012-05-10 19:01:07 UTC (rev 116673)
@@ -234,14 +234,6 @@
dispatch(2)
-_llint_op_get_callee:
- traceExecution()
- loadis 8[PB, PC, 8], t0
- loadp Callee[cfr], t1
- storep t1, [cfr, t0, 8]
- dispatch(2)
-
-
_llint_op_convert_this:
traceExecution()
loadis 8[PB, PC, 8], t0
