Skip to content

Commit 866e324

Browse files
a60814billytargos
authored andcommittedApr 11, 2021
deps: V8: cherry-pick cf71540c684c
Original commit message: mac/arm64: Port SignalHandler::FillRegisterState(). Bug: chromium:1098899 Change-Id: I3ff79c00063f7da36b141a3a7b0d2daa71c9801a Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2270705 Commit-Queue: Peter Marshall <petermarshall@chromium.org> Reviewed-by: Peter Marshall <petermarshall@chromium.org> Auto-Submit: Nico Weber <thakis@chromium.org> Cr-Commit-Position: refs/heads/master@{#68568} Refs: v8/v8@cf71540 PR-URL: #38051 Refs: #35415 Fixes: #38005 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Evan Lucas <evanlucas@me.com>
1 parent 16b59c6 commit 866e324

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed
 

‎common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# Reset this number to 0 on major V8 upgrades.
3838
# Increment by one for each non-official patch applied to deps/v8.
39-
'v8_embedder_string': '-node.26',
39+
'v8_embedder_string': '-node.27',
4040

4141
##### V8 defaults for Node.js #####
4242

‎deps/v8/src/libsampler/sampler.cc

+8-1
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,14 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
468468
state->pc = reinterpret_cast<void*>(mcontext->__ss.__eip);
469469
state->sp = reinterpret_cast<void*>(mcontext->__ss.__esp);
470470
state->fp = reinterpret_cast<void*>(mcontext->__ss.__ebp);
471-
#endif // V8_HOST_ARCH_IA32
471+
#elif V8_HOST_ARCH_ARM64
472+
state->pc =
473+
reinterpret_cast<void*>(arm_thread_state64_get_pc(mcontext->__ss));
474+
state->sp =
475+
reinterpret_cast<void*>(arm_thread_state64_get_sp(mcontext->__ss));
476+
state->fp =
477+
reinterpret_cast<void*>(arm_thread_state64_get_fp(mcontext->__ss));
478+
#endif // V8_HOST_ARCH_*
472479
#elif V8_OS_FREEBSD
473480
#if V8_HOST_ARCH_IA32
474481
state->pc = reinterpret_cast<void*>(mcontext.mc_eip);

0 commit comments

Comments
 (0)
Please sign in to comment.