Set mcontext.cr2 to the faulting address

	* exceptions.cc (call_signal_handler): Set mcontext.cr2 to the
	faulting address.

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index ec70f1a1f2b380a01010a6d4a940c4362784a0ff..6e71e610ca046f305bb764df6d7d3353d1138d4e 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-04  Jon TURNEY  <jon.turney@dronecode.org.uk>
+
+       * exceptions.cc (call_signal_handler): Set mcontext.cr2 to the
+       faulting address.
+
 2015-04-02  Jon TURNEY  <jon.turney@dronecode.org.uk>
 
        * exceptions.cc (call_signal_handler): Only bother to construct

diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index 0c9ee14593629afa8ba7ad52b7d78812ec2f8ff8..4a6c21e7c415ad7e4d48b8392851d82e05ab03a1 100644 (file)
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -1521,6 +1521,10 @@ _cygtls::call_signal_handler ()
 
          context.uc_sigmask = context.uc_mcontext.oldmask = this_oldmask;
 
+         context.uc_mcontext.cr2 = (thissi.si_signo == SIGSEGV
+                                    || thissi.si_signo == SIGBUS)
+                                   ? (uintptr_t) thissi.si_addr : 0;
+
          thiscontext = &context;
        }