From owner-svn-src-all@FreeBSD.ORG  Sat Jun 13 14:00:11 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 329721065693;
	Sat, 13 Jun 2009 14:00:11 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 204698FC34;
	Sat, 13 Jun 2009 14:00:11 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5DE0Bnn015823;
	Sat, 13 Jun 2009 14:00:11 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5DE0BLu015822;
	Sat, 13 Jun 2009 14:00:11 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200906131400.n5DE0BLu015822@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sat, 13 Jun 2009 14:00:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194111 - head/sys/i386/include
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jun 2009 14:00:12 -0000

Author: ed
Date: Sat Jun 13 14:00:10 2009
New Revision: 194111
URL: http://svn.freebsd.org/changeset/base/194111

Log:
  Clobber "cc" instead of using volatile; remove obsolete register keyword.
  
  Submitted by:	Christoph Mallon

Modified:
  head/sys/i386/include/in_cksum.h

Modified: head/sys/i386/include/in_cksum.h
==============================================================================
--- head/sys/i386/include/in_cksum.h	Sat Jun 13 13:56:06 2009	(r194110)
+++ head/sys/i386/include/in_cksum.h	Sat Jun 13 14:00:10 2009	(r194111)
@@ -57,9 +57,9 @@
 static __inline u_int
 in_cksum_hdr(const struct ip *ip)
 {
-	register u_int sum = 0;
+	u_int sum = 0;
 
-	__asm __volatile (
+	__asm(
 		"addl %1, %0\n"
 		"adcl %2, %0\n"
 		"adcl %3, %0\n"
@@ -72,6 +72,7 @@ in_cksum_hdr(const struct ip *ip)
 		  "g" (((const u_int32_t *)ip)[2]),
 		  "g" (((const u_int32_t *)ip)[3]),
 		  "g" (((const u_int32_t *)ip)[4])
+		: "cc"
 	);
 	sum = (sum & 0xffff) + (sum >> 16);
 	if (sum > 0xffff)
@@ -91,12 +92,12 @@ in_cksum_update(struct ip *ip)
 static __inline u_short
 in_addword(u_short sum, u_short b)
 {
-	/* __volatile is necessary because the condition codes are used. */
-	__asm __volatile (
+	__asm(
 		"addw %1, %0\n"
 		"adcw $0, %0"
 		: "+r" (sum)
-		: "r" (b)
+		: "g" (b)
+		: "cc"
 	);
 	return (sum);
 }
@@ -104,14 +105,14 @@ in_addword(u_short sum, u_short b)
 static __inline u_short
 in_pseudo(u_int sum, u_int b, u_int c)
 {
-	/* __volatile is necessary because the condition codes are used. */
-	__asm __volatile (
+	__asm(
 		"addl %1, %0\n"
 		"adcl %2, %0\n"
 		"adcl $0, %0"
 		: "+r" (sum)
 		: "g" (b),
 		  "g" (c)
+		: "cc"
 	);
 	sum = (sum & 0xffff) + (sum >> 16);
 	if (sum > 0xffff)