Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

i#6417 x86-32 client.flush: Fix tag for client events #6480

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
5 changes: 5 additions & 0 deletions core/arch/interp.c
Original file line number Diff line number Diff line change
Expand Up @@ -2750,6 +2750,11 @@ client_process_bb(dcontext_t *dcontext, build_bb_t *bb)
/* DrMem#1735: pass app pc, not selfmod copy pc */
app_pc tag = bb->pretend_pc == NULL ? bb->start_pc : bb->pretend_pc;

#if defined(LINUX) && defined(X86_32)
if (DYNAMO_OPTION(hook_vsyscall) && tag == vsyscall_sysenter_displaced_pc) {
tag = vsyscall_sysenter_return_pc;
}
#endif
#ifdef LINUX
if (TEST(FRAG_STARTS_RSEQ_REGION, bb->flags)) {
rseq_insert_start_label(dcontext, tag, bb->ilist);
Expand Down
Loading