Commit 82319105 authored by barraclough@apple.com's avatar barraclough@apple.com

2009-06-16 Gavin Barraclough <barraclough@apple.com>

        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):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@44748 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 68d512e0
2009-06-16 Gavin Barraclough <barraclough@apple.com>
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):
2009-06-16 Sam Weinig <sam@webkit.org>
Fix windows build.
......
......@@ -622,8 +622,25 @@ void JIT::emit_op_throw(Instruction* currentInstruction)
stubCall.addArgument(currentInstruction[1].u.operand, regT2);
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();
#endif
......
......@@ -2328,7 +2328,10 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_throw)
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());
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment