From: Dirk Mueller <daywalker@users.sourceforge.net>
Date: Wed, 22 Feb 2006 13:22:02 +0000 (+0000)
Subject: backport "Support for changing EIP in signal handler (x86)" v5641
X-Git-Tag: svn/VALGRIND_3_1_1~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a03a303a52a008e29b8fcfc4e9915737a2f70748;p=thirdparty%2Fvalgrind.git

backport "Support for changing EIP in signal handler (x86)" v5641


git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_1_BRANCH@5676
---

diff --git a/coregrind/m_sigframe/sigframe-x86-linux.c b/coregrind/m_sigframe/sigframe-x86-linux.c
index cca9bd3914..6b9dad1559 100644
--- a/coregrind/m_sigframe/sigframe-x86-linux.c
+++ b/coregrind/m_sigframe/sigframe-x86-linux.c
@@ -630,8 +630,7 @@ void restore_sigcontext( ThreadState *tst,
    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;