Title: [157591] trunk/Source/_javascript_Core
Revision
157591
Author
[email protected]
Date
2013-10-17 12:53:01 -0700 (Thu, 17 Oct 2013)

Log Message

Change emit_op_catch to use another method to materialize VM
https://bugs.webkit.org/show_bug.cgi?id=122977

Reviewed by Oliver Hunt.

* jit/JITOpcodes.cpp:
(JSC::JIT::emit_op_catch):
* jit/JITOpcodes32_64.cpp:
(JSC::JIT::emit_op_catch): Use a constant. It removes our dependency
on JITStackFrame. It is also faster and simpler.

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (157590 => 157591)


--- trunk/Source/_javascript_Core/ChangeLog	2013-10-17 19:42:37 UTC (rev 157590)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-10-17 19:53:01 UTC (rev 157591)
@@ -1,5 +1,18 @@
 2013-10-17  Geoffrey Garen  <[email protected]>
 
+        Change emit_op_catch to use another method to materialize VM
+        https://bugs.webkit.org/show_bug.cgi?id=122977
+
+        Reviewed by Oliver Hunt.
+
+        * jit/JITOpcodes.cpp:
+        (JSC::JIT::emit_op_catch):
+        * jit/JITOpcodes32_64.cpp:
+        (JSC::JIT::emit_op_catch): Use a constant. It removes our dependency
+        on JITStackFrame. It is also faster and simpler.
+
+2013-10-17  Geoffrey Garen  <[email protected]>
+
         Eliminate emitGetJITStubArg() - dead code
         https://bugs.webkit.org/show_bug.cgi?id=122975
 

Modified: trunk/Source/_javascript_Core/jit/JITOpcodes.cpp (157590 => 157591)


--- trunk/Source/_javascript_Core/jit/JITOpcodes.cpp	2013-10-17 19:42:37 UTC (rev 157590)
+++ trunk/Source/_javascript_Core/jit/JITOpcodes.cpp	2013-10-17 19:53:01 UTC (rev 157591)
@@ -665,7 +665,7 @@
 {
     killLastResultRegister(); // FIXME: Implicitly treat op_catch as a labeled statement, and remove this line of code.
     move(regT0, callFrameRegister);
-    peek(regT3, OBJECT_OFFSETOF(struct JITStackFrame, vm) / sizeof(void*));
+    move(TrustedImmPtr(m_vm), regT3);
     load64(Address(regT3, VM::exceptionOffset()), regT0);
     store64(TrustedImm64(JSValue::encode(JSValue())), Address(regT3, VM::exceptionOffset()));
     emitPutVirtualRegister(currentInstruction[1].u.operand);

Modified: trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp (157590 => 157591)


--- trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp	2013-10-17 19:42:37 UTC (rev 157590)
+++ trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp	2013-10-17 19:53:01 UTC (rev 157591)
@@ -971,7 +971,7 @@
     move(regT0, callFrameRegister);
 
     // Now store the exception returned by operationThrow.
-    loadPtr(Address(stackPointerRegister, OBJECT_OFFSETOF(struct JITStackFrame, vm)), regT3);
+    move(TrustedImmPtr(m_vm), regT3);
     load32(Address(regT3, VM::exceptionOffset() + OBJECT_OFFSETOF(JSValue, u.asBits.payload)), regT0);
     load32(Address(regT3, VM::exceptionOffset() + OBJECT_OFFSETOF(JSValue, u.asBits.tag)), regT1);
     store32(TrustedImm32(JSValue().payload()), Address(regT3, VM::exceptionOffset() + OBJECT_OFFSETOF(JSValue, u.asBits.payload)));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to