From: Nicholas Nethercote <n.nethercote@gmail.com>
Date: Wed, 13 Oct 2004 14:50:35 +0000 (+0000)
Subject: Arch-abstraction:
X-Git-Tag: svn/VALGRIND_3_0_0~1541
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=45449290f02edc855acd4f1d8dc85a6df79e34d6;p=thirdparty%2Fvalgrind.git

Arch-abstraction:
- whoops, missed one ucontext use in last commit


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2752
---

diff --git a/coregrind/vg_signals.c b/coregrind/vg_signals.c
index 80cc82a158..7cbc81a302 100644
--- a/coregrind/vg_signals.c
+++ b/coregrind/vg_signals.c
@@ -1829,7 +1829,7 @@ void vg_sync_signalhandler ( Int sigNo, vki_ksiginfo_t *info, struct vki_ucontex
 	 generated it), but there was no jumpbuf set up.  This means
 	 it was actually generated by Valgrind internally.
        */
-      struct vki_sigcontext *sc = &uc->uc_mcontext;
+      Addr context_ip = UCONTEXT_INSTR_PTR(uc);
       Char buf[1024];
 
       VG_(message)(Vg_DebugMsg, 
@@ -1837,7 +1837,7 @@ void vg_sync_signalhandler ( Int sigNo, vki_ksiginfo_t *info, struct vki_ucontex
 		   sigNo, signame(sigNo));
 
       buf[0] = 0;
-      if (1 && !VG_(get_fnname)(sc->eip, buf+2, sizeof(buf)-5)) {
+      if (1 && !VG_(get_fnname)(context_ip, buf+2, sizeof(buf)-5)) {
 	 Int len;
 
 	 buf[0] = ' ';
@@ -1849,7 +1849,7 @@ void vg_sync_signalhandler ( Int sigNo, vki_ksiginfo_t *info, struct vki_ucontex
 
       VG_(message)(Vg_DebugMsg, 
 		   "si_code=%x Fault EIP: %p%s; Faulting address: %p",
-		   info->si_code, sc->eip, buf, info->_sifields._sigfault._addr);
+		   info->si_code, context_ip, buf, info->_sifields._sigfault._addr);
 
       if (0)
 	 VG_(kill_self)(sigNo);		/* generate a core dump */