58 lines
1.9 KiB
Diff
58 lines
1.9 KiB
Diff
This fixes JavaScriptCore on 32-bit big endian systems (mainly ppc).
|
|
|
|
Without the patch, attempting to run any JS results in a crash.
|
|
|
|
Upstream status: https://bugs.webkit.org/show_bug.cgi?id=211592
|
|
|
|
--- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
|
|
+++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
|
|
@@ -1480,13 +1480,21 @@ llintOpWithMetadata(op_put_by_id, OpPutById, macro (size, get, dispatch, metadat
|
|
loadp StructureChain::m_vector[t3], t3
|
|
assert(macro (ok) btpnz t3, ok end)
|
|
|
|
- loadp Structure::m_prototype[t2], t2
|
|
+ if JSVALUE64
|
|
+ loadp Structure::m_prototype[t2], t2
|
|
+ else
|
|
+ loadp Structure::m_prototype + PayloadOffset[t2], t2
|
|
+ end
|
|
btpz t2, .opPutByIdTransitionChainDone
|
|
.opPutByIdTransitionChainLoop:
|
|
loadp [t3], t1
|
|
bineq t1, JSCell::m_structureID[t2], .opPutByIdSlow
|
|
addp 4, t3
|
|
- loadp Structure::m_prototype[t1], t2
|
|
+ if JSVALUE64
|
|
+ loadp Structure::m_prototype[t1], t2
|
|
+ else
|
|
+ loadp Structure::m_prototype + PayloadOffset[t1], t2
|
|
+ end
|
|
btpnz t2, .opPutByIdTransitionChainLoop
|
|
|
|
.opPutByIdTransitionChainDone:
|
|
@@ -2068,7 +2076,11 @@ end)
|
|
|
|
|
|
op(llint_throw_from_slow_path_trampoline, macro()
|
|
- loadp Callee[cfr], t1
|
|
+ if JSVALUE64
|
|
+ loadp Callee[cfr], t1
|
|
+ else
|
|
+ loadp Callee + PayloadOffset[cfr], t1
|
|
+ end
|
|
convertCalleeToVM(t1)
|
|
copyCalleeSavesToVMEntryFrameCalleeSavesBuffer(t1, t2)
|
|
|
|
@@ -2077,7 +2089,11 @@ op(llint_throw_from_slow_path_trampoline, macro()
|
|
# When throwing from the interpreter (i.e. throwing from LLIntSlowPaths), so
|
|
# the throw target is not necessarily interpreted code, we come to here.
|
|
# This essentially emulates the JIT's throwing protocol.
|
|
- loadp Callee[cfr], t1
|
|
+ if JSVALUE64
|
|
+ loadp Callee[cfr], t1
|
|
+ else
|
|
+ loadp Callee + PayloadOffset[cfr], t1
|
|
+ end
|
|
convertCalleeToVM(t1)
|
|
jmp VM::targetMachinePCForThrow[t1]
|
|
end)
|