summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/libc/arch/alpha/gen/Makefile.inc3
-rw-r--r--lib/libc/arch/alpha/gen/_setjmp.S21
-rw-r--r--lib/libc/arch/alpha/gen/divrem.m415
-rw-r--r--lib/libc/arch/alpha/gen/fabs.S7
-rw-r--r--lib/libc/arch/alpha/gen/flt_rounds.c5
-rw-r--r--lib/libc/arch/alpha/gen/fpgetmask.c5
-rw-r--r--lib/libc/arch/alpha/gen/fpgetround.c5
-rw-r--r--lib/libc/arch/alpha/gen/fpgetsticky.c5
-rw-r--r--lib/libc/arch/alpha/gen/fpsetmask.c5
-rw-r--r--lib/libc/arch/alpha/gen/fpsetround.c5
-rw-r--r--lib/libc/arch/alpha/gen/fpsetsticky.c5
-rw-r--r--lib/libc/arch/alpha/gen/frexp.c5
-rw-r--r--lib/libc/arch/alpha/gen/infinity.c5
-rw-r--r--lib/libc/arch/alpha/gen/isinf.c5
-rw-r--r--lib/libc/arch/alpha/gen/ldexp.c5
-rw-r--r--lib/libc/arch/alpha/gen/modf.c5
-rw-r--r--lib/libc/arch/alpha/gen/setjmp.S17
-rw-r--r--lib/libc/arch/alpha/gen/sigsetjmp.S19
18 files changed, 96 insertions, 46 deletions
diff --git a/lib/libc/arch/alpha/gen/Makefile.inc b/lib/libc/arch/alpha/gen/Makefile.inc
index 7d45a57a16b..d6e3cbffa44 100644
--- a/lib/libc/arch/alpha/gen/Makefile.inc
+++ b/lib/libc/arch/alpha/gen/Makefile.inc
@@ -1,4 +1,5 @@
-# $OpenBSD: Makefile.inc,v 1.2 1996/08/19 08:10:18 tholo Exp $
+# $OpenBSD: Makefile.inc,v 1.3 1996/11/13 21:20:07 niklas Exp $
+# $NetBSD: Makefile.inc,v 1.3 1995/04/29 05:09:14 cgd Exp $
SRCS+= _setjmp.S fabs.S frexp.c infinity.c isinf.c ldexp.c modf.c setjmp.S
SRCS+= flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
diff --git a/lib/libc/arch/alpha/gen/_setjmp.S b/lib/libc/arch/alpha/gen/_setjmp.S
index 0ddf80427dd..711bb7abbce 100644
--- a/lib/libc/arch/alpha/gen/_setjmp.S
+++ b/lib/libc/arch/alpha/gen/_setjmp.S
@@ -1,3 +1,6 @@
+/* $OpenBSD: _setjmp.S,v 1.3 1996/11/13 21:20:09 niklas Exp $ */
+/* $NetBSD: _setjmp.S,v 1.2 1996/10/17 03:08:03 cgd Exp $ */
+
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -25,11 +28,11 @@
* rights to redistribute these changes.
*/
-#include "DEFS.h"
+#include <machine/asm.h>
#if defined(LIBC_SCCS)
.text
- .asciz "$OpenBSD: _setjmp.S,v 1.2 1996/08/19 08:10:20 tholo Exp $"
+ .asciz "$OpenBSD: _setjmp.S,v 1.3 1996/11/13 21:20:09 niklas Exp $"
#endif
/*
@@ -46,7 +49,7 @@
.set noreorder
LEAF(_setjmp, 1)
- SETGP(pv)
+ LDGP(pv)
stq ra, (2 * 8)(a0) /* sc_pc = return address */
stq s0, (( 9 + 4) * 8)(a0) /* saved bits of sc_regs */
stq s1, ((10 + 4) * 8)(a0)
@@ -57,10 +60,10 @@ LEAF(_setjmp, 1)
stq s6, ((15 + 4) * 8)(a0)
stq ra, ((26 + 4) * 8)(a0)
stq sp, ((30 + 4) * 8)(a0)
- CONST(0xACEDBADD, t0) /* sigcontext magic number */
+ ldiq t0, 0xacedbadd /* sigcontext magic number */
stq t0, ((31 + 4) * 8)(a0) /* magic in sc_regs[31] */
/* Too bad we can't check if we actually used FP */
- CONST(1, t0)
+ ldiq t0, 1
stq t0, (36 * 8)(a0) /* say we've used FP. */
stt fs0, ((2 + 37) * 8)(a0) /* saved bits of sc_fpregs */
stt fs1, ((3 + 37) * 8)(a0)
@@ -70,7 +73,7 @@ LEAF(_setjmp, 1)
stt fs5, ((7 + 37) * 8)(a0)
stt fs6, ((8 + 37) * 8)(a0)
stt fs7, ((9 + 37) * 8)(a0)
- MF_FPCR(ft0) /* get FP control reg */
+ mf_fpcr ft0 /* get FP control reg */
stt ft0, (69 * 8)(a0) /* and store it in sc_fpcr */
stq zero, (70 * 8)(a0) /* FP software control XXX */
stq zero, (71 * 8)(a0) /* sc_reserved[0] */
@@ -89,9 +92,9 @@ LEAF(_setjmp, 1)
END(_setjmp)
LEAF(_longjmp, 2)
- SETGP(pv)
+ LDGP(pv)
ldq t0, ((31 + 4) * 8)(a0) /* magic in sc_regs[31] */
- CONST(0xACEDBADD, t1)
+ ldiq t1, 0xacedbadd
cmpeq t0, t1, t0
beq t0, botch /* If the magic was bad, punt */
@@ -114,7 +117,7 @@ LEAF(_longjmp, 2)
ldt fs6, ((8 + 37) * 8)(a0)
ldt fs7, ((9 + 37) * 8)(a0)
ldt ft0, (69 * 8)(a0) /* get sc_fpcr */
- MT_FPCR(ft0) /* and restore it. */
+ mt_fpcr ft0 /* and restore it. */
mov a1, v0 /* return second arg */
RET
diff --git a/lib/libc/arch/alpha/gen/divrem.m4 b/lib/libc/arch/alpha/gen/divrem.m4
index a9ed43c0586..b8b49a2bffe 100644
--- a/lib/libc/arch/alpha/gen/divrem.m4
+++ b/lib/libc/arch/alpha/gen/divrem.m4
@@ -1,4 +1,5 @@
-/* $OpenBSD: divrem.m4,v 1.2 1996/08/19 08:10:22 tholo Exp $ */
+/* $OpenBSD: divrem.m4,v 1.3 1996/11/13 21:20:09 niklas Exp $ */
+/* $NetBSD: divrem.m4,v 1.7 1996/10/17 03:08:04 cgd Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -54,7 +55,7 @@ define(CC, `t2')
define(T_0, `t3')
ifelse(S, `true', `define(NEG, `t4')')
-#include "DEFS.h"
+#include <machine/asm.h>
LEAF(NAME, 0) /* XXX */
lda sp, -64(sp)
@@ -112,7 +113,7 @@ ifelse(WORDSIZE, `32', `
/* kill the special cases. */
beq B, Ldotrap /* division by zero! */
-1: cmpult A, B, CC /* A < B? */
+ cmpult A, B, CC /* A < B? */
/* RESULT is already zero, from above. A is untouched. */
bne CC, Lret_result
@@ -125,7 +126,7 @@ ifelse(WORDSIZE, `32', `
* Find out how many bits of zeros are at the beginning of the divisor.
*/
LBbits:
- CONST(1, T_0) /* I = 0; BIT = 1<<WORDSIZE-1 */
+ ldiq T_0, 1 /* I = 0; BIT = 1<<WORDSIZE-1 */
mov zero, I
sll T_0, WORDSIZE-1, BIT
LBloop:
@@ -138,7 +139,7 @@ LBloop:
LAbits:
beq I, Ldodiv /* If I = 0, divide now. */
- CONST(1, T_0) /* BIT = 1<<WORDSIZE-1 */
+ ldiq T_0, 1 /* BIT = 1<<WORDSIZE-1 */
sll T_0, WORDSIZE-1, BIT
LAloop:
@@ -150,7 +151,7 @@ LAloop:
Ldodiv:
sll B, I, B /* B <<= i */
- CONST(1, T_0)
+ ldiq T_0, 1
sll T_0, I, BIT
Ldivloop:
@@ -187,7 +188,7 @@ ifelse(S, `true',
ret zero, (t9), 1
Ldotrap:
- CONST(-2, a0) /* This is the signal to SIGFPE! */
+ ldiq a0, -2 /* This is the signal to SIGFPE! */
call_pal PAL_gentrap
ifelse(OP, `div',
`', ` mov zero, A /* so that zero will be returned */
diff --git a/lib/libc/arch/alpha/gen/fabs.S b/lib/libc/arch/alpha/gen/fabs.S
index 950cb7663f9..8fb0362e6b2 100644
--- a/lib/libc/arch/alpha/gen/fabs.S
+++ b/lib/libc/arch/alpha/gen/fabs.S
@@ -1,3 +1,6 @@
+/* $OpenBSD: fabs.S,v 1.3 1996/11/13 21:20:10 niklas Exp $ */
+/* $NetBSD: fabs.S,v 1.2 1996/10/17 03:08:05 cgd Exp $ */
+
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -25,11 +28,11 @@
* rights to redistribute these changes.
*/
-#include "DEFS.h"
+#include <machine/asm.h>
#if defined(LIBC_SCCS)
.text
- .asciz "$OpenBSD: fabs.S,v 1.2 1996/08/19 08:10:23 tholo Exp $"
+ .asciz "$OpenBSD: fabs.S,v 1.3 1996/11/13 21:20:10 niklas Exp $"
#endif
LEAF(fabs, 1)
diff --git a/lib/libc/arch/alpha/gen/flt_rounds.c b/lib/libc/arch/alpha/gen/flt_rounds.c
index 008c5c1b053..7f93068a71b 100644
--- a/lib/libc/arch/alpha/gen/flt_rounds.c
+++ b/lib/libc/arch/alpha/gen/flt_rounds.c
@@ -1,3 +1,6 @@
+/* $OpenBSD: flt_rounds.c,v 1.3 1996/11/13 21:20:11 niklas Exp $ */
+/* $NetBSD: flt_rounds.c,v 1.1 1995/04/29 05:09:53 cgd Exp $ */
+
/*
* Copyright (c) 1995 Christopher G. Demetriou
* All rights reserved.
@@ -30,7 +33,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: flt_rounds.c,v 1.2 1996/08/19 08:10:25 tholo Exp $";
+static char *rcsid = "$OpenBSD: flt_rounds.c,v 1.3 1996/11/13 21:20:11 niklas Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
diff --git a/lib/libc/arch/alpha/gen/fpgetmask.c b/lib/libc/arch/alpha/gen/fpgetmask.c
index 7c61fe00a25..10d763f6ade 100644
--- a/lib/libc/arch/alpha/gen/fpgetmask.c
+++ b/lib/libc/arch/alpha/gen/fpgetmask.c
@@ -1,3 +1,6 @@
+/* $OpenBSD: fpgetmask.c,v 1.3 1996/11/13 21:20:12 niklas Exp $ */
+/* $NetBSD: fpgetmask.c,v 1.1 1995/04/29 05:10:55 cgd Exp $ */
+
/*
* Copyright (c) 1995 Christopher G. Demetriou
* All rights reserved.
@@ -30,7 +33,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: fpgetmask.c,v 1.2 1996/08/19 08:10:27 tholo Exp $";
+static char *rcsid = "$OpenBSD: fpgetmask.c,v 1.3 1996/11/13 21:20:12 niklas Exp $";
#endif /* LIBC_SCCS and not lint */
#include <ieeefp.h>
diff --git a/lib/libc/arch/alpha/gen/fpgetround.c b/lib/libc/arch/alpha/gen/fpgetround.c
index a0be997aa67..1aaf034dedb 100644
--- a/lib/libc/arch/alpha/gen/fpgetround.c
+++ b/lib/libc/arch/alpha/gen/fpgetround.c
@@ -1,3 +1,6 @@
+/* $OpenBSD: fpgetround.c,v 1.3 1996/11/13 21:20:13 niklas Exp $ */
+/* $NetBSD: fpgetround.c,v 1.1 1995/04/29 05:09:55 cgd Exp $ */
+
/*
* Copyright (c) 1995 Christopher G. Demetriou
* All rights reserved.
@@ -30,7 +33,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: fpgetround.c,v 1.2 1996/08/19 08:10:28 tholo Exp $";
+static char *rcsid = "$OpenBSD: fpgetround.c,v 1.3 1996/11/13 21:20:13 niklas Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
diff --git a/lib/libc/arch/alpha/gen/fpgetsticky.c b/lib/libc/arch/alpha/gen/fpgetsticky.c
index 7443f989005..f51f31efb27 100644
--- a/lib/libc/arch/alpha/gen/fpgetsticky.c
+++ b/lib/libc/arch/alpha/gen/fpgetsticky.c
@@ -1,3 +1,6 @@
+/* $OpenBSD: fpgetsticky.c,v 1.3 1996/11/13 21:20:14 niklas Exp $ */
+/* $NetBSD: fpgetsticky.c,v 1.1 1995/04/29 05:10:59 cgd Exp $ */
+
/*
* Copyright (c) 1995 Christopher G. Demetriou
* All rights reserved.
@@ -30,7 +33,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: fpgetsticky.c,v 1.2 1996/08/19 08:10:30 tholo Exp $";
+static char *rcsid = "$OpenBSD: fpgetsticky.c,v 1.3 1996/11/13 21:20:14 niklas Exp $";
#endif /* LIBC_SCCS and not lint */
#include <ieeefp.h>
diff --git a/lib/libc/arch/alpha/gen/fpsetmask.c b/lib/libc/arch/alpha/gen/fpsetmask.c
index df213eab585..c1497e51ead 100644
--- a/lib/libc/arch/alpha/gen/fpsetmask.c
+++ b/lib/libc/arch/alpha/gen/fpsetmask.c
@@ -1,3 +1,6 @@
+/* $OpenBSD: fpsetmask.c,v 1.3 1996/11/13 21:20:15 niklas Exp $ */
+/* $NetBSD: fpsetmask.c,v 1.1 1995/04/29 05:11:01 cgd Exp $ */
+
/*
* Copyright (c) 1995 Christopher G. Demetriou
* All rights reserved.
@@ -30,7 +33,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: fpsetmask.c,v 1.2 1996/08/19 08:10:32 tholo Exp $";
+static char *rcsid = "$OpenBSD: fpsetmask.c,v 1.3 1996/11/13 21:20:15 niklas Exp $";
#endif /* LIBC_SCCS and not lint */
#include <ieeefp.h>
diff --git a/lib/libc/arch/alpha/gen/fpsetround.c b/lib/libc/arch/alpha/gen/fpsetround.c
index e8775da93a5..908652e551b 100644
--- a/lib/libc/arch/alpha/gen/fpsetround.c
+++ b/lib/libc/arch/alpha/gen/fpsetround.c
@@ -1,3 +1,6 @@
+/* $OpenBSD: fpsetround.c,v 1.3 1996/11/13 21:20:15 niklas Exp $ */
+/* $NetBSD: fpsetround.c,v 1.1 1995/04/29 05:09:57 cgd Exp $ */
+
/*
* Copyright (c) 1995 Christopher G. Demetriou
* All rights reserved.
@@ -30,7 +33,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: fpsetround.c,v 1.2 1996/08/19 08:10:33 tholo Exp $";
+static char *rcsid = "$OpenBSD: fpsetround.c,v 1.3 1996/11/13 21:20:15 niklas Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
diff --git a/lib/libc/arch/alpha/gen/fpsetsticky.c b/lib/libc/arch/alpha/gen/fpsetsticky.c
index ded18977f13..97a3d2ab942 100644
--- a/lib/libc/arch/alpha/gen/fpsetsticky.c
+++ b/lib/libc/arch/alpha/gen/fpsetsticky.c
@@ -1,3 +1,6 @@
+/* $OpenBSD: fpsetsticky.c,v 1.3 1996/11/13 21:20:16 niklas Exp $ */
+/* $NetBSD: fpsetsticky.c,v 1.1 1995/04/29 05:11:04 cgd Exp $ */
+
/*
* Copyright (c) 1995 Christopher G. Demetriou
* All rights reserved.
@@ -30,7 +33,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: fpsetsticky.c,v 1.2 1996/08/19 08:10:35 tholo Exp $";
+static char *rcsid = "$OpenBSD: fpsetsticky.c,v 1.3 1996/11/13 21:20:16 niklas Exp $";
#endif /* LIBC_SCCS and not lint */
#include <ieeefp.h>
diff --git a/lib/libc/arch/alpha/gen/frexp.c b/lib/libc/arch/alpha/gen/frexp.c
index a38d174e070..09c462214d4 100644
--- a/lib/libc/arch/alpha/gen/frexp.c
+++ b/lib/libc/arch/alpha/gen/frexp.c
@@ -1,3 +1,6 @@
+/* $OpenBSD: frexp.c,v 1.3 1996/11/13 21:20:17 niklas Exp $ */
+/* $NetBSD: frexp.c,v 1.1 1995/02/10 17:50:22 cgd Exp $ */
+
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -26,7 +29,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: frexp.c,v 1.2 1996/08/19 08:10:37 tholo Exp $";
+static char *rcsid = "$OpenBSD: frexp.c,v 1.3 1996/11/13 21:20:17 niklas Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
diff --git a/lib/libc/arch/alpha/gen/infinity.c b/lib/libc/arch/alpha/gen/infinity.c
index 8db48d814ef..7548340c49e 100644
--- a/lib/libc/arch/alpha/gen/infinity.c
+++ b/lib/libc/arch/alpha/gen/infinity.c
@@ -1,3 +1,6 @@
+/* $OpenBSD: infinity.c,v 1.3 1996/11/13 21:20:18 niklas Exp $ */
+/* $NetBSD: infinity.c,v 1.1 1995/02/10 17:50:23 cgd Exp $ */
+
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -26,7 +29,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: infinity.c,v 1.2 1996/08/19 08:10:38 tholo Exp $";
+static char *rcsid = "$OpenBSD: infinity.c,v 1.3 1996/11/13 21:20:18 niklas Exp $";
#endif /* LIBC_SCCS and not lint */
#include <math.h>
diff --git a/lib/libc/arch/alpha/gen/isinf.c b/lib/libc/arch/alpha/gen/isinf.c
index fe67c77a31c..23e45a0580e 100644
--- a/lib/libc/arch/alpha/gen/isinf.c
+++ b/lib/libc/arch/alpha/gen/isinf.c
@@ -1,3 +1,6 @@
+/* $OpenBSD: isinf.c,v 1.3 1996/11/13 21:20:19 niklas Exp $ */
+/* $NetBSD: isinf.c,v 1.1 1995/02/10 17:50:23 cgd Exp $ */
+
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -26,7 +29,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: isinf.c,v 1.2 1996/08/19 08:10:40 tholo Exp $";
+static char *rcsid = "$OpenBSD: isinf.c,v 1.3 1996/11/13 21:20:19 niklas Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
diff --git a/lib/libc/arch/alpha/gen/ldexp.c b/lib/libc/arch/alpha/gen/ldexp.c
index aed63cb7008..a3638ff40df 100644
--- a/lib/libc/arch/alpha/gen/ldexp.c
+++ b/lib/libc/arch/alpha/gen/ldexp.c
@@ -1,3 +1,6 @@
+/* $OpenBSD: ldexp.c,v 1.3 1996/11/13 21:20:20 niklas Exp $ */
+/* $NetBSD: ldexp.c,v 1.1 1995/02/10 17:50:24 cgd Exp $ */
+
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -26,7 +29,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: ldexp.c,v 1.2 1996/08/19 08:10:42 tholo Exp $";
+static char *rcsid = "$OpenBSD: ldexp.c,v 1.3 1996/11/13 21:20:20 niklas Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
diff --git a/lib/libc/arch/alpha/gen/modf.c b/lib/libc/arch/alpha/gen/modf.c
index 514d3e63ba8..996253b2fe3 100644
--- a/lib/libc/arch/alpha/gen/modf.c
+++ b/lib/libc/arch/alpha/gen/modf.c
@@ -1,3 +1,6 @@
+/* $OpenBSD: modf.c,v 1.3 1996/11/13 21:20:21 niklas Exp $ */
+/* $NetBSD: modf.c,v 1.1 1995/02/10 17:50:25 cgd Exp $ */
+
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -26,7 +29,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: modf.c,v 1.2 1996/08/19 08:10:44 tholo Exp $";
+static char *rcsid = "$OpenBSD: modf.c,v 1.3 1996/11/13 21:20:21 niklas Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
diff --git a/lib/libc/arch/alpha/gen/setjmp.S b/lib/libc/arch/alpha/gen/setjmp.S
index 480c7ea4d69..0caaec361c7 100644
--- a/lib/libc/arch/alpha/gen/setjmp.S
+++ b/lib/libc/arch/alpha/gen/setjmp.S
@@ -1,3 +1,6 @@
+/* $OpenBSD: setjmp.S,v 1.3 1996/11/13 21:20:21 niklas Exp $ */
+/* $NetBSD: setjmp.S,v 1.2 1996/10/17 03:08:06 cgd Exp $ */
+
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -25,11 +28,11 @@
* rights to redistribute these changes.
*/
-#include "DEFS.h"
+#include <machine/asm.h>
#if defined(LIBC_SCCS)
.text
- .asciz "$OpenBSD: setjmp.S,v 1.2 1996/08/19 08:10:45 tholo Exp $"
+ .asciz "$OpenBSD: setjmp.S,v 1.3 1996/11/13 21:20:21 niklas Exp $"
#endif
/*
@@ -46,7 +49,7 @@
.set noreorder
LEAF(setjmp, 1)
- SETGP(pv)
+ LDGP(pv)
stq ra, (2 * 8)(a0) /* sc_pc = return address */
stq s0, (( 9 + 4) * 8)(a0) /* saved bits of sc_regs */
stq s1, ((10 + 4) * 8)(a0)
@@ -84,10 +87,10 @@ LEAF(setjmp, 1)
mov s0, a0
ldq s0, (( 9 + 4) * 8)(a0)
- CONST(0xACEDBADE, t0) /* sigcontext magic number */
+ ldiq t0, 0xacedbade /* sigcontext magic number */
stq t0, ((31 + 4) * 8)(a0) /* magic in sc_regs[31] */
/* Too bad we can't check if we actually used FP */
- CONST(1, t0)
+ ldiq t0, 1
stq t0, (36 * 8)(a0) /* say we've used FP. */
stt fs0, ((2 + 37) * 8)(a0) /* saved bits of sc_fpregs */
stt fs1, ((3 + 37) * 8)(a0)
@@ -97,7 +100,7 @@ LEAF(setjmp, 1)
stt fs5, ((7 + 37) * 8)(a0)
stt fs6, ((8 + 37) * 8)(a0)
stt fs7, ((9 + 37) * 8)(a0)
- MF_FPCR(ft0) /* get FP control reg */
+ mf_fpcr ft0 /* get FP control reg */
stt ft0, (69 * 8)(a0) /* and store it in sc_fpcr */
stq zero, (70 * 8)(a0) /* FP software control XXX */
stq zero, (71 * 8)(a0) /* sc_reserved[0] */
@@ -116,7 +119,7 @@ LEAF(setjmp, 1)
END(setjmp)
LEAF(longjmp, 2)
- SETGP(pv)
+ LDGP(pv)
stq a1, (( 0 + 4) * 8)(a0) /* save return value */
CALL(sigreturn) /* use sigreturn to return */
diff --git a/lib/libc/arch/alpha/gen/sigsetjmp.S b/lib/libc/arch/alpha/gen/sigsetjmp.S
index 263cd582865..97aa89b68f6 100644
--- a/lib/libc/arch/alpha/gen/sigsetjmp.S
+++ b/lib/libc/arch/alpha/gen/sigsetjmp.S
@@ -1,3 +1,6 @@
+/* $OpenBSD: sigsetjmp.S,v 1.3 1996/11/13 21:20:23 niklas Exp $ */
+/* $NetBSD: sigsetjmp.S,v 1.2 1996/10/17 03:08:07 cgd Exp $ */
+
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -25,11 +28,11 @@
* rights to redistribute these changes.
*/
-#include "DEFS.h"
+#include <machine/asm.h>
#if defined(LIBC_SCCS)
.text
- .asciz "$OpenBSD: sigsetjmp.S,v 1.2 1996/08/19 08:10:47 tholo Exp $"
+ .asciz "$OpenBSD: sigsetjmp.S,v 1.3 1996/11/13 21:20:23 niklas Exp $"
#endif
/*
@@ -47,19 +50,19 @@
.set noreorder
LEAF(sigsetjmp, 2)
- SETGP(pv)
+ LDGP(pv)
stq a1, (81 * 8)(a0) /* save the mask */
bne a1, Lsavesig /* if !zero, save signals */
- JMP(_setjmp) /* else don't. */
+ jmp zero, _setjmp /* else don't. */
Lsavesig:
- JMP(setjmp)
+ jmp zero, setjmp
END(sigsetjmp)
LEAF(siglongjmp, 2)
- SETGP(pv)
+ LDGP(pv)
ldq t0, (81 * 8)(a0) /* get the mask */
bne t0, Lrestoresig /* if !zero, restore signals */
- JMP(_longjmp)
+ jmp zero, _longjmp
Lrestoresig:
- JMP(longjmp)
+ jmp zero, longjmp
END(siglongjmp)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 19:24:16 +0000