Changeset 44796 in webkit for trunk/JavaScriptCore/jit

Timestamp:

Jun 17, 2009, 10:50:07 PM (16 years ago)

Author:

[email protected]

Message:

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

Rubber Stamped by Mark Rowe.

Fully revert r44492 & r44748 while we fix a bug they cause on internal builds <rdar://problem/6955963>.

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

Location:

trunk/JavaScriptCore/jit

Files:

• JITOpcodes.cpp (modified) (3 diffs)
• JITStubs.cpp (modified) (4 diffs)
• JITStubs.h (modified) (1 diff)

trunk/JavaScriptCore/jit/JITOpcodes.cpp

@@ -623 +623 @@
     stubCall.call();
     ASSERT(regT0 == returnValueRegister);
-    // Temporarily bring these back on x86 platforms while we fix a bug.
 #if PLATFORM(X86_64)
     addPtr(Imm32(0x48), X86::esp);
@@ -633 +632 @@
     pop(X86::ebp);
     ret();
-#elif PLATFORM(X86)
+#else
     addPtr(Imm32(0x1c), X86::esp);
     pop(X86::ebx);
@@ -640 +639 @@
     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();
 #endif
 }

trunk/JavaScriptCore/jit/JITStubs.cpp

@@ -105 +105 @@
 #endif
     "call " SYMBOL_STRING(cti_vm_throw) "\n"
-".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
-SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
     "addl $0x1c, %esp" "\n"
     "popl %ebx" "\n"
@@ -158 +156 @@
     "movq %rsp, %rdi" "\n"
     "call " SYMBOL_STRING(cti_vm_throw) "\n"
-".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
-SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
     "addq $0x48, %rsp" "\n"
     "popq %rbx" "\n"
@@ -286 +282 @@
             mov ecx, esp;
             call JITStubs::cti_vm_throw;
-            add esp, 0x1c;
-            pop ebx;
-            pop edi;
-            pop esi;
-            pop ebp;
-            ret;
-        }
-    }
-
-    __declspec(naked) void ctiOpThrowNotCaught()
-    {
-        __asm {
             add esp, 0x1c;
             pop ebx;
@@ -2329 +2313 @@
     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());
     }

trunk/JavaScriptCore/jit/JITStubs.h

@@ -183 +183 @@
 
     extern "C" void ctiVMThrowTrampoline();
-    extern "C" void ctiOpThrowNotCaught();
     extern "C" EncodedJSValue ctiTrampoline(
 #if PLATFORM(X86_64)