hurd/pfinet/linux-src/include asm-i386/checksum...

[Marcus Brinkmann]

CVSROOT:        /cvsroot/hurd
Module name:    hurd
Changes by:     Marcus Brinkmann <address@hidden>       03/05/07 09:41:44

Modified files:
        pfinet/linux-src/include/asm-i386: checksum.h 
        pfinet/linux-src/include/net: sock.h 

Log message:
        2003-05-07  Ognyan Kulev  <address@hidden>
        
        * 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.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd/pfinet/linux-src/include/asm-i386/checksum.h.diff?tr1=1.1.1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd/pfinet/linux-src/include/net/sock.h.diff?tr1=1.1.1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: hurd/pfinet/linux-src/include/asm-i386/checksum.h
diff -u hurd/pfinet/linux-src/include/asm-i386/checksum.h:1.1 
hurd/pfinet/linux-src/include/asm-i386/checksum.h:1.2
--- hurd/pfinet/linux-src/include/asm-i386/checksum.h:1.1       Thu Feb  3 
22:21:18 2000
+++ hurd/pfinet/linux-src/include/asm-i386/checksum.h   Wed May  7 09:41:44 2003
@@ -87,25 +87,24 @@
                                          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 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 @@
                                                   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 @@
                                                     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));
Index: hurd/pfinet/linux-src/include/net/sock.h
diff -u hurd/pfinet/linux-src/include/net/sock.h:1.1 
hurd/pfinet/linux-src/include/net/sock.h:1.2
--- hurd/pfinet/linux-src/include/net/sock.h:1.1        Thu Feb  3 22:21:18 2000
+++ hurd/pfinet/linux-src/include/net/sock.h    Wed May  7 09:41:44 2003
@@ -349,7 +349,7 @@
 /* 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