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 807a29045945cdec6a80b9d508828d6c79762302..64cfc8d9aa9c78fef3c9f57c380732c750c0c872 100644 (file)
--- 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 67a628b6ef0640774e0d13d910ed381bc8fea19c..10339815e30522bd899b148938a84751f85fade2 100644 (file)
--- 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 d6f2692764f804f5d8ef06be068bf3fdf2cf98da..1ccee6e79be200a69c808aef56b33cf3c6efa76e 100644 (file)
--- 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 ? "[????????????????] " : \