Changeset 127333 in webkit for trunk/Source/JavaScriptCore/jit/JITExceptions.cpp

Timestamp:

Aug 31, 2012, 4:25:28 PM (13 years ago)

Author:

[email protected]

Message:

Refactor LLInt and supporting code in preparation for the C Loop backend.
​https://bugs.webkit.org/show_bug.cgi?id=95531.

Patch by Mark Lam <​[email protected]> on 2012-08-31
Reviewed by Filip Pizlo.

• bytecode/GetByIdStatus.cpp:

(JSC::GetByIdStatus::computeFromLLInt):

• bytecode/PutByIdStatus.cpp:

(JSC::PutByIdStatus::computeFromLLInt):

• jit/JITExceptions.cpp:

(JSC::genericThrow): Use ExecutableBase::catchRoutineFor() to fetch

fetch the catch routine for a thrown exception. This will allow
us to redefine that for the C loop later, and still keep this
code readable.

• llint/LLIntOfflineAsmConfig.h: Moved ASM macros to

LowLevelInterpreter.cpp which is the only place they are used. This
will make it more convenient to redefine them for the C loop later.

• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::setUpCall): Use ExecutableBase's hostCodeEntry()

jsCodeEntryFor(), and jsCodeWithArityCheckEntryFor() for computing
the entry points to functions being called.

• llint/LLIntSlowPaths.h:

(SlowPathReturnType):
(JSC::LLInt::encodeResult):
(LLInt):
(JSC::LLInt::decodeResult): Added. Needed by LLInt C Loop later.

• llint/LowLevelInterpreter.asm:
• llint/LowLevelInterpreter.cpp:
• llint/LowLevelInterpreter32_64.asm:
• llint/LowLevelInterpreter64.asm:
• offlineasm/asm.rb: Disambiguate between opcodes and other labels.
• offlineasm/config.rb:
• runtime/Executable.h:

(JSC::ExecutableBase::hostCodeEntryFor): Added.
(ExecutableBase):
(JSC::ExecutableBase::jsCodeEntryFor): Added.
(JSC::ExecutableBase::jsCodeWithArityCheckEntryFor): Added.
(JSC::ExecutableBase::catchRoutineFor): Added.

• runtime/JSValueInlineMethods.h:

(JSC):

File:

• trunk/Source/JavaScriptCore/jit/JITExceptions.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/jit/JITExceptions.cpp

@@ -48 +48 @@
     Instruction* catchPCForInterpreter = 0;
     if (handler) {
-        catchRoutine = handler->nativeCode.executableAddress();
         catchPCForInterpreter = &callFrame->codeBlock()->instructions()[handler->target];
+        catchRoutine = ExecutableBase::catchRoutineFor(handler, catchPCForInterpreter);
     } else
         catchRoutine = FunctionPtr(LLInt::getCodePtr(ctiOpThrowNotCaught)).value();