diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /arch/sparc64/lib/VISmemset.S | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'arch/sparc64/lib/VISmemset.S')
| -rw-r--r-- | arch/sparc64/lib/VISmemset.S | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/arch/sparc64/lib/VISmemset.S b/arch/sparc64/lib/VISmemset.S index 4c24931ba..9be111134 100644 --- a/arch/sparc64/lib/VISmemset.S +++ b/arch/sparc64/lib/VISmemset.S @@ -1,4 +1,4 @@ -/* $Id: VISmemset.S,v 1.7 1997/08/22 15:54:56 jj Exp $ +/* $Id: VISmemset.S,v 1.8 1998/06/12 14:53:59 jj Exp $ * VISmemset.S: High speed memset operations utilizing the UltraSparc * Visual Instruction Set. * @@ -32,6 +32,9 @@ #endif #ifdef __KERNEL__ + +#include <asm/visasm.h> + #define RETL clr %o0 #else #define RETL mov %g3, %o0 @@ -135,8 +138,9 @@ memset: #endif add %o0, 32, %o0 7: be,pn %xcc, 9f + nop #ifdef __KERNEL__ - wr %g0, FPRS_FEF, %fprs + VISEntryHalf #endif ldd [%o0 - 8], %f0 18: wr %g0, ASI_BLK_P, %asi @@ -170,7 +174,7 @@ memset: add %o0, 256, %o0 12: #ifdef __KERNEL__ - wr %g0, 0, %fprs + VISExitHalf #else #ifndef REGS_64BIT wr %g0, FPRS_FEF, %fprs @@ -231,10 +235,9 @@ memset: #endif andncc %o2, 0x3f, %o3 be,pn %xcc, 9b -#ifdef __KERNEL__ - wr %g0, FPRS_FEF, %fprs -#else nop +#ifdef __KERNEL__ + VISEntryHalf #endif ba,pt %xcc, 18b ldd [%o0], %f0 |