Changeset 157521 in webkit

Timestamp:

Oct 16, 2013, 10:26:56 AM (11 years ago)

Author:

mark.lam@apple.com

Message:

Transition void cti_op_tear_off* methods to JIT operations for 32 bit.
​https://bugs.webkit.org/show_bug.cgi?id=122899.

Reviewed by Michael Saboff.

• jit/JITOpcodes32_64.cpp:

(JSC::JIT::emit_op_tear_off_activation):
(JSC::JIT::emit_op_tear_off_arguments):

• jit/JITStubs.cpp:
• jit/JITStubs.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/JITOpcodes32_64.cpp (modified) (2 diffs)
• jit/JITStubs.cpp (modified) (1 diff)
• jit/JITStubs.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-10-16  Mark Lam  <mark.lam@apple.com>
+
+        Transition void cti_op_tear_off* methods to JIT operations for 32 bit.
+        https://bugs.webkit.org/show_bug.cgi?id=122899.
+
+        Reviewed by Michael Saboff.
+
+        * jit/JITOpcodes32_64.cpp:
+        (JSC::JIT::emit_op_tear_off_activation):
+        (JSC::JIT::emit_op_tear_off_arguments):
+        * jit/JITStubs.cpp:
+        * jit/JITStubs.h:
+
 2013-10-16  Julien Brianceau  <jbriance@cisco.com>
 

trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp

@@ -390 +390 @@
     int activation = currentInstruction[1].u.operand;
     Jump activationNotCreated = branch32(Equal, tagFor(activation), TrustedImm32(JSValue::EmptyValueTag));
-    JITStubCall stubCall(this, cti_op_tear_off_activation);
-    stubCall.addArgument(activation);
-    stubCall.call();
+    emitLoadPayload(activation, regT0);
+    callOperation(operationTearOffActivation, regT0);
     activationNotCreated.link(this);
 }
@@ -402 +401 @@
 
     Jump argsNotCreated = branch32(Equal, tagFor(unmodifiedArgumentsRegister(arguments).offset()), TrustedImm32(JSValue::EmptyValueTag));
-    JITStubCall stubCall(this, cti_op_tear_off_arguments);
-    stubCall.addArgument(unmodifiedArgumentsRegister(arguments).offset());
-    stubCall.addArgument(activation);
-    stubCall.call();
+    emitLoadPayload(unmodifiedArgumentsRegister(VirtualRegister(arguments)).offset(), regT0);
+    emitLoadPayload(activation, regT1);
+    callOperation(operationTearOffArguments, regT0, regT1);
     argsNotCreated.link(this);
 }

trunk/Source/JavaScriptCore/jit/JITStubs.cpp

@@ -289 +289 @@
 }
 
-DEFINE_STUB_FUNCTION(void, op_tear_off_activation)
-{
-    STUB_INIT_STACK_FRAME(stackFrame);
-
-    ASSERT(stackFrame.callFrame->codeBlock()->needsFullScopeChain());
-    jsCast<JSActivation*>(stackFrame.args[0].jsValue())->tearOff(*stackFrame.vm);
-}
-
-DEFINE_STUB_FUNCTION(void, op_tear_off_arguments)
-{
-    STUB_INIT_STACK_FRAME(stackFrame);
-
-    CallFrame* callFrame = stackFrame.callFrame;
-    ASSERT(callFrame->codeBlock()->usesArguments());
-    Arguments* arguments = jsCast<Arguments*>(stackFrame.args[0].jsValue());
-    if (JSValue activationValue = stackFrame.args[1].jsValue()) {
-        arguments->didTearOffActivation(callFrame, jsCast<JSActivation*>(activationValue));
-        return;
-    }
-    arguments->tearOff(callFrame);
-}
-
 static JSValue getByVal(
     CallFrame* callFrame, JSValue baseValue, JSValue subscript, ReturnAddressPtr returnAddress)

trunk/Source/JavaScriptCore/jit/JITStubs.h

@@ -362 +362 @@
 void JIT_STUB cti_op_put_by_val(STUB_ARGS_DECLARATION) WTF_INTERNAL;
 void JIT_STUB cti_op_put_by_val_generic(STUB_ARGS_DECLARATION) WTF_INTERNAL;
-void JIT_STUB cti_op_tear_off_activation(STUB_ARGS_DECLARATION) WTF_INTERNAL;
-void JIT_STUB cti_op_tear_off_arguments(STUB_ARGS_DECLARATION) WTF_INTERNAL;
 void JIT_STUB cti_op_throw_static_error(STUB_ARGS_DECLARATION) WTF_INTERNAL;
 void* JIT_STUB cti_op_throw(STUB_ARGS_DECLARATION) WTF_INTERNAL;