Changeset 44748 in webkit for trunk/JavaScriptCore/jit

Timestamp:

Jun 16, 2009, 4:35:50 PM (16 years ago)

Author:

[email protected]

Message:

2009-06-16 Gavin Barraclough <​[email protected]>

Reviewed by Oliver hunt.

Temporarily partially disable r44492, since this is causing some problems on internal builds.

• jit/JITOpcodes.cpp: (JSC::JIT::emit_op_throw):
• jit/JITStubs.cpp: (JSC::JITStubs::DEFINE_STUB_FUNCTION):

Location:

trunk/JavaScriptCore/jit

Files:

• JITOpcodes.cpp (modified) (1 diff)
• JITStubs.cpp (modified) (1 diff)

trunk/JavaScriptCore/jit/JITOpcodes.cpp

@@ -623 +623 @@
     stubCall.call();
     ASSERT(regT0 == returnValueRegister);
-#ifndef NDEBUG
-    // cti_op_throw always changes it's return address,
+    // Temporarily bring these back on x86 platforms while we fix a bug.
+#if PLATFORM(X86_64)
+    addPtr(Imm32(0x48), X86::esp);
+    pop(X86::ebx);
+    pop(X86::r15);
+    pop(X86::r14);
+    pop(X86::r13);
+    pop(X86::r12);
+    pop(X86::ebp);
+    ret();
+#elif PLATFORM(X86)
+    addPtr(Imm32(0x1c), X86::esp);
+    pop(X86::ebx);
+    pop(X86::edi);
+    pop(X86::esi);
+    pop(X86::ebp);
+    ret();
+#elif !defined(NDEBUG)
+    // cti_op_throw SHOULD always change it's return address,
     // this point in the code should never be reached.
     breakpoint();

trunk/JavaScriptCore/jit/JITStubs.cpp

@@ -2329 +2329 @@
     if (!handler) {
         *stackFrame.exception = exceptionValue;
+#if !(PLATFORM(x86) || PLATFORM(x86_64))
+        // Termporarily disable this on x86 platforms.
         STUB_SET_RETURN_ADDRESS(reinterpret_cast<void*>(ctiOpThrowNotCaught));
+#endif
         return JSValue::encode(jsNull());
     }