Module Name: src
Committed By: rin
Date: Tue Jul 30 14:41:10 UTC 2019
Modified Files:
src/sys/dev/rasops: rasops.c
Log Message:
In rasops_copy{rows,cols}(), if src == dst, we have nothing to do.
Otherwise, we can use memcpy safely instead of memmove.
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/dev/rasops/rasops.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/dev/rasops/rasops.c
diff -u src/sys/dev/rasops/rasops.c:1.99 src/sys/dev/rasops/rasops.c:1.100
--- src/sys/dev/rasops/rasops.c:1.99 Tue Jul 30 14:33:04 2019
+++ src/sys/dev/rasops/rasops.c Tue Jul 30 14:41:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops.c,v 1.99 2019/07/30 14:33:04 rin Exp $ */
+/* $NetBSD: rasops.c,v 1.100 2019/07/30 14:41:10 rin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.99 2019/07/30 14:33:04 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.100 2019/07/30 14:41:10 rin Exp $");
#include "opt_rasops.h"
#include "rasops_glue.h"
@@ -675,10 +675,10 @@ rasops_copyrows(void *cookie, int src, i
hp = NULL; /* XXX GCC */
-#ifdef RASOPS_CLIPPING
- if (dst == src)
+ if (__predict_false(dst == src))
return;
+#ifdef RASOPS_CLIPPING
if (src < 0) {
num += src;
src = 0;
@@ -709,7 +709,7 @@ rasops_copyrows(void *cookie, int src, i
hp = ri->ri_hwbits + dst * ri->ri_yscale;
while (num--) {
- memmove(dp, sp, n);
+ memcpy(dp, sp, n);
dp += stride;
if (ri->ri_hwbits) {
memcpy(hp, sp, n);
@@ -734,10 +734,10 @@ rasops_copycols(void *cookie, int row, i
hp = NULL; /* XXX GCC */
-#ifdef RASOPS_CLIPPING
- if (dst == src)
+ if (__predict_false(dst == src))
return;
+#ifdef RASOPS_CLIPPING
/* Catches < 0 case too */
if ((unsigned)row >= (unsigned)ri->ri_rows)
return;
@@ -772,7 +772,7 @@ rasops_copycols(void *cookie, int row, i
hp = ri->ri_hwbits + row + dst * ri->ri_xscale;
while (height--) {
- memmove(dp, sp, num);
+ memcpy(dp, sp, num);
dp += ri->ri_stride;
if (ri->ri_hwbits) {
memcpy(hp, sp, num);
