Skip to content

Commit

Permalink
deps: V8: cherry-pick 9861ce1deae2
Browse files Browse the repository at this point in the history
Original commit message:

    PPC: pass a scratch reg when using register_location

    Change-Id: I43e4a4cadc60e958d6c9d80e725a49a3e36d8ba9
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3797832
    Reviewed-by: Junliang Yan <junyan@redhat.com>
    Commit-Queue: Milad Farazmand <mfarazma@redhat.com>
    Cr-Commit-Position: refs/heads/main@{#82146}

Fixes: #44055
PR-URL: #44115
Refs: v8/v8@9861ce1
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>
  • Loading branch information
miladfarca authored and ruyadorno committed Aug 22, 2022
1 parent c340344 commit 52a516a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.10',
'v8_embedder_string': '-node.11',

##### V8 defaults for Node.js #####

Expand Down
4 changes: 2 additions & 2 deletions deps/v8/src/regexp/ppc/regexp-macro-assembler-ppc.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1139,15 +1139,15 @@ void RegExpMacroAssemblerPPC::WriteStackPointerToRegister(int reg) {
__ mov(r4, Operand(ref));
__ LoadU64(r4, MemOperand(r4));
__ SubS64(r3, backtrack_stackpointer(), r4);
__ StoreU64(r3, register_location(reg));
__ StoreU64(r3, register_location(reg), r0);
}

void RegExpMacroAssemblerPPC::ReadStackPointerFromRegister(int reg) {
ExternalReference ref =
ExternalReference::address_of_regexp_stack_memory_top_address(isolate());
__ mov(r3, Operand(ref));
__ LoadU64(r3, MemOperand(r3));
__ LoadU64(backtrack_stackpointer(), register_location(reg));
__ LoadU64(backtrack_stackpointer(), register_location(reg), r0);
__ AddS64(backtrack_stackpointer(), backtrack_stackpointer(), r3);
}

Expand Down

0 comments on commit 52a516a

Please sign in to comment.