From 72fdca37cc5846a4dd389418c53cc96a69518112 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Wed, 7 May 2003 13:41:44 +0000 Subject: 2003-05-07 Ognyan Kulev * linux-src/include/asm-i386/checksum.h (ip_fast_csum): Use string literals concatenation instead of multi-line string literal. (csum_fold): Likewise. (csum_tcpudp_nofold): Likewise. (csum_ipv6_magic): Likewise. * linux-src/include/net/sock.h (SOCK_DEBUG): Don't use ## to concatenate string literals. --- pfinet/linux-src/include/asm-i386/checksum.h | 78 +++++++++++++--------------- pfinet/linux-src/include/net/sock.h | 2 +- 2 files changed, 37 insertions(+), 43 deletions(-) diff --git a/pfinet/linux-src/include/asm-i386/checksum.h b/pfinet/linux-src/include/asm-i386/checksum.h index addaea87..ed023174 100644 --- a/pfinet/linux-src/include/asm-i386/checksum.h +++ b/pfinet/linux-src/include/asm-i386/checksum.h @@ -87,25 +87,24 @@ static inline unsigned short ip_fast_csum(unsigned char * iph, unsigned int ihl) { unsigned int sum; - __asm__ __volatile__(" - movl (%1), %0 - subl $4, %2 - jbe 2f - addl 4(%1), %0 - adcl 8(%1), %0 - adcl 12(%1), %0 -1: adcl 16(%1), %0 - lea 4(%1), %1 - decl %2 - jne 1b - adcl $0, %0 - movl %0, %2 - shrl $16, %0 - addw %w2, %w0 - adcl $0, %0 - notl %0 -2: - " + __asm__ __volatile__( +" movl (%1), %0\n" +" subl $4, %2\n" +" jbe 2f\n" +" addl 4(%1), %0\n" +" adcl 8(%1), %0\n" +" adcl 12(%1), %0\n" +"1: adcl 16(%1), %0\n" +" lea 4(%1), %1\n" +" decl %2\n" +" jne 1b\n" +" adcl $0, %0\n" +" movl %0, %2\n" +" shrl $16, %0\n" +" addw %w2, %w0\n" +" adcl $0, %0\n" +" notl %0\n" +"2:" /* Since the input registers which are loaded with iph and ipl are modified, we must also specify them as outputs, or gcc will assume they contain their original values. */ @@ -120,10 +119,8 @@ static inline unsigned short ip_fast_csum(unsigned char * iph, static inline unsigned int csum_fold(unsigned int sum) { - __asm__(" - addl %1, %0 - adcl $0xffff, %0 - " + __asm__("addl %1, %0\n" + "adcl $0xffff, %0\n" : "=r" (sum) : "r" (sum << 16), "0" (sum & 0xffff0000) ); @@ -136,12 +133,11 @@ static inline unsigned long csum_tcpudp_nofold(unsigned long saddr, unsigned short proto, unsigned int sum) { - __asm__(" - addl %1, %0 - adcl %2, %0 - adcl %3, %0 - adcl $0, %0 - " + __asm__( + "addl %1, %0\n" + "adcl %2, %0\n" + "adcl %3, %0\n" + "adcl $0, %0\n" : "=r" (sum) : "g" (daddr), "g"(saddr), "g"((ntohs(len)<<16)+proto*256), "0"(sum)); return sum; @@ -176,19 +172,17 @@ static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr, unsigned short proto, unsigned int sum) { - __asm__(" - addl 0(%1), %0 - adcl 4(%1), %0 - adcl 8(%1), %0 - adcl 12(%1), %0 - adcl 0(%2), %0 - adcl 4(%2), %0 - adcl 8(%2), %0 - adcl 12(%2), %0 - adcl %3, %0 - adcl %4, %0 - adcl $0, %0 - " + __asm__("addl 0(%1), %0\n" + "adcl 4(%1), %0\n" + "adcl 8(%1), %0\n" + "adcl 12(%1), %0\n" + "adcl 0(%2), %0\n" + "adcl 4(%2), %0\n" + "adcl 8(%2), %0\n" + "adcl 12(%2), %0\n" + "adcl %3, %0\n" + "adcl %4, %0\n" + "adcl $0, %0\n" : "=&r" (sum) : "r" (saddr), "r" (daddr), "r"(htonl((__u32) (len))), "r"(htonl(proto)), "0"(sum)); diff --git a/pfinet/linux-src/include/net/sock.h b/pfinet/linux-src/include/net/sock.h index 28cf919e..7789ec40 100644 --- a/pfinet/linux-src/include/net/sock.h +++ b/pfinet/linux-src/include/net/sock.h @@ -349,7 +349,7 @@ struct tcp_opt { /* Define this to get the sk->debug debugging facility. */ #define SOCK_DEBUGGING #ifdef SOCK_DEBUGGING -#define SOCK_DEBUG(sk, msg...) do { if((sk) && ((sk)->debug)) printk(KERN_DEBUG ## msg); } while (0) +#define SOCK_DEBUG(sk, msg...) do { if((sk) && ((sk)->debug)) printk(KERN_DEBUG msg); } while (0) #else #define SOCK_DEBUG(sk, msg...) do { } while (0) #endif -- cgit v1.2.3