Restore %EIP from the info passed to the handler (ucontext), so as to
be able to deal with signal handlers that mess with
third_arg->uc_mcontext.gregs[REG_EIP]. Apparently Wine does this.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5641 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/m_sigframe/sigframe-x86-linux.c b/coregrind/m_sigframe/sigframe-x86-linux.c
index cca9bd3..6b9dad1 100644
--- a/coregrind/m_sigframe/sigframe-x86-linux.c
+++ b/coregrind/m_sigframe/sigframe-x86-linux.c
@@ -630,8 +630,7 @@
tst->arch.vex.guest_ESI = sc->esi;
tst->arch.vex.guest_EDI = sc->edi;
//:: tst->arch.vex.guest_eflags = sc->eflags;
-//:: tst->arch.vex.guest_EIP = sc->eip;
-
+ tst->arch.vex.guest_EIP = sc->eip;
tst->arch.vex.guest_CS = sc->cs;
tst->arch.vex.guest_SS = sc->ss;
tst->arch.vex.guest_DS = sc->ds;