Log message:
- ip_fast_csum() needs a "memory" constraint with new gcc versions
- Do not always use d0 in ip_fast_csum(), leave register allocation to
gcc
- Fixed constraints of csum_fold()
- Fixed constraints of csum_tcpudp_nofold()
- Moved comment for csum_tcpudp_magic() to the right place
Modified files:
linux/include/asm-m68k:
checksum.h
Index: linux/include/asm-m68k/checksum.h
Stats: 6 insertions, 6 deletions, 29 modifications
http://linux-m68k-cvs.ubb.ca/c/cvsweb/linux/include/asm%2dm68k/checksum%2eh.diff?r1=1.7&r2=1.8
========================================================================
--- checksum.h 2 Mar 2005 23:47:59 -0000 1.7
+++ checksum.h 9 Mar 2005 21:02:17 -0000 1.8
@@ -43,20 +43,21 @@
ip_fast_csum(unsigned char *iph, unsigned int ihl)
{
unsigned int sum = 0;
+ unsigned long tmp;
__asm__ ("subqw #1,%2\n"
"1:\t"
- "movel [EMAIL PROTECTED],%/d0\n\t"
- "addxl %/d0,%0\n\t"
+ "movel [EMAIL PROTECTED],%3\n\t"
+ "addxl %3,%0\n\t"
"dbra %2,1b\n\t"
- "movel %0,%/d0\n\t"
- "swap %/d0\n\t"
- "addxw %/d0,%0\n\t"
- "clrw %/d0\n\t"
- "addxw %/d0,%0\n\t"
- : "=d" (sum), "=a" (iph), "=d" (ihl)
+ "movel %0,%3\n\t"
+ "swap %3\n\t"
+ "addxw %3,%0\n\t"
+ "clrw %3\n\t"
+ "addxw %3,%0\n\t"
+ : "=d" (sum), "=&a" (iph), "=&d" (ihl), "=&d" (tmp)
: "0" (sum), "1" (iph), "2" (ihl)
- : "d0");
+ : "memory");
return ~sum;
}
@@ -72,31 +73,31 @@
"clrw %1\n\t"
"addxw %1, %0"
: "=&d" (sum), "=&d" (tmp)
- : "0" (sum), "1" (sum));
+ : "0" (sum), "1" (tmp));
return ~sum;
}
-/*
- * computes the checksum of the TCP/UDP pseudo-header
- * returns a 16-bit checksum, already complemented
- */
-
static inline unsigned int
csum_tcpudp_nofold(unsigned long saddr, unsigned long daddr, unsigned short
len,
unsigned short proto, unsigned int sum)
{
- __asm__ ("addl %1,%0\n\t"
+ __asm__ ("addl %2,%0\n\t"
+ "addxl %3,%0\n\t"
"addxl %4,%0\n\t"
- "addxl %5,%0\n\t"
"clrl %1\n\t"
"addxl %1,%0"
- : "=&d" (sum), "=&d" (saddr)
- : "0" (daddr), "1" (saddr), "d" (len + proto),
- "d"(sum));
+ : "=&d" (sum), "=d" (saddr)
+ : "g" (daddr), "1" (saddr), "d" (len + proto),
+ "0" (sum));
return sum;
}
+
+/*
+ * computes the checksum of the TCP/UDP pseudo-header
+ * returns a 16-bit checksum, already complemented
+ */
static inline unsigned short int
csum_tcpudp_magic(unsigned long saddr, unsigned long daddr, unsigned short len,
unsigned short proto, unsigned int sum)
-
To unsubscribe from this list: send the line "unsubscribe linux-m68k-cvscommit"
in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
