Some fixes...
* read_config_file.c: initialise pt stack argument to stop warning
* summary.c: make show_summary() obey -C for demangaling function names
diff --git a/sysdeps/linux-gnu/arm/trace.c b/sysdeps/linux-gnu/arm/trace.c
index 7f7a677..0d68ae0 100644
--- a/sysdeps/linux-gnu/arm/trace.c
+++ b/sysdeps/linux-gnu/arm/trace.c
@@ -26,47 +26,54 @@
#define off_ip 48
#define off_pc 60
-void
-get_arch_dep(struct process * proc) {
+void get_arch_dep(struct process *proc)
+{
}
/* Returns 1 if syscall, 2 if sysret, 0 otherwise.
*/
-int
-syscall_p(struct process * proc, int status, int * sysnum) {
- if (WIFSTOPPED(status) && WSTOPSIG(status)==SIGTRAP) {
+int syscall_p(struct process *proc, int status, int *sysnum)
+{
+ if (WIFSTOPPED(status) && WSTOPSIG(status) == SIGTRAP) {
/* get the user's pc (plus 8) */
int pc = ptrace(PTRACE_PEEKUSER, proc->pid, off_pc, 0);
/* fetch the SWI instruction */
- int insn = ptrace(PTRACE_PEEKTEXT, proc->pid, pc-4, 0) ;
-
+ int insn = ptrace(PTRACE_PEEKTEXT, proc->pid, pc - 4, 0);
+
*sysnum = insn & 0xFFFF;
/* if it is a syscall, return 1 or 2 */
if ((insn & 0xFFFF0000) == 0xef900000) {
- return ptrace(PTRACE_PEEKUSER, proc->pid, off_ip, 0) ? 2 : 1;
+ return ptrace(PTRACE_PEEKUSER, proc->pid, off_ip,
+ 0) ? 2 : 1;
}
}
return 0;
}
-
-long
-gimme_arg(enum tof type, struct process * proc, int arg_num) {
- if (arg_num==-1) { /* return value */
+
+long gimme_arg(enum tof type, struct process *proc, int arg_num)
+{
+ if (arg_num == -1) { /* return value */
return ptrace(PTRACE_PEEKUSER, proc->pid, off_r0, 0);
}
/* deal with the ARM calling conventions */
- if (type==LT_TOF_FUNCTION || type==LT_TOF_FUNCTIONR) {
- if (arg_num<4) {
- return ptrace(PTRACE_PEEKUSER, proc->pid, 4*arg_num, 0);
+ if (type == LT_TOF_FUNCTION || type == LT_TOF_FUNCTIONR) {
+ if (arg_num < 4) {
+ return ptrace(PTRACE_PEEKUSER, proc->pid, 4 * arg_num,
+ 0);
} else {
- return ptrace(PTRACE_PEEKDATA, proc->pid, proc->stack_pointer+4*(arg_num-4), 0);
+ return ptrace(PTRACE_PEEKDATA, proc->pid,
+ proc->stack_pointer + 4 * (arg_num - 4),
+ 0);
}
- } else if (type==LT_TOF_SYSCALL || type==LT_TOF_SYSCALLR) {
- if (arg_num<5) {
- return ptrace(PTRACE_PEEKUSER, proc->pid, 4*arg_num, 0);
+ } else if (type == LT_TOF_SYSCALL || type == LT_TOF_SYSCALLR) {
+ if (arg_num < 5) {
+ return ptrace(PTRACE_PEEKUSER, proc->pid, 4 * arg_num,
+ 0);
} else {
- return ptrace(PTRACE_PEEKDATA, proc->pid, proc->stack_pointer+4*(arg_num-5), 0);
+ return ptrace(PTRACE_PEEKDATA, proc->pid,
+ proc->stack_pointer + 4 * (arg_num - 5),
+ 0);
}
} else {
fprintf(stderr, "gimme_arg called with wrong arguments\n");
@@ -76,6 +83,6 @@
return 0;
}
-void
-save_register_args(enum tof type, struct process * proc) {
+void save_register_args(enum tof type, struct process *proc)
+{
}