[PATCH] CRIS: Correct first argument to upeek.

Edgar E. Iglesias edgar.iglesias at axis.com
Fri Oct 2 09:42:46 UTC 2009


Hello,

I hope this can make it in before 4.5.19, it's critical for the CRIS port.

Thanks!
Edgar

commit 9256bdf2f53106ad3e44c52f308a8f9972b17f6d
Author: Edgar E. Iglesias <edgar.iglesias at gmail.com>
Date:   Fri Oct 2 11:29:30 2009 +0200

    CRIS: Correct first argument to upeek.
    
    * util.c (printcall): Correct first argument to upeek in CRIS code.
    * syscall.c (syscall_fixup, syscall_enter): Likewise.
    
    Signed-off-by: Edgar E. Iglesias <edgar at axis.com>

diff --git a/syscall.c b/syscall.c
index 26b1a9d..a2e6885 100644
--- a/syscall.c
+++ b/syscall.c
@@ -1504,7 +1504,7 @@ syscall_fixup(struct tcb *tcp)
 		return 0;
 	}
 #elif defined(CRISV10) || defined(CRISV32)
-	if (upeek(tcp->pid, 4*PT_R10, &r10) < 0)
+	if (upeek(tcp, 4*PT_R10, &r10) < 0)
 		return -1;
 	if (r10 != -ENOSYS && !(tcp->flags & TCB_INSYSCALL)) {
 		if (debug)
@@ -2227,7 +2227,7 @@ syscall_enter(struct tcb *tcp)
 		else
 			tcp->u_nargs = 0;
 		for (i = 0; i < tcp->u_nargs; i++) {
-			if (upeek(tcp->pid, crisregs[i], &tcp->u_arg[i]) < 0)
+			if (upeek(tcp, crisregs[i], &tcp->u_arg[i]) < 0)
 				return -1;
 		}
 	}
diff --git a/util.c b/util.c
index f41b0c3..c767065 100644
--- a/util.c
+++ b/util.c
@@ -1362,7 +1362,7 @@ printcall(struct tcb *tcp)
 #elif defined(CRISV10)
 	long pc;
 
-	if (upeek(tcp->pid, 4*PT_IRP, &pc) < 0) {
+	if (upeek(tcp, 4*PT_IRP, &pc) < 0) {
 		PRINTBADPC;
 		return;
 	}
@@ -1370,7 +1370,7 @@ printcall(struct tcb *tcp)
 #elif defined(CRISV32)
 	long pc;
 
-	if (upeek(tcp->pid, 4*PT_ERP, &pc) < 0) {
+	if (upeek(tcp, 4*PT_ERP, &pc) < 0) {
 		PRINTBADPC;
 		return;
 	}




More information about the Strace-devel mailing list