summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJason Wright <jason@cvs.openbsd.org>2003-04-22 19:57:58 +0000
committerJason Wright <jason@cvs.openbsd.org>2003-04-22 19:57:58 +0000
commit1cebc94c8110d707ec02965e5ec36314195d7974 (patch)
tree00f913284b39cbae221e044ff7c2c4d9abfccaf1 /lib
parentd47ca624bc3bd2926240f4c30a74e0c2cf7c93cf (diff)
Indent delay slot insns
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/arch/sparc/gen/divrem.m444
-rw-r--r--lib/libc/arch/sparc/gen/fabs.S4
-rw-r--r--lib/libc/arch/sparc/gen/fixunsdfsi.S6
-rw-r--r--lib/libc/arch/sparc/gen/modf.S6
-rw-r--r--lib/libc/arch/sparc/gen/mul.S6
-rw-r--r--lib/libc/arch/sparc/gen/saveregs.S4
-rw-r--r--lib/libc/arch/sparc/gen/sigsetjmp.S10
-rw-r--r--lib/libc/arch/sparc/gen/umul.S6
8 files changed, 43 insertions, 43 deletions
diff --git a/lib/libc/arch/sparc/gen/divrem.m4 b/lib/libc/arch/sparc/gen/divrem.m4
index 7bdab66b0f0..74ccc096626 100644
--- a/lib/libc/arch/sparc/gen/divrem.m4
+++ b/lib/libc/arch/sparc/gen/divrem.m4
@@ -1,4 +1,4 @@
-/* $OpenBSD: divrem.m4,v 1.3 2002/11/23 19:04:39 drahn Exp $ */
+/* $OpenBSD: divrem.m4,v 1.4 2003/04/22 19:57:57 jason Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -117,14 +117,14 @@ define(DEVELOP_QUOTIENT_BITS,
subcc R,V,R
ifelse($1, N,
` b 9f
- add Q, ($2*2+1), Q
+ add Q, ($2*2+1), Q
', ` DEVELOP_QUOTIENT_BITS(incr($1), `eval(2*$2+1)')')
L.$1.eval(TWOSUPN+$2):
! remainder is negative
addcc R,V,R
ifelse($1, N,
` b 9f
- add Q, ($2*2-1), Q
+ add Q, ($2*2-1), Q
', ` DEVELOP_QUOTIENT_BITS(incr($1), `eval(2*$2-1)')')
ifelse($1, 1, `9:')')
@@ -163,7 +163,7 @@ ifelse(S, `true',
! wrong as possible, but that is what SunOS does...).
t ST_DIV0
retl
- clr %o0
+ clr %o0
1:
cmp R, V ! if divisor exceeds dividend, done
@@ -172,7 +172,7 @@ ifelse(S, `true',
sethi %hi(1 << (WORDSIZE - TOPBITS - 1)), T
cmp R, T
blu Lnot_really_big
- clr ITER
+ clr ITER
! `Here the dividend is >= 2^(31-N) or so. We must be careful here,
! as our usual N-at-a-shot divide step will cause overflow and havoc.
@@ -182,15 +182,15 @@ ifelse(S, `true',
1:
cmp V, T
bgeu 3f
- mov 1, SC
+ mov 1, SC
sll V, N, V
b 1b
- inc ITER
+ inc ITER
! Now compute SC.
2: addcc V, V, V
bcc Lnot_too_big
- inc SC
+ inc SC
! We get here if the divisor overflowed while shifting.
! This means that R has the high-order bit set.
@@ -199,14 +199,14 @@ ifelse(S, `true',
srl V, 1, V ! rest of V
add V, T, V
b Ldo_single_div
- dec SC
+ dec SC
Lnot_too_big:
3: cmp V, R
blu 2b
- nop
+ nop
be Ldo_single_div
- nop
+ nop
/* NB: these are commented out in the V8-Sparc manual as well */
/* (I do not understand this) */
! V > R: went too far: back up 1 step
@@ -223,19 +223,19 @@ ifelse(S, `true',
Ldo_single_div:
deccc SC
bl Lend_regular_divide
- nop
+ nop
sub R, V, R
mov 1, Q
b Lend_single_divloop
- nop
+ nop
Lsingle_divloop:
sll Q, 1, Q
bl 1f
- srl V, 1, V
+ srl V, 1, V
! R >= 0
sub R, V, R
b 2f
- inc Q
+ inc Q
1: ! R < 0
add R, V, R
dec Q
@@ -251,9 +251,9 @@ Lnot_really_big:
sll V, N, V
cmp V, R
bleu 1b
- inccc ITER
+ inccc ITER
be Lgot_result
- dec ITER
+ dec ITER
tst R ! set up for initial iteration
Ldivloop:
@@ -262,12 +262,12 @@ Ldivloop:
Lend_regular_divide:
deccc ITER
bge Ldivloop
- tst R
+ tst R
bl,a Lgot_result
! non-restoring fixup here (one instruction only!)
ifelse(OP, `div',
-` dec Q
-', ` add R, divisor, R
+` dec Q
+', ` add R, divisor, R
')
Lgot_result:
@@ -275,7 +275,7 @@ ifelse(S, `true',
` ! check to see if answer should be < 0
tst SIGN
bl,a 1f
- ifelse(OP, `div', `neg Q', `neg R')
+ ifelse(OP, `div', `neg Q', `neg R')
1:')
retl
- ifelse(OP, `div', `mov Q, %o0', `mov R, %o0')
+ ifelse(OP, `div', `mov Q, %o0', `mov R, %o0')
diff --git a/lib/libc/arch/sparc/gen/fabs.S b/lib/libc/arch/sparc/gen/fabs.S
index eec0611a971..a3571d01783 100644
--- a/lib/libc/arch/sparc/gen/fabs.S
+++ b/lib/libc/arch/sparc/gen/fabs.S
@@ -37,7 +37,7 @@
#if defined(LIBC_SCCS)
.text
- .asciz "$OpenBSD: fabs.S,v 1.2 1996/08/19 08:17:26 tholo Exp $"
+ .asciz "$OpenBSD: fabs.S,v 1.3 2003/04/22 19:57:57 jason Exp $"
#endif /* LIBC_SCCS */
/* fabs - floating absolute value */
@@ -48,4 +48,4 @@ ENTRY(fabs)
std %o0, [%sp + 32] ! return value => %f0:f1
ldd [%sp + 32], %f0 ! (via kernel %o0/%o1 slot)
retl
- fabss %f0, %f0 ! return absolute value
+ fabss %f0, %f0 ! return absolute value
diff --git a/lib/libc/arch/sparc/gen/fixunsdfsi.S b/lib/libc/arch/sparc/gen/fixunsdfsi.S
index a8b7b0574cf..053cb5a5f45 100644
--- a/lib/libc/arch/sparc/gen/fixunsdfsi.S
+++ b/lib/libc/arch/sparc/gen/fixunsdfsi.S
@@ -37,7 +37,7 @@
#if defined(LIBC_SCCS)
.text
- .asciz "$OpenBSD: fixunsdfsi.S,v 1.3 1997/07/23 20:55:29 kstailey Exp $"
+ .asciz "$OpenBSD: fixunsdfsi.S,v 1.4 2003/04/22 19:57:57 jason Exp $"
#endif /* LIBC_SCCS */
/*
@@ -81,10 +81,10 @@ ENTRY(__fixunsdfsi)
sethi %hi(0x80000000), %o1
add %o0, %o1, %o0 ! add 2^31
retl
- add %sp, 8, %sp
+ add %sp, 8, %sp
1:
st %f0, [%sp + 64] ! return result
ld [%sp + 64], %o0
retl
- add %sp, 8, %sp
+ add %sp, 8, %sp
diff --git a/lib/libc/arch/sparc/gen/modf.S b/lib/libc/arch/sparc/gen/modf.S
index 11cc7c537d6..37718a3ead7 100644
--- a/lib/libc/arch/sparc/gen/modf.S
+++ b/lib/libc/arch/sparc/gen/modf.S
@@ -37,7 +37,7 @@
#if defined(LIBC_SCCS)
.text
- .asciz "$OpenBSD: modf.S,v 1.2 1996/08/19 08:17:41 tholo Exp $"
+ .asciz "$OpenBSD: modf.S,v 1.3 2003/04/22 19:57:57 jason Exp $"
#endif /* LIBC_SCCS */
#include "DEFS.h"
@@ -172,7 +172,7 @@ ENTRY(modf)
ldd [%fp - 16], %f0 ! %f0:f1 = val;
fsubd %f0, %f4, %f0 ! %f0:f1 -= %f4:f5;
ret
- restore
+ restore
Lbig:
/*
@@ -191,4 +191,4 @@ Lbig:
ldd [%l0 + %lo(L0)], %f0 ! return 0.0;
#endif
ret
- restore
+ restore
diff --git a/lib/libc/arch/sparc/gen/mul.S b/lib/libc/arch/sparc/gen/mul.S
index 8873e83cfec..fbeecbc5bd5 100644
--- a/lib/libc/arch/sparc/gen/mul.S
+++ b/lib/libc/arch/sparc/gen/mul.S
@@ -37,7 +37,7 @@
#if defined(LIBC_SCCS)
.text
- .asciz "$OpenBSD: mul.S,v 1.3 2002/11/23 19:04:39 drahn Exp $"
+ .asciz "$OpenBSD: mul.S,v 1.4 2003/04/22 19:57:57 jason Exp $"
#endif /* LIBC_SCCS */
/*
@@ -110,7 +110,7 @@ FUNC(.mul)
! %o0 was indeed negative; fix upper 32 bits of result by subtracting
! %o1 (i.e., return %o4 - %o1 in %o1).
retl
- sub %o4, %o1, %o1
+ sub %o4, %o1, %o1
1:
retl
@@ -155,4 +155,4 @@ Lmul_shortway:
srl %o5, 20, %o5 ! shift low bits right 20, zero fill at left
or %o5, %o0, %o0 ! construct low part of result
retl
- sra %o4, 20, %o1 ! ... and extract high part of result
+ sra %o4, 20, %o1 ! ... and extract high part of result
diff --git a/lib/libc/arch/sparc/gen/saveregs.S b/lib/libc/arch/sparc/gen/saveregs.S
index 8c65d3c70be..0740fd53724 100644
--- a/lib/libc/arch/sparc/gen/saveregs.S
+++ b/lib/libc/arch/sparc/gen/saveregs.S
@@ -37,7 +37,7 @@
#if defined(LIBC_SCCS)
.text
- .asciz "$OpenBSD: saveregs.S,v 1.2 1996/08/19 08:17:43 tholo Exp $"
+ .asciz "$OpenBSD: saveregs.S,v 1.3 2003/04/22 19:57:57 jason Exp $"
#endif /* LIBC_SCCS */
/*
@@ -59,4 +59,4 @@ ENTRY(__builtin_saveregs)
st %i3, [%fp + 0x50] ! fr->fr_argd[3]
st %i4, [%fp + 0x54] ! fr->fr_argd[4]
retl
- st %i5, [%fp + 0x58] ! fr->fr_argd[5]
+ st %i5, [%fp + 0x58] ! fr->fr_argd[5]
diff --git a/lib/libc/arch/sparc/gen/sigsetjmp.S b/lib/libc/arch/sparc/gen/sigsetjmp.S
index 42f896c7ec2..2334e77bc99 100644
--- a/lib/libc/arch/sparc/gen/sigsetjmp.S
+++ b/lib/libc/arch/sparc/gen/sigsetjmp.S
@@ -31,7 +31,7 @@
#if defined(LIBC_SCCS)
.text
- .asciz "$OpenBSD: sigsetjmp.S,v 1.3 2002/08/05 15:29:28 art Exp $"
+ .asciz "$OpenBSD: sigsetjmp.S,v 1.4 2003/04/22 19:57:57 jason Exp $"
#endif /* LIBC_SCCS */
#include "SYS.h"
@@ -47,7 +47,7 @@ ENTRY(sigsetjmp)
ld [%g1+_C_LABEL(_setjmp)], %g1 ! else goto _setjmp;
1:
jmp %g1
- nop
+ nop
ENTRY(siglongjmp)
PIC_PROLOGUE(%g1,%g2) ! %g1 = _GLOBAL_OFFSET_TABLE
@@ -58,7 +58,7 @@ ENTRY(siglongjmp)
ld [%g1+_C_LABEL(_longjmp)], %g1 ! else goto _longjmp;
1:
jmp %g1
- nop
+ nop
unimp 0
#else /* PIC */
@@ -66,7 +66,7 @@ ENTRY(siglongjmp)
ENTRY(sigsetjmp)
cmp %o1,0
be _C_LABEL(_setjmp)
- st %o1,[%o0+40] ! jmpbuf[JBLEN]
+ st %o1,[%o0+40] ! jmpbuf[JBLEN]
nop
ba,a _C_LABEL(setjmp)
unimp 0
@@ -75,7 +75,7 @@ ENTRY(siglongjmp)
ld [%o0+40],%g1
cmp %g1,0
be _C_LABEL(_longjmp)
- nop
+ nop
ba,a _C_LABEL(_longjmp)
unimp 0
diff --git a/lib/libc/arch/sparc/gen/umul.S b/lib/libc/arch/sparc/gen/umul.S
index fa848993325..f8310527d5c 100644
--- a/lib/libc/arch/sparc/gen/umul.S
+++ b/lib/libc/arch/sparc/gen/umul.S
@@ -37,7 +37,7 @@
#if defined(LIBC_SCCS)
.text
- .asciz "$OpenBSD: umul.S,v 1.3 2002/11/23 19:04:39 drahn Exp $"
+ .asciz "$OpenBSD: umul.S,v 1.4 2003/04/22 19:57:57 jason Exp $"
#endif /* LIBC_SCCS */
/*
@@ -146,7 +146,7 @@ FUNC(.umul)
add %o4, %o0, %o4 ! %o4 += %o0 (add y to upper half)
1: rd %y, %o0 ! get lower half of product
retl
- addcc %o4, %g0, %o1 ! put upper half in place and set Z for %o1==0
+ addcc %o4, %g0, %o1 ! put upper half in place and set Z for %o1==0
Lmul_shortway:
/*
@@ -188,4 +188,4 @@ Lmul_shortway:
srl %o5, 20, %o5 ! shift low bits right 20
or %o5, %o0, %o0
retl
- addcc %g0, %g0, %o1 ! %o1 = zero, and set Z
+ addcc %g0, %g0, %o1 ! %o1 = zero, and set Z