Module Name:    src
Committed By:   rin
Date:           Sun Sep 11 09:00:02 UTC 2022

Modified Files:
        src/sys/arch/powerpc/ibm4xx: trap.c

Log Message:
copy{in,out}(): Add missing ``if (count == 0) goto done;''.


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/powerpc/ibm4xx/trap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/powerpc/ibm4xx/trap.c
diff -u src/sys/arch/powerpc/ibm4xx/trap.c:1.91 src/sys/arch/powerpc/ibm4xx/trap.c:1.92
--- src/sys/arch/powerpc/ibm4xx/trap.c:1.91	Sun Sep 11 08:57:39 2022
+++ src/sys/arch/powerpc/ibm4xx/trap.c	Sun Sep 11 09:00:02 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.91 2022/09/11 08:57:39 rin Exp $	*/
+/*	$NetBSD: trap.c,v 1.92 2022/09/11 09:00:02 rin Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -69,7 +69,7 @@
 #define	__UFETCHSTORE_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.91 2022/09/11 08:57:39 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.92 2022/09/11 09:00:02 rin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -484,6 +484,7 @@ copyin(const void *uaddr, void *kaddr, s
 		"bdnz	1b;"			/* repeat */
 
 	"2:"	"andi.	%[count],%[len],0x3;"	/* How many remaining bytes? */
+		"beq	10f;"
 		"addi	%[count],%[count],0x1;"
 		"mtctr	%[count];"
 	"3:"	"bdz	10f;"			/* while count */
@@ -603,6 +604,7 @@ copyout(const void *kaddr, void *uaddr, 
 		"bdnz	1b;"			/* repeat */
 
 	"2:"	"andi.	%[count],%[len],0x3;"	/* How many remaining bytes? */
+		"beq	10f;"
 		"addi	%[count],%[count],0x1;"
 		"mtctr	%[count];"
 	"3:"	"bdz	10f;"			/* while count */

Reply via email to