diff options
Diffstat (limited to 'Source/JavaScriptCore')
| -rw-r--r-- | Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm | 15 | ||||
| -rw-r--r-- | Source/JavaScriptCore/runtime/JSCell.h | 3 |
2 files changed, 4 insertions, 14 deletions
diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm index b9b457034..89e40c7d6 100644 --- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm +++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm @@ -1867,7 +1867,7 @@ macro nativeCallTrampoline(executableOffsetToFunction) call executableOffsetToFunction[t1] restoreReturnAddressBeforeReturn(t3) loadp JITStackFrame::vm[sp], t3 - elsif MIPS + elsif MIPS or SH4 loadp JITStackFrame::vm[sp], t3 storep cfr, VM::topCallFrame[t3] move t0, t2 @@ -1881,19 +1881,6 @@ macro nativeCallTrampoline(executableOffsetToFunction) call executableOffsetToFunction[t1] restoreReturnAddressBeforeReturn(t3) loadp JITStackFrame::vm[sp], t3 - elsif SH4 - loadp JITStackFrame::vm[sp], t3 - storep cfr, VM::topCallFrame[t3] - move t0, t2 - preserveReturnAddressAfterCall(t3) - storep t3, ReturnPC[cfr] - move cfr, t0 - loadi Callee + PayloadOffset[cfr], t1 - loadp JSFunction::m_executable[t1], t1 - move t2, cfr - call executableOffsetToFunction[t1] - restoreReturnAddressBeforeReturn(t3) - loadp JITStackFrame::vm[sp], t3 elsif C_LOOP loadp JITStackFrame::vm[sp], t3 storep cfr, VM::topCallFrame[t3] diff --git a/Source/JavaScriptCore/runtime/JSCell.h b/Source/JavaScriptCore/runtime/JSCell.h index 76acb1e55..04bf4b420 100644 --- a/Source/JavaScriptCore/runtime/JSCell.h +++ b/Source/JavaScriptCore/runtime/JSCell.h @@ -49,6 +49,9 @@ enum EnumerationMode { IncludeDontEnumProperties }; +template<typename T> void* allocateCell(Heap&); +template<typename T> void* allocateCell(Heap&, size_t); + class JSCell { friend class JSValue; friend class MarkedBlock; |
