Commit 37862a6
deps: V8: cherry-pick aa0b288f87cc
Original commit message:
PPC/S390: [wasm] Fix jump table offset when patching
... need to make sure patching of target occurs at the correct spot
based on what `EmitFarJumpSlot` emits. Also mask the branch offset in
PPC64 EmitJumpSlot to match `Assembler::b()`.
Change-Id: I5a8079d0079d8ad427034761d42c90b64d5746dd
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/7642190
Reviewed-by: John <junyan1@ibm.com>
Commit-Queue: Milad Farazmand <mfarazma@ibm.com>
Reviewed-by: Clemens Backes <clemensb@chromium.org>
Cr-Commit-Position: refs/heads/main@{#105646}
Refs: v8/v8@aa0b288
PR-URL: #62136
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>1 parent 0278461 commit 37862a6
2 files changed
Lines changed: 7 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -38,7 +38,7 @@ | |||
| 38 | 38 | ||
| 39 | 39 | # Reset this number to 0 on major V8 upgrades. | |
| 40 | 40 | # Increment by one for each non-official patch applied to deps/v8. | |
| 41 | - 'v8_embedder_string': '-node.20', | ||
| 41 | + 'v8_embedder_string': '-node.21', | ||
| 42 | 42 | ||
| 43 | 43 | ##### V8 defaults for Node.js ##### | |
| 44 | 44 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -426,7 +426,8 @@ void JumpTableAssembler::EmitFarJumpSlot(Address target) { | |||
| 426 | 426 | // static | |
| 427 | 427 | void JumpTableAssembler::PatchFarJumpSlot(WritableJitAllocation& jit_allocation, | |
| 428 | 428 | Address slot, Address target) { | |
| 429 | - Address target_addr = slot + 8; | ||
| 429 | + // See {EmitFarJumpSlot} for the offset of the target. | ||
| 430 | + Address target_addr = slot + kFarJumpTableSlotSize - kSystemPointerSize; | ||
| 430 | 431 | jit_allocation.WriteValue(target_addr, target, kRelaxedStore); | |
| 431 | 432 | } | |
| 432 | 433 | ||
@@ -636,7 +637,7 @@ bool JumpTableAssembler::EmitJumpSlot(Address target) { | |||
| 636 | 637 | ||
| 637 | 638 | CHECK((relative_target & (kAAMask | kLKMask)) == 0); | |
| 638 | 639 | // The jump table is updated live, so the write has to be atomic. | |
| 639 | - emit<uint32_t>(inst[0] | relative_target, kRelaxedStore); | ||
| 640 | + emit<uint32_t>(inst[0] | (relative_target & kImm26Mask), kRelaxedStore); | ||
| 640 | 641 | return true; | |
| 641 | 642 | } | |
| 642 | 643 | ||
@@ -671,7 +672,9 @@ void JumpTableAssembler::EmitFarJumpSlot(Address target) { | |||
| 671 | 672 | // static | |
| 672 | 673 | void JumpTableAssembler::PatchFarJumpSlot(WritableJitAllocation& jit_allocation, | |
| 673 | 674 | Address slot, Address target) { | |
| 674 | - Address target_addr = slot + kFarJumpTableSlotSize - 8; | ||
| 675 | + // See {EmitFarJumpSlot} for the offset of the target. | ||
| 676 | + Address target_addr = | ||
| 677 | + slot + kFarJumpTableSlotSize - (2 * kInstrSize) - kSystemPointerSize; | ||
| 675 | 678 | jit_allocation.WriteValue(target_addr, target, kRelaxedStore); | |
| 676 | 679 | } | |
| 677 | 680 | ||
0 commit comments