summaryrefslogtreecommitdiffstats
path: root/include/asm-mips
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-03-10 21:45:42 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-03-10 21:45:42 +0000
commit05d66f13fd1c16283893589e9014a132bcfc9709 (patch)
treec3d25fde56d8de3d953956322f4b310943a7170a /include/asm-mips
parent39ab61ca10dd63306133b2d3eb9914b247d0f744 (diff)
Fix gcc 3.0 warning and IPv6 checksum bug.
Diffstat (limited to 'include/asm-mips')
-rw-r--r--include/asm-mips/checksum.h206
1 files changed, 100 insertions, 106 deletions
diff --git a/include/asm-mips/checksum.h b/include/asm-mips/checksum.h
index 25e303e8c..186c9d6a6 100644
--- a/include/asm-mips/checksum.h
+++ b/include/asm-mips/checksum.h
@@ -1,10 +1,9 @@
-/* $Id: checksum.h,v 1.8 2000/02/18 00:24:48 ralf Exp $
- *
+/*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 1995, 1996, 1997, 1998 by Ralf Baechle
+ * Copyright (C) 1995, 1996, 1997, 1998, 2001 by Ralf Baechle
*/
#ifndef _ASM_CHECKSUM_H
#define _ASM_CHECKSUM_H
@@ -70,15 +69,15 @@ unsigned int csum_partial_copy(const char *src, char *dst, int len, unsigned int
*/
static inline unsigned short int csum_fold(unsigned int sum)
{
- __asm__("
- .set noat
- sll $1,%0,16
- addu %0,$1
- sltu $1,%0,$1
- srl %0,%0,16
- addu %0,$1
- xori %0,0xffff
- .set at"
+ __asm__(
+ ".set\tnoat\t\t\t# csum_fold\n\t"
+ "sll\t$1,%0,16\n\t"
+ "addu\t%0,$1\n\t"
+ "sltu\t$1,%0,$1\n\t"
+ "srl\t%0,%0,16\n\t"
+ "addu\t%0,$1\n\t"
+ "xori\t%0,0xffff\n\t"
+ ".set\tat"
: "=r" (sum)
: "0" (sum)
: "$1");
@@ -102,37 +101,36 @@ static inline unsigned short ip_fast_csum(unsigned char * iph,
/*
* This is for 32-bit MIPS processors.
*/
- __asm__ __volatile__("
- .set noreorder
- .set noat
- lw %0,(%1)
- subu %2,4
- #blez %2,2f
- sll %2,2 # delay slot
+ __asm__ __volatile__(
+ ".set\tnoreorder\t\t\t# ip_fast_csum\n\t"
+ ".set\tnoat\n\t"
+ "lw\t%0, (%1)\n\t"
+ "subu\t%2, 4\n\t"
+ "#blez\t%2, 2f\n\t"
+ " sll\t%2, 2\n\t"
+ "lw\t%3, 4(%1)\n\t"
+ "addu\t%2, %1\n\t"
+ "addu\t%0, %3\n\t"
+ "sltu\t$1, %0, %3\n\t"
+ "lw\t%3, 8(%1)\n\t"
+ "addu\t%0, $1\n\t"
+ "addu\t%0, %3\n\t"
+ "sltu\t$1, %0, %3\n\t"
+ "lw\t%3, 12(%1)\n\t"
+ "addu\t%0, $1\n\t"
+ "addu\t%0, %3\n\t"
+ "sltu\t$1, %0, %3\n\t"
+ "addu\t%0, $1\n"
- lw %3,4(%1)
- addu %2,%1 # delay slot
- addu %0,%3
- sltu $1,%0,%3
- lw %3,8(%1)
- addu %0,$1
- addu %0,%3
- sltu $1,%0,%3
- lw %3,12(%1)
- addu %0,$1
- addu %0,%3
- sltu $1,%0,%3
- addu %0,$1
+ "1:\tlw\t%3, 16(%1)\n\t"
+ "addiu\t%1, 4\n\t"
+ "addu\t%0, %3\n\t"
+ "sltu\t$1, %0, %3\n\t"
+ "bne\t%2, %1, 1b\n\t"
+ " addu\t%0, $1\n"
-1: lw %3,16(%1)
- addiu %1,4
- addu %0,%3
- sltu $1,%0,%3
- bne %2,%1,1b
- addu %0,$1 # delay slot
-
-2: .set at
- .set reorder"
+ "2:\t.set\tat\n\t"
+ ".set\treorder"
: "=&r" (sum), "=&r" (iph), "=&r" (ihl), "=&r" (dummy)
: "1" (iph), "2" (ihl)
: "$1");
@@ -150,28 +148,28 @@ static inline unsigned long csum_tcpudp_nofold(unsigned long saddr,
unsigned short proto,
unsigned int sum)
{
- __asm__("
- .set noat
- addu %0,%2
- sltu $1,%0,%2
- addu %0,$1
+ __asm__(
+ ".set\tnoat\t\t\t# csum_tcpudp_nofold\n\t"
+ "addu\t%0, %2\n\t"
+ "sltu\t$1, %0, %2\n\t"
+ "addu\t%0, $1\n\t"
- addu %0,%3
- sltu $1,%0,%3
- addu %0,$1
+ "addu\t%0, %3\n\t"
+ "sltu\t$1, %0, %3\n\t"
+ "addu\t%0, $1\n\t"
- addu %0,%4
- sltu $1,%0,%4
- addu %0,$1
- .set at"
+ "addu\t%0, %4\n\t"
+ "sltu\t$1, %0, %4\n\t"
+ "addu\t%0, $1\n\t"
+ ".set\tat"
: "=r" (sum)
: "0" (daddr), "r"(saddr),
#ifdef __MIPSEL__
- "r" ((ntohs(len)<<16)+proto*256),
+ "r" ((ntohs(len)<<16)+proto*256),
#else
- "r" (((proto)<<16)+len),
+ "r" (((proto)<<16)+len),
#endif
- "r"(sum)
+ "r"(sum)
: "$1");
return sum;
@@ -206,64 +204,60 @@ static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr,
unsigned short proto,
unsigned int sum)
{
- __asm__("
- .set noreorder
- .set noat
- addu %0,%5 # proto (long in network byte order)
- sltu $1,%0,%5
- addu %0,$1
+ __asm__(
+ ".set\tnoreorder\t\t\t# csum_ipv6_magic\n\t"
+ ".set\tnoat\n\t"
+ "addu\t%0, %5\t\t\t# proto (long in network byte order)\n\t"
+ "sltu\t$1, %0, %5\n\t"
+ "addu\t%0, $1\n\t"
- addu %0,%6 # csum
- sltu $1,%0,%6
- lw %1,0(%2) # four words source address
- addu %0,$1
- addu %0,%1
- sltu $1,%0,$1
+ "addu\t%0, %6\t\t\t# csum\n\t"
+ "sltu\t$1, %0, %6\n\t"
+ "lw\t%1, 0(%2)\t\t\t# four words source address\n\t"
+ "addu\t%0, $1\n\t"
+ "addu\t%0, %1\n\t"
+ "sltu\t$1, %0, $1\n\t"
- lw %1,4(%2)
- addu %0,$1
- addu %0,%1
- sltu $1,%0,$1
+ "lw\t%1, 4(%2)\n\t"
+ "addu\t%0, $1\n\t"
+ "addu\t%0, %1\n\t"
+ "sltu\t$1, %0, $1\n\t"
- lw %1,8(%2)
- addu %0,$1
- addu %0,%1
- sltu $1,%0,$1
+ "lw\t%1, 8(%2)\n\t"
+ "addu\t%0, $1\n\t"
+ "addu\t%0, %1\n\t"
+ "sltu\t$1, %0, $1\n\t"
- lw %1,12(%2)
- addu %0,$1
- addu %0,%1
- sltu $1,%0,$1
+ "lw\t%1, 12(%2)\n\t"
+ "addu\t%0, $1\n\t"
+ "addu\t%0, %1\n\t"
+ "sltu\t$1, %0, $1\n\t"
- lw %1,0(%3)
- addu %0,$1
- addu %0,%1
- sltu $1,%0,$1
+ "lw\t%1, 0(%3)\n\t"
+ "addu\t%0, $1\n\t"
+ "addu\t%0, %1\n\t"
+ "sltu\t$1, %0, $1\n\t"
- lw %1,4(%3)
- addu %0,$1
- addu %0,%1
- sltu $1,%0,$1
+ "lw\t%1, 4(%3)\n\t"
+ "addu\t%0, $1\n\t"
+ "addu\t%0, %1\n\t"
+ "sltu\t$1, %0, $1\n\t"
- lw %1,8(%3)
- addu %0,$1
- addu %0,%1
- sltu $1,%0,$1
+ "lw\t%1, 8(%3)\n\t"
+ "addu\t%0, $1\n\t"
+ "addu\t%0, %1\n\t"
+ "sltu\t$1, %0, $1\n\t"
- lw %1,12(%3)
- addu %0,$1
- addu %0,%1
- sltu $1,%0,$1
- .set noat
- .set noreorder"
- : "=r" (sum),
- "=r" (proto)
- : "r" (saddr),
- "r" (daddr),
- "0" (htonl(len)),
- "1" (htonl(proto)),
- "r"(sum)
- : "$1");
+ "lw\t%1, 12(%3)\n\t"
+ "addu\t%0, $1\n\t"
+ "addu\t%0, %1\n\t"
+ "sltu\t$1, %0, $1\n\t"
+ ".set\tnoat\n\t"
+ ".set\tnoreorder"
+ : "=r" (sum), "=r" (proto)
+ : "r" (saddr), "r" (daddr),
+ "0" (htonl(len)), "1" (htonl(proto)), "r"(sum)
+ : "$1");
return csum_fold(sum);
}