diff options
| author | Julien Brianceau <jbriance@cisco.com> | 2013-10-04 12:11:32 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-04 12:12:10 +0200 |
| commit | 008aa4c4f36ff099c69b65f35262b851400102e4 (patch) | |
| tree | dd0562c919d4107c720b051d1740ca5e21e65f6e /Source/JavaScriptCore | |
| parent | 1e4dd5844be47323a4869f4b51bb583a09d1a351 (diff) | |
| download | qtwebkit-008aa4c4f36ff099c69b65f35262b851400102e4.tar.gz | |
[sh4] Missing instruction in nativeCallTrampoline LLINT function.
"move t0, a0" is missing in sh4 implementation of nativeCallTrampoline.
Reuse MIPS implementation to avoid code duplication.
Fixed in changeset 153371 of WebKit trunk.
Change-Id: Ifcc729006bcb426a797762aab093cd300401633c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/JavaScriptCore')
| -rw-r--r-- | Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm | 15 |
1 files changed, 1 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] |