commit af8dc6b3a562193c27c89531e7ac6d94e7c3c322
author Chris Metcalf <cmetcalf@tilera.com> Tue Feb 05 13:02:42 2013 -0500
committer Dmitry V. Levin <ldv@altlinux.org> Tue Feb 05 23:15:06 2013 +0000
tree 6fff31a5c6316d1e20e205a162cdf74d11ce554a
parent 9e1a7d818a04d62f097a74b1ff525468c36b0e7c

tile: fix merge skew with new get_regs architecture

* defs.h [TILE]: Declare clear_regs(), get_regs() and get_regs_error.
* syscall.c (get_regs) [TILE]: Fix merge skew.
(printcall) [TILE]: fix a compiler warning about pt_reg_t in
a printf expression.

Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>

syscall.c

diff --git a/syscall.c b/syscall.c
index 3851c9d..ec588b1 100644
--- a/syscall.c
+++ b/syscall.c
@@ -845,9 +845,9 @@
 	tprintf("[%08lx] ", pc);
 #elif defined(TILE)
 # ifdef _LP64
-	tprintf("[%016lx] ", tile_regs.pc);
+	tprintf("[%016lx] ", (unsigned long) tile_regs.pc);
 # else
-	tprintf("[%08lx] ", tile_regs.pc);
+	tprintf("[%08lx] ", (unsigned long) tile_regs.pc);
 # endif
 #endif /* architecture */
 }
@@ -886,7 +886,7 @@
 # elif defined(SPARC) || defined(SPARC64)
 	get_regs_error = ptrace(PTRACE_GETREGS, pid, (char *)&regs, 0);
 # elif defined(TILE)
-	get_regs_error = ptrace(PTRACE_GETREGS, tcp->pid, NULL, (long) &tile_regs);
+	get_regs_error = ptrace(PTRACE_GETREGS, pid, NULL, (long) &tile_regs);
 # endif
 }
 #endif