From owner-p4-projects@FreeBSD.ORG  Mon Jan  7 17:26:59 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 89B6AB7A; Mon,  7 Jan 2013 17:26:59 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 45474B78
 for <perforce@freebsd.org>; Mon,  7 Jan 2013 17:26:59 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:4f8:fff6::2d])
 by mx1.freebsd.org (Postfix) with ESMTP id 2A685915
 for <perforce@freebsd.org>; Mon,  7 Jan 2013 17:26:59 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
 by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id r07HQw1w043461
 for <perforce@freebsd.org>; Mon, 7 Jan 2013 17:26:58 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id r07HQwjk043458
 for perforce@freebsd.org; Mon, 7 Jan 2013 17:26:58 GMT
 (envelope-from brooks@freebsd.org)
Date: Mon, 7 Jan 2013 17:26:58 GMT
Message-Id: <201301071726.r07HQwjk043458@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 219955 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Jan 2013 17:27:00 -0000

http://p4web.freebsd.org/@@219955?ac=10

Change 219955 by brooks@brooks_zenith on 2013/01/07 17:26:50

	Checkpoint a slightly less correct, but faster memcpy.  Still
	need to switch to David's version.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/ctsrd/minifile/cheri/cmemcpy.h#2 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/ctsrd/minifile/cheri/cmemcpy.h#2 (text+ko) ====

@@ -44,9 +44,20 @@
 static inline void
 memcpy_fromcap(void *dst, u_int creg, off_t off, size_t len)
 {
-	size_t count;
+	size_t count, remainder;
 	uint8_t *v;
 
+	/* XXX: assumes the memory in the capability is 8-byte aligned */
+	if (off & 0x7 == 0 && (intptr_t)dst & 0x7 == 0) {
+		remainder = len & 0x7;
+		len -= remainder;
+
+		for (v = dst, count = 0; (count * 8) < len; v += 8, count++)
+			CHERI_CLD(*v, off + (count * 8), 0, creg);
+		len = remainder;
+		off += count * 8;
+	}
+
 	for (v = dst, count = 0; count < len; v++, count++)
 		CHERI_CLB(*v, off + count, 0, creg);
 }