diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
| commit | 545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch) | |
| tree | e9ce4bc598d06374bda906f18365984bf22a526a /arch/sparc64/lib/blockops.S | |
| parent | 4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff) | |
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'arch/sparc64/lib/blockops.S')
| -rw-r--r-- | arch/sparc64/lib/blockops.S | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/sparc64/lib/blockops.S b/arch/sparc64/lib/blockops.S index 59083aa02..7d5b240ad 100644 --- a/arch/sparc64/lib/blockops.S +++ b/arch/sparc64/lib/blockops.S @@ -1,4 +1,4 @@ -/* $Id: blockops.S,v 1.10 1997/06/24 17:29:10 jj Exp $ +/* $Id: blockops.S,v 1.11 1997/07/29 09:35:36 davem Exp $ * arch/sparc64/lib/blockops.S: UltraSparc block zero optimized routines. * * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) @@ -15,7 +15,7 @@ __bfill64: /* %o0 = buf, %o1= ptr to pattern */ wr %g0, FPRS_FEF, %fprs ! FPU Group ldd [%o1], %f48 ! Load Group wr %g0, ASI_BLK_P, %asi ! LSU Group - membar #StoreStore | #LoadStore ! LSU Group + membar #StoreLoad | #StoreStore | #LoadStore ! LSU Group mov 32, %g2 ! IEU0 Group /* Cannot perform real arithmatic on the pattern, that can @@ -36,7 +36,7 @@ __bfill64: /* %o0 = buf, %o1= ptr to pattern */ subcc %g2, 1, %g2 ! IEU1 Group bne,pt %icc, 1b ! CTI add %o0, 0x100, %o0 ! IEU0 - membar #Sync ! LSU Group + membar #StoreLoad | #StoreStore ! LSU Group jmpl %o7 + 0x8, %g0 ! CTI Group brk forced wr %g0, 0, %fprs ! FPU Group @@ -56,7 +56,7 @@ __bzero_1page: faddd %f0, %f2, %f12 ! FPA Group fmuld %f0, %f2, %f14 ! FPM wr %g0, ASI_BLK_P, %asi ! LSU Group - membar #StoreStore | #LoadStore ! LSU Group + membar #StoreLoad | #StoreStore | #LoadStore ! LSU Group 1: stda %f0, [%o0 + 0x00] %asi ! Store Group stda %f0, [%o0 + 0x40] %asi ! Store Group stda %f0, [%o0 + 0x80] %asi ! Store Group @@ -65,6 +65,6 @@ __bzero_1page: subcc %g1, 1, %g1 ! IEU1 bne,pt %icc, 1b ! CTI add %o0, 0x100, %o0 ! IEU0 Group - membar #Sync ! LSU Group + membar #StoreLoad | #StoreStore ! LSU Group jmpl %o7 + 0x8, %g0 ! CTI Group brk forced wr %g0, 0, %fprs ! FPU Group |