From: Denys Vlasenko <dvlasenk@redhat.com>
Date: Mon, 1 Jul 2013 10:49:14 +0000 (+0200)
Subject: Remove ia64-specific printing of current address on signal delivery
X-Git-Tag: v4.9~208
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a2483ba25fd80cb189abcdc14624be72b0c4c0b;p=strace

Remove ia64-specific printing of current address on signal delivery

The address is printed anyway by printleader() if -i is active.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
---

diff --git a/defs.h b/defs.h
index 807a2904..64cfc8d9 100644
--- a/defs.h
+++ b/defs.h
@@ -594,6 +594,7 @@ int strace_vfprintf(FILE *fp, const char *fmt, va_list args);
 extern void set_sortby(const char *);
 extern void set_overhead(int);
 extern void qualify(const char *);
+extern void print_pc(struct tcb *);
 extern int trace_syscall(struct tcb *);
 extern void count_syscall(struct tcb *, struct timeval *);
 extern void call_summary(FILE *);
@@ -691,7 +692,6 @@ extern void printrusage(struct tcb *, long);
 extern void printrusage32(struct tcb *, long);
 #endif
 extern void printuid(const char *, unsigned long);
-extern void printcall(struct tcb *);
 extern void print_sigset(struct tcb *, long, int);
 extern void printsignal(int);
 extern void tprint_iov(struct tcb *, unsigned long, unsigned long, int decode_iov);
diff --git a/strace.c b/strace.c
index 67a628b6..10339815 100644
--- a/strace.c
+++ b/strace.c
@@ -623,7 +623,7 @@ printleader(struct tcb *tcp)
 		}
 	}
 	if (iflag)
-		printcall(tcp);
+		print_pc(tcp);
 }
 
 void
@@ -2266,31 +2266,14 @@ trace(void)
 			    && !hide_log_until_execve
 			    && (qual_flags[sig] & QUAL_SIGNAL)
 			   ) {
-#if defined(PT_CR_IPSR) && defined(PT_CR_IIP)
-				long pc = 0;
-				long psr = 0;
-
-				upeek(tcp->pid, PT_CR_IPSR, &psr);
-				upeek(tcp->pid, PT_CR_IIP, &pc);
-
-# define PSR_RI	41
-				pc += (psr >> PSR_RI) & 0x3;
-# define PC_FORMAT_STR	" @ %lx"
-# define PC_FORMAT_ARG	, pc
-#else
-# define PC_FORMAT_STR	""
-# define PC_FORMAT_ARG	/* nothing */
-#endif
 				printleader(tcp);
 				if (!stopped) {
 					tprintf("--- %s ", signame(sig));
 					printsiginfo(&si, verbose(tcp));
-					tprintf(PC_FORMAT_STR " ---\n"
-						PC_FORMAT_ARG);
+					tprints(" ---\n");
 				} else
-					tprintf("--- stopped by %s" PC_FORMAT_STR " ---\n",
-						signame(sig)
-						PC_FORMAT_ARG);
+					tprintf("--- stopped by %s ---\n",
+						signame(sig));
 				line_ended();
 			}
 
diff --git a/syscall.c b/syscall.c
index d6f26927..1ccee6e7 100644
--- a/syscall.c
+++ b/syscall.c
@@ -780,7 +780,7 @@ static long xtensa_a2;
 #endif
 
 void
-printcall(struct tcb *tcp)
+print_pc(struct tcb *tcp)
 {
 #define PRINTBADPC tprintf(sizeof(long) == 4 ? "[????????] " : \
 			   sizeof(long) == 8 ? "[????????????????] " : \