From 3f8d42d94f4cb17778c039959063a13de2634d71 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Thu, 22 Dec 2016 00:54:18 +0000 Subject: [PATCH] printrusage*: change tracee address argument type from long to kernel_ureg_t * defs.h [ALPHA] (printrusage32): Change address argument type from long to kernel_ureg_t. * printrusage.c (printrusage): Likewise. [ALPHA] (printrusage32): Likewise. * wait.c (printwaitn): Change the type of tracee address argument of print_rusage from long to kernel_ureg_t. --- defs.h | 2 +- printrusage.c | 5 +++-- wait.c | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/defs.h b/defs.h index 7873edbf..7fd50f47 100644 --- a/defs.h +++ b/defs.h @@ -813,7 +813,7 @@ typedef struct { } timeval32_t; extern void print_timeval32_t(const timeval32_t *); -extern void printrusage32(struct tcb *, long); +extern void printrusage32(struct tcb *, kernel_ureg_t); extern const char *sprint_timeval32(struct tcb *tcp, kernel_ureg_t); extern void print_timeval32(struct tcb *tcp, kernel_ureg_t); extern void print_timeval32_pair(struct tcb *tcp, kernel_ureg_t); diff --git a/printrusage.c b/printrusage.c index 09f8d453..df5b4583 100644 --- a/printrusage.c +++ b/printrusage.c @@ -37,7 +37,8 @@ typedef struct rusage rusage_t; #include MPERS_DEFS -MPERS_PRINTER_DECL(void, printrusage, struct tcb *tcp, long addr) +MPERS_PRINTER_DECL(void, printrusage, + struct tcb *const tcp, const kernel_ureg_t addr) { rusage_t ru; @@ -74,7 +75,7 @@ MPERS_PRINTER_DECL(void, printrusage, struct tcb *tcp, long addr) #ifdef ALPHA void -printrusage32(struct tcb *tcp, long addr) +printrusage32(struct tcb *const tcp, const kernel_ureg_t addr) { struct rusage32 { timeval32_t ru_utime; /* user time used */ diff --git a/wait.c b/wait.c index 64bd3b7d..401cae2a 100644 --- a/wait.c +++ b/wait.c @@ -117,7 +117,8 @@ printstatus(int status) } static int -printwaitn(struct tcb *tcp, void (*const print_rusage)(struct tcb *, long)) +printwaitn(struct tcb *const tcp, + void (*const print_rusage)(struct tcb *, kernel_ureg_t)) { if (entering(tcp)) { /* On Linux, kernel-side pid_t is typedef'ed to int