Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bogus asm statements; tmp1 and tmp2 need to be outputs rather than inputs.

This commit is contained in:
mycroft 1998-11-29 10:37:08 +00:00
parent 11f3c29221
commit 34a1fe3ee3
1 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
sys/arch/sparc/sparc/in_cksum.c
View File

@ -1,9 +1,9 @@
/* $NetBSD: in_cksum.c,v 1.8 1998/08/15 03:02:43 mycroft Exp $ */ /* $NetBSD: in_cksum.c,v 1.9 1998/11/29 10:37:08 mycroft Exp $ */
/* /*
* Copyright (c) 1995 Zubin Dittia. * Copyright (c) 1995 Zubin Dittia.
* Copyright (c) 1995 Matthew R. Green. * Copyright (c) 1995 Matthew R. Green.
* Copyright (c) 1994 Charles M. Hannum. * Copyright (c) 1994, 1998 Charles M. Hannum.
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.
* *
@ -79,52 +79,53 @@
*/ */
#define Asm __asm __volatile #define Asm __asm __volatile
#define ADD64 Asm(" ld [%2],%3; ld [%2+4],%4; \ #define ADD64 Asm(" ld [%4+ 0],%1; ld [%4+ 4],%2; \
addcc %0,%3,%0; addxcc %0,%4,%0; \ addcc %0,%1,%0; addxcc %0,%2,%0; \
ld [%2+8],%3; ld [%2+12],%4; \ ld [%4+ 8],%1; ld [%4+12],%2; \
addxcc %0,%3,%0; addxcc %0,%4,%0; \ addxcc %0,%1,%0; addxcc %0,%2,%0; \
ld [%2+16],%3; ld [%2+20],%4; \ ld [%4+16],%1; ld [%4+20],%2; \
addxcc %0,%3,%0; addxcc %0,%4,%0; \ addxcc %0,%1,%0; addxcc %0,%2,%0; \
ld [%2+24],%3; ld [%2+28],%4; \ ld [%4+24],%1; ld [%4+28],%2; \
addxcc %0,%3,%0; addxcc %0,%4,%0; \ addxcc %0,%1,%0; addxcc %0,%2,%0; \
ld [%2+32],%3; ld [%2+36],%4; \ ld [%4+32],%1; ld [%4+36],%2; \
addxcc %0,%3,%0; addxcc %0,%4,%0; \ addxcc %0,%1,%0; addxcc %0,%2,%0; \
ld [%2+40],%3; ld [%2+44],%4; \ ld [%4+40],%1; ld [%4+44],%2; \
addxcc %0,%3,%0; addxcc %0,%4,%0; \ addxcc %0,%1,%0; addxcc %0,%2,%0; \
ld [%2+48],%3; ld [%2+52],%4; \ ld [%4+48],%1; ld [%4+52],%2; \
addxcc %0,%3,%0; addxcc %0,%4,%0; \ addxcc %0,%1,%0; addxcc %0,%2,%0; \
ld [%2+56],%3; ld [%2+60],%4; \ ld [%4+56],%1; ld [%4+60],%2; \
addxcc %0,%3,%0; addxcc %0,%4,%0; \ addxcc %0,%1,%0; addxcc %0,%2,%0; \
addxcc %0,0,%0" \ addxcc %0,0,%0" \
: "=r" (sum) \ : "=r" (sum), "=&r" (tmp1), "=&r" (tmp2)\
: "0" (sum), "r" (w), "r" (tmp1), "r" (tmp2)) : "0" (sum), "r" (w))
#define ADD32 Asm(" ld [%2],%3; ld [%2+4],%4; \ #define ADD32 Asm(" ld [%4+ 0],%1; ld [%4+ 4],%2; \
addcc %0,%3,%0; addxcc %0,%4,%0; \ addcc %0,%1,%0; addxcc %0,%2,%0; \
ld [%2+8],%3; ld [%2+12],%4; \ ld [%4+ 8],%1; ld [%4+12],%2; \
addxcc %0,%3,%0; addxcc %0,%4,%0; \ addxcc %0,%1,%0; addxcc %0,%2,%0; \
ld [%2+16],%3; ld [%2+20],%4; \ ld [%4+16],%1; ld [%4+20],%2; \
addxcc %0,%3,%0; addxcc %0,%4,%0; \ addxcc %0,%1,%0; addxcc %0,%2,%0; \
ld [%2+24],%3; ld [%2+28],%4; \ ld [%4+24],%1; ld [%4+28],%2; \
addxcc %0,%3,%0; addxcc %0,%4,%0; \ addxcc %0,%1,%0; addxcc %0,%2,%0; \
addxcc %0,0,%0" \ addxcc %0,0,%0" \
: "=r" (sum) \ : "=r" (sum), "=&r" (tmp1), "=&r" (tmp2)\
: "0" (sum), "r" (w), "r" (tmp1), "r" (tmp2)) : "0" (sum), "r" (w))
#define ADD16 Asm(" ld [%2],%3; ld [%2+4],%4; \ #define ADD16 Asm(" ld [%4+ 0],%1; ld [%4+ 4],%2; \
addcc %0,%3,%0; addxcc %0,%4,%0; \ addcc %0,%1,%0; addxcc %0,%2,%0; \
ld [%2+8],%3; ld [%2+12],%4; \ ld [%4+ 8],%1; ld [%4+12],%2; \
addxcc %0,%3,%0; addxcc %0,%4,%0; \ addxcc %0,%1,%0; addxcc %0,%2,%0; \
addxcc %0,0,%0" \ addxcc %0,0,%0" \
: "=r" (sum) \ : "=r" (sum), "=&r" (tmp1), "=&r" (tmp2)\
: "0" (sum), "r" (w), "r" (tmp1), "r" (tmp2)) : "0" (sum), "r" (w))
#define ADD8 Asm(" ld [%2],%3; ld [%2+4],%4; \ #define ADD8 Asm(" ld [%4+ 0],%1; ld [%4+ 4],%2; \
addcc %0,%3,%0; addxcc %0,%4,%0; \ addcc %0,%1,%0; addxcc %0,%2,%0; \
addxcc %0,0,%0" \ addxcc %0,0,%0" \
: "=r" (sum) \ : "=r" (sum), "=&r" (tmp1), "=&r" (tmp2)\
: "0" (sum), "r" (w), "r" (tmp1), "r" (tmp2)) : "0" (sum), "r" (w))
#define ADD4 Asm(" ld [%2],%3; addcc %0,%3,%0; \ #define ADD4 Asm(" ld [%3+ 0],%1; \
addcc %0,%1,%0; \
addxcc %0,0,%0" \ addxcc %0,0,%0" \
: "=r" (sum) \ : "=r" (sum), "=&r" (tmp1) \
: "0" (sum), "r" (w), "r" (tmp1)) : "0" (sum), "r" (w))
#define REDUCE {sum = (sum & 0xffff) + (sum >> 16);} #define REDUCE {sum = (sum & 0xffff) + (sum >> 16);}
#define ADDCARRY {if (sum > 0xffff) sum -= 0xffff;} #define ADDCARRY {if (sum > 0xffff) sum -= 0xffff;}
@ -148,8 +149,7 @@ in_cksum(m, len)
* allow the compiler to pick which specific machine registers to * allow the compiler to pick which specific machine registers to
* use, instead of hard-coding this in the asm code above. * use, instead of hard-coding this in the asm code above.
*/ */
/* XXX - initialized because of gcc's `-Wuninitialized' ! */ register u_int tmp1, tmp2;
register u_int tmp1 = 0, tmp2 = 0;
for (; m && len; m = m->m_next) { for (; m && len; m = m->m_next) {
if (m->m_len == 0) if (m->m_len == 0)