Module Name:src
Committed By: matt
Date: Wed Jul 17 21:29:01 UTC 2013
Modified Files:
src/lib/libc/compat/arch/m68k/gen: compat_setjmp.S compat_sigsetjmp.S
Log Message:
Missed these. Convert to motorola format.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S \
src/lib/libc/compat/arch/m68k/gen/compat_sigsetjmp.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S
diff -u src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S:1.1 src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S:1.2
--- src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S:1.1 Thu Mar 9 16:20:55 2006
+++ src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S Wed Jul 17 21:29:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_setjmp.S,v 1.1 2006/03/09 16:20:55 christos Exp $ */
+/* $NetBSD: compat_setjmp.S,v 1.2 2013/07/17 21:29:01 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
#if 0
RCSID(from: @(#)setjmp.s 5.1 (Berkeley) 5/12/90)
#else
- RCSID($NetBSD: compat_setjmp.S,v 1.1 2006/03/09 16:20:55 christos Exp $)
+ RCSID($NetBSD: compat_setjmp.S,v 1.2 2013/07/17 21:29:01 matt Exp $)
#endif
#endif /* LIBC_SCCS and not lint */
@@ -55,41 +55,43 @@
*/
ENTRY(setjmp)
- lea %sp@(-12),%sp /* space for sigstack args/rvals */
- clrl %sp@ /* don't change it... */
- movl %sp,%sp@(4) /* ...but return the current val */
+ lea -12(%sp),%sp /* space for sigstack args/rvals */
+ clrl (%sp) /* don't change it... */
+ movl %sp,4(%sp) /* ...but return the current val */
jbsr PIC_PLT(_C_LABEL(__sigaltstack14))
/* note: flags returned in sp@(8) */
- clrl %sp@ /* don't change mask, just return */
+ clrl (%sp) /* don't change mask, just return */
jbsr PIC_PLT(_C_LABEL(sigblock)) /* old value */
- movl %sp@(8),%d1 /* old flags value */
+ movl 8(%sp),%d1 /* old flags value */
andl #1,%d1 /* extract onstack flag */
- lea %sp@(12),%sp
- movl %sp@(4),%a0 /* save area pointer */
- movl %d1,%a0@+ /* save old onstack value */
- movl %d0,%a0@+ /* save old signal mask */
- lea %sp@(4),%a1 /* adjust saved SP since we won't rts */
- movl %a1,%a0@+ /* save old SP */
- movl %a6,%a0@+ /* save old FP */
- clrl %a0@+ /* no AP */
- movl %sp@,%a0@+ /* save old PC */
- clrl %a0@+ /* clean PS */
- moveml #0x3CFC,%a0@ /* save remaining non-scratch regs */
+ lea 12(%sp),%sp
+ movl 4(%sp),%a0 /* save area pointer */
+ movl %d1,(%a0)+ /* save old onstack value */
+ movl %d0,(%a0)+ /* save old signal mask */
+ lea 4(%sp),%a1 /* adjust saved SP since we won't rts */
+ movl %a1,(%a0)+ /* save old SP */
+ movl %a6,(%a0)+ /* save old FP */
+ clrl (%a0)+ /* no AP */
+ movl (%sp),(%a0)+ /* save old PC */
+ clrl (%a0)+ /* clean PS */
+ moveml #0x3CFC,(%a0) /* save remaining non-scratch regs */
clrl %d0 /* return 0 */
rts
+END(setjmp)
ENTRY(longjmp)
- movl %sp@(4),%a0 /* save area pointer */
- tstl %a0@(8) /* ensure non-zero SP */
+ movl 4(%sp),%a0 /* save area pointer */
+ tstl 8(%a0) /* ensure non-zero SP */
jeq botch /* oops! */
- movl %sp@(8),%d0 /* grab return value */
+ movl 8(%sp),%d0 /* grab return value */
jne ok /* non-zero ok */
moveq #1,%d0 /* else make non-zero */
ok:
- moveml %a0@(28),#0x3CFC /* restore non-scratch regs */
- movl %a0,%sp@- /* let sigreturn */
+ moveml 28(%a0),#0x3CFC /* restore non-scratch regs */
+ movl %a0,-(%sp) /* let sigreturn */
jbsr PIC_PLT(_C_LABEL(sigreturn)) /* finish for us */
botch:
jbsr PIC_PLT(_C_LABEL(longjmperror))
stop #0
+END(longjmp)
Index: src/lib/libc/compat/arch/m68k/gen/compat_sigsetjmp.S
diff -u src/lib/libc/compat/arch/m68k/gen/compat_sigsetjmp.S:1.1 src/lib/libc/compat/arch/m68k/gen/compat_sigsetjmp.S:1.2
--- src/lib/libc/compat/arch/m68k/gen/compat_sigsetjmp.S:1.1 Thu Mar 9 16:20:55 2006
+++ src/lib/libc/compat/arch/m68k/gen/compat_sigsetjmp.S Wed Jul 17 21:29:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_sigsetjmp.S,v 1.1 2006/03/09 16:20:55 christos Exp $ */
+/* $NetBSD: compat_sigsetjmp.S,v 1.2 2013/07/17 21:29:01 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
#if 0
RCSID(from: @(#)_setjmp.s 5.1 (Berkeley) 5/12/90)
#else
- RCSID($NetBSD: compat_sigsetjmp.S,v 1.1 2006/03/09 16:20:55 christos Exp $)
+ RCSID($NetBSD: compat_sigsetjmp.S,v 1.2 2013/07/17 21:29:01 matt Exp $)
#endif
#endif /* LIBC_SCCS and not lint */
@@ -58,20 +58,22 @@
#include m68k/setjmp.h
ENTRY(sigsetjmp)
- movl %sp@(8),%d1 /* grab the mask */
-movl %sp@(4),%a0 /* grab the area pointer */
- movl %d1,%a0@(_JBLEN * 4 ) /* save at end of area */
+ movl 8(%sp),%d1 /* grab the mask */
+ movl 4(%sp),%a0 /* grab the area pointer */
+ movl %d1,(_JBLEN * 4)(%a0) /* save at end of area */
tstl %d1
bne dosig
jra PIC_PLT(_C_LABEL(_setjmp))
dosig:
jra
