RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

Patch from Eric Norum and David Fiddes to put ColdFire support in

Browse Source 
the inet checksum routine.
This commit is contained in:
Joel Sherrill
1998-09-21 00:42:07 +00:00
parent 97d7b068cb
commit 7ddcfb8cd4
5 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
c/src/exec/libnetworking/netinet/in_cksum_m68k.c
View File

@@ -113,16 +113,15 @@ in_cksum(m, len)
* It should work for all 68k family members. * It should work for all 68k family members.
*/ */
{ {
unsigned long tcnt = mlen, t1, t2; unsigned long tcnt = mlen, t1;
__asm__ volatile ( __asm__ volatile (
"movel %2,%3\n\t" "movel %2,%3\n\t"
"lsrl #6,%2 | count/64 = # loop traversals\n\t" "lsrl #6,%2 | count/64 = # loop traversals\n\t"
"andl #0x3c,%3 | Then find fractions of a chunk\n\t" "andl #0x3c,%3 | Then find fractions of a chunk\n\t"
"negl %3\n\t | Each long uses 4 instruction bytes\n\t" "negl %3\n\t | Each long uses 4 instruction bytes\n\t"
#if IS_COLDFIRE #if IS_COLDFIRE
"move %%cc,%4 | Move the CC into a temp reg\n\t" "addql #1,%2 | Clear X (extended carry flag)\n\t"
"andil #0xf,%4 | Clear X (extended carry flag)\n\t" "subql #1,%2 | \n\t"
"move %4,%%cc | Move the modified value back to the cc\n\t"
#else #else
"andi #0xf,%%cc | Clear X (extended carry flag)\n\t" "andi #0xf,%%cc | Clear X (extended carry flag)\n\t"
#endif #endif
@@ -169,12 +168,13 @@ in_cksum(m, len)
"movel #0xffff,%2 | Get word mask\n\t" "movel #0xffff,%2 | Get word mask\n\t"
"movel %0,%3 | Fold 32 bit sum to 16 bits\n\t" "movel %0,%3 | Fold 32 bit sum to 16 bits\n\t"
"swap %3 |\n\t" "swap %3 |\n\t"
"andl %2,%0 |\n\t" "andl %2,%0 | Mask to 16-bit sum\n\t"
"andl %2,%3 |\n\t" "andl %2,%3 | Mask to 16-bit sum\n\t"
"addl %3,%0 |\n\t" "addl %3,%0 |\n\t"
"movel %0,%3 | Add in last carry\n\t" "movel %0,%3 | Add in last carry\n\t"
"swap %3 |\n\t" "swap %3 |\n\t"
"addl %3,%0 |\n\t" "addl %3,%0 |\n\t"
"andl %2,%0 | Mask to 16-bit sum\n\t"
#else #else
"dbf %2,lcsum1_lbl | (NB- dbf doesn't affect X)\n\t" "dbf %2,lcsum1_lbl | (NB- dbf doesn't affect X)\n\t"
"movel %0,%3 | Fold 32 bit sum to 16 bits\n\t" "movel %0,%3 | Fold 32 bit sum to 16 bits\n\t"
@@ -182,9 +182,10 @@ in_cksum(m, len)
"addxw %3,%0 |\n\t" "addxw %3,%0 |\n\t"
"moveq #0,%3 | Add in last carry\n\t" "moveq #0,%3 | Add in last carry\n\t"
"addxw %3,%0 |\n\t" "addxw %3,%0 |\n\t"
"andl #0xffff,%0 | Mask to 16-bit sum\n"
#endif #endif
"andl #0xffff,%0 | Mask to 16-bit sum\n" : :
"=d" (sum), "=a" (w), "=d" (tcnt) , "=d" (t1), "=d" (t2) : "=d" (sum), "=a" (w), "=d" (tcnt) , "=d" (t1) :
"0" (sum), "1" (w), "2" (tcnt) : "0" (sum), "1" (w), "2" (tcnt) :
"cc", "memory"); "cc", "memory");
} }

17
c/src/lib/libnetworking/netinet/in_cksum_m68k.c
View File

@@ -113,16 +113,15 @@ in_cksum(m, len)
* It should work for all 68k family members. * It should work for all 68k family members.
*/ */
{ {
unsigned long tcnt = mlen, t1, t2; unsigned long tcnt = mlen, t1;
__asm__ volatile ( __asm__ volatile (
"movel %2,%3\n\t" "movel %2,%3\n\t"
"lsrl #6,%2 | count/64 = # loop traversals\n\t" "lsrl #6,%2 | count/64 = # loop traversals\n\t"
"andl #0x3c,%3 | Then find fractions of a chunk\n\t" "andl #0x3c,%3 | Then find fractions of a chunk\n\t"
"negl %3\n\t | Each long uses 4 instruction bytes\n\t" "negl %3\n\t | Each long uses 4 instruction bytes\n\t"
#if IS_COLDFIRE #if IS_COLDFIRE
"move %%cc,%4 | Move the CC into a temp reg\n\t" "addql #1,%2 | Clear X (extended carry flag)\n\t"
"andil #0xf,%4 | Clear X (extended carry flag)\n\t" "subql #1,%2 | \n\t"
"move %4,%%cc | Move the modified value back to the cc\n\t"
#else #else
"andi #0xf,%%cc | Clear X (extended carry flag)\n\t" "andi #0xf,%%cc | Clear X (extended carry flag)\n\t"
#endif #endif
@@ -169,12 +168,13 @@ in_cksum(m, len)
"movel #0xffff,%2 | Get word mask\n\t" "movel #0xffff,%2 | Get word mask\n\t"
"movel %0,%3 | Fold 32 bit sum to 16 bits\n\t" "movel %0,%3 | Fold 32 bit sum to 16 bits\n\t"
"swap %3 |\n\t" "swap %3 |\n\t"
"andl %2,%0 |\n\t" "andl %2,%0 | Mask to 16-bit sum\n\t"
"andl %2,%3 |\n\t" "andl %2,%3 | Mask to 16-bit sum\n\t"
"addl %3,%0 |\n\t" "addl %3,%0 |\n\t"
"movel %0,%3 | Add in last carry\n\t" "movel %0,%3 | Add in last carry\n\t"
"swap %3 |\n\t" "swap %3 |\n\t"
"addl %3,%0 |\n\t" "addl %3,%0 |\n\t"
"andl %2,%0 | Mask to 16-bit sum\n\t"
#else #else
"dbf %2,lcsum1_lbl | (NB- dbf doesn't affect X)\n\t" "dbf %2,lcsum1_lbl | (NB- dbf doesn't affect X)\n\t"
"movel %0,%3 | Fold 32 bit sum to 16 bits\n\t" "movel %0,%3 | Fold 32 bit sum to 16 bits\n\t"
@@ -182,9 +182,10 @@ in_cksum(m, len)
"addxw %3,%0 |\n\t" "addxw %3,%0 |\n\t"
"moveq #0,%3 | Add in last carry\n\t" "moveq #0,%3 | Add in last carry\n\t"
"addxw %3,%0 |\n\t" "addxw %3,%0 |\n\t"
"andl #0xffff,%0 | Mask to 16-bit sum\n"
#endif #endif
"andl #0xffff,%0 | Mask to 16-bit sum\n" : :
"=d" (sum), "=a" (w), "=d" (tcnt) , "=d" (t1), "=d" (t2) : "=d" (sum), "=a" (w), "=d" (tcnt) , "=d" (t1) :
"0" (sum), "1" (w), "2" (tcnt) : "0" (sum), "1" (w), "2" (tcnt) :
"cc", "memory"); "cc", "memory");
} }

17
c/src/libnetworking/netinet/in_cksum_m68k.c
View File

@@ -113,16 +113,15 @@ in_cksum(m, len)
* It should work for all 68k family members. * It should work for all 68k family members.
*/ */
{ {
unsigned long tcnt = mlen, t1, t2; unsigned long tcnt = mlen, t1;
__asm__ volatile ( __asm__ volatile (
"movel %2,%3\n\t" "movel %2,%3\n\t"
"lsrl #6,%2 | count/64 = # loop traversals\n\t" "lsrl #6,%2 | count/64 = # loop traversals\n\t"
"andl #0x3c,%3 | Then find fractions of a chunk\n\t" "andl #0x3c,%3 | Then find fractions of a chunk\n\t"
"negl %3\n\t | Each long uses 4 instruction bytes\n\t" "negl %3\n\t | Each long uses 4 instruction bytes\n\t"
#if IS_COLDFIRE #if IS_COLDFIRE
"move %%cc,%4 | Move the CC into a temp reg\n\t" "addql #1,%2 | Clear X (extended carry flag)\n\t"
"andil #0xf,%4 | Clear X (extended carry flag)\n\t" "subql #1,%2 | \n\t"
"move %4,%%cc | Move the modified value back to the cc\n\t"
#else #else
"andi #0xf,%%cc | Clear X (extended carry flag)\n\t" "andi #0xf,%%cc | Clear X (extended carry flag)\n\t"
#endif #endif
@@ -169,12 +168,13 @@ in_cksum(m, len)
"movel #0xffff,%2 | Get word mask\n\t" "movel #0xffff,%2 | Get word mask\n\t"
"movel %0,%3 | Fold 32 bit sum to 16 bits\n\t" "movel %0,%3 | Fold 32 bit sum to 16 bits\n\t"
"swap %3 |\n\t" "swap %3 |\n\t"
"andl %2,%0 |\n\t" "andl %2,%0 | Mask to 16-bit sum\n\t"
"andl %2,%3 |\n\t" "andl %2,%3 | Mask to 16-bit sum\n\t"
"addl %3,%0 |\n\t" "addl %3,%0 |\n\t"
"movel %0,%3 | Add in last carry\n\t" "movel %0,%3 | Add in last carry\n\t"
"swap %3 |\n\t" "swap %3 |\n\t"
"addl %3,%0 |\n\t" "addl %3,%0 |\n\t"
"andl %2,%0 | Mask to 16-bit sum\n\t"
#else #else
"dbf %2,lcsum1_lbl | (NB- dbf doesn't affect X)\n\t" "dbf %2,lcsum1_lbl | (NB- dbf doesn't affect X)\n\t"
"movel %0,%3 | Fold 32 bit sum to 16 bits\n\t" "movel %0,%3 | Fold 32 bit sum to 16 bits\n\t"
@@ -182,9 +182,10 @@ in_cksum(m, len)
"addxw %3,%0 |\n\t" "addxw %3,%0 |\n\t"
"moveq #0,%3 | Add in last carry\n\t" "moveq #0,%3 | Add in last carry\n\t"
"addxw %3,%0 |\n\t" "addxw %3,%0 |\n\t"
"andl #0xffff,%0 | Mask to 16-bit sum\n"
#endif #endif
"andl #0xffff,%0 | Mask to 16-bit sum\n" : :
"=d" (sum), "=a" (w), "=d" (tcnt) , "=d" (t1), "=d" (t2) : "=d" (sum), "=a" (w), "=d" (tcnt) , "=d" (t1) :
"0" (sum), "1" (w), "2" (tcnt) : "0" (sum), "1" (w), "2" (tcnt) :
"cc", "memory"); "cc", "memory");
} }

17
cpukit/libnetworking/netinet/in_cksum_m68k.c
View File

@@ -113,16 +113,15 @@ in_cksum(m, len)
* It should work for all 68k family members. * It should work for all 68k family members.
*/ */
{ {
unsigned long tcnt = mlen, t1, t2; unsigned long tcnt = mlen, t1;
__asm__ volatile ( __asm__ volatile (
"movel %2,%3\n\t" "movel %2,%3\n\t"
"lsrl #6,%2 | count/64 = # loop traversals\n\t" "lsrl #6,%2 | count/64 = # loop traversals\n\t"
"andl #0x3c,%3 | Then find fractions of a chunk\n\t" "andl #0x3c,%3 | Then find fractions of a chunk\n\t"
"negl %3\n\t | Each long uses 4 instruction bytes\n\t" "negl %3\n\t | Each long uses 4 instruction bytes\n\t"
#if IS_COLDFIRE #if IS_COLDFIRE
"move %%cc,%4 | Move the CC into a temp reg\n\t" "addql #1,%2 | Clear X (extended carry flag)\n\t"
"andil #0xf,%4 | Clear X (extended carry flag)\n\t" "subql #1,%2 | \n\t"
"move %4,%%cc | Move the modified value back to the cc\n\t"
#else #else
"andi #0xf,%%cc | Clear X (extended carry flag)\n\t" "andi #0xf,%%cc | Clear X (extended carry flag)\n\t"
#endif #endif
@@ -169,12 +168,13 @@ in_cksum(m, len)
"movel #0xffff,%2 | Get word mask\n\t" "movel #0xffff,%2 | Get word mask\n\t"
"movel %0,%3 | Fold 32 bit sum to 16 bits\n\t" "movel %0,%3 | Fold 32 bit sum to 16 bits\n\t"
"swap %3 |\n\t" "swap %3 |\n\t"
"andl %2,%0 |\n\t" "andl %2,%0 | Mask to 16-bit sum\n\t"
"andl %2,%3 |\n\t" "andl %2,%3 | Mask to 16-bit sum\n\t"
"addl %3,%0 |\n\t" "addl %3,%0 |\n\t"
"movel %0,%3 | Add in last carry\n\t" "movel %0,%3 | Add in last carry\n\t"
"swap %3 |\n\t" "swap %3 |\n\t"
"addl %3,%0 |\n\t" "addl %3,%0 |\n\t"
"andl %2,%0 | Mask to 16-bit sum\n\t"
#else #else
"dbf %2,lcsum1_lbl | (NB- dbf doesn't affect X)\n\t" "dbf %2,lcsum1_lbl | (NB- dbf doesn't affect X)\n\t"
"movel %0,%3 | Fold 32 bit sum to 16 bits\n\t" "movel %0,%3 | Fold 32 bit sum to 16 bits\n\t"
@@ -182,9 +182,10 @@ in_cksum(m, len)
"addxw %3,%0 |\n\t" "addxw %3,%0 |\n\t"
"moveq #0,%3 | Add in last carry\n\t" "moveq #0,%3 | Add in last carry\n\t"
"addxw %3,%0 |\n\t" "addxw %3,%0 |\n\t"
"andl #0xffff,%0 | Mask to 16-bit sum\n"
#endif #endif
"andl #0xffff,%0 | Mask to 16-bit sum\n" : :
"=d" (sum), "=a" (w), "=d" (tcnt) , "=d" (t1), "=d" (t2) : "=d" (sum), "=a" (w), "=d" (tcnt) , "=d" (t1) :
"0" (sum), "1" (w), "2" (tcnt) : "0" (sum), "1" (w), "2" (tcnt) :
"cc", "memory"); "cc", "memory");
} }

17
cpukit/libnetworking/netinet/in_cksum_m68k.h
View File

@@ -113,16 +113,15 @@ in_cksum(m, len)
* It should work for all 68k family members. * It should work for all 68k family members.
*/ */
{ {
unsigned long tcnt = mlen, t1, t2; unsigned long tcnt = mlen, t1;
__asm__ volatile ( __asm__ volatile (
"movel %2,%3\n\t" "movel %2,%3\n\t"
"lsrl #6,%2 | count/64 = # loop traversals\n\t" "lsrl #6,%2 | count/64 = # loop traversals\n\t"
"andl #0x3c,%3 | Then find fractions of a chunk\n\t" "andl #0x3c,%3 | Then find fractions of a chunk\n\t"
"negl %3\n\t | Each long uses 4 instruction bytes\n\t" "negl %3\n\t | Each long uses 4 instruction bytes\n\t"
#if IS_COLDFIRE #if IS_COLDFIRE
"move %%cc,%4 | Move the CC into a temp reg\n\t" "addql #1,%2 | Clear X (extended carry flag)\n\t"
"andil #0xf,%4 | Clear X (extended carry flag)\n\t" "subql #1,%2 | \n\t"
"move %4,%%cc | Move the modified value back to the cc\n\t"
#else #else
"andi #0xf,%%cc | Clear X (extended carry flag)\n\t" "andi #0xf,%%cc | Clear X (extended carry flag)\n\t"
#endif #endif
@@ -169,12 +168,13 @@ in_cksum(m, len)
"movel #0xffff,%2 | Get word mask\n\t" "movel #0xffff,%2 | Get word mask\n\t"
"movel %0,%3 | Fold 32 bit sum to 16 bits\n\t" "movel %0,%3 | Fold 32 bit sum to 16 bits\n\t"
"swap %3 |\n\t" "swap %3 |\n\t"
"andl %2,%0 |\n\t" "andl %2,%0 | Mask to 16-bit sum\n\t"
"andl %2,%3 |\n\t" "andl %2,%3 | Mask to 16-bit sum\n\t"
"addl %3,%0 |\n\t" "addl %3,%0 |\n\t"
"movel %0,%3 | Add in last carry\n\t" "movel %0,%3 | Add in last carry\n\t"
"swap %3 |\n\t" "swap %3 |\n\t"
"addl %3,%0 |\n\t" "addl %3,%0 |\n\t"
"andl %2,%0 | Mask to 16-bit sum\n\t"
#else #else
"dbf %2,lcsum1_lbl | (NB- dbf doesn't affect X)\n\t" "dbf %2,lcsum1_lbl | (NB- dbf doesn't affect X)\n\t"
"movel %0,%3 | Fold 32 bit sum to 16 bits\n\t" "movel %0,%3 | Fold 32 bit sum to 16 bits\n\t"
@@ -182,9 +182,10 @@ in_cksum(m, len)
"addxw %3,%0 |\n\t" "addxw %3,%0 |\n\t"
"moveq #0,%3 | Add in last carry\n\t" "moveq #0,%3 | Add in last carry\n\t"
"addxw %3,%0 |\n\t" "addxw %3,%0 |\n\t"
"andl #0xffff,%0 | Mask to 16-bit sum\n"
#endif #endif
"andl #0xffff,%0 | Mask to 16-bit sum\n" : :
"=d" (sum), "=a" (w), "=d" (tcnt) , "=d" (t1), "=d" (t2) : "=d" (sum), "=a" (w), "=d" (tcnt) , "=d" (t1) :
"0" (sum), "1" (w), "2" (tcnt) : "0" (sum), "1" (w), "2" (tcnt) :
"cc", "memory"); "cc", "memory");
} }