Module Name: src
Committed By: matt
Date: Thu Aug 1 13:42:52 UTC 2013
Modified Files:
src/sys/arch/m68k/m68k: compat_13_sigreturn13.s compat_16_sigreturn14.s
copypage.s lock_stubs.s reenter_syscall.s sigcode.s sunos_sigcode.s
support.s svr4_sigcode.s switch_subr.s trap_subr.s w16copy.s
Log Message:
Convert to motorola style.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/m68k/m68k/compat_13_sigreturn13.s \
src/sys/arch/m68k/m68k/sunos_sigcode.s
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/m68k/m68k/compat_16_sigreturn14.s
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/m68k/m68k/copypage.s \
src/sys/arch/m68k/m68k/sigcode.s src/sys/arch/m68k/m68k/trap_subr.s
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/m68k/m68k/lock_stubs.s
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/m68k/m68k/reenter_syscall.s \
src/sys/arch/m68k/m68k/w16copy.s
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/m68k/m68k/support.s \
src/sys/arch/m68k/m68k/svr4_sigcode.s
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/m68k/m68k/switch_subr.s
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/m68k/m68k/compat_13_sigreturn13.s
diff -u src/sys/arch/m68k/m68k/compat_13_sigreturn13.s:1.5 src/sys/arch/m68k/m68k/compat_13_sigreturn13.s:1.6
--- src/sys/arch/m68k/m68k/compat_13_sigreturn13.s:1.5 Tue Feb 8 20:20:16 2011
+++ src/sys/arch/m68k/m68k/compat_13_sigreturn13.s Thu Aug 1 13:42:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_13_sigreturn13.s,v 1.5 2011/02/08 20:20:16 rmind Exp $ */
+/* $NetBSD: compat_13_sigreturn13.s,v 1.6 2013/08/01 13:42:52 matt Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -48,33 +48,33 @@
* (possibly much larger) original stack frame.
*/
ENTRY_NOPROFILE(m68k_compat_13_sigreturn13_stub)
- lea %sp@(-84),%sp | leave enough space for largest frame
- movl %sp@(84),%sp@ | move up current 8 byte frame
- movl %sp@(88),%sp@(4)
- movl #84,%sp@- | default: adjust by 84 bytes
- moveml #0xFFFF,%sp@- | save user registers
+ lea -84(%sp),%sp | leave enough space for largest frame
+ movl 84(%sp),(%sp) | move up current 8 byte frame
+ movl 88(%sp),4(%sp)
+ movl #84,-(%sp) | default: adjust by 84 bytes
+ moveml #0xFFFF,-(%sp) | save user registers
movl %usp,%a0 | save the user SP
- movl %a0,%sp@(FR_SP) | in the savearea
- movl #SYS_compat_13_sigreturn13,%sp@- | push syscall number
+ movl %a0,FR_SP(%sp) | in the savearea
+ movl #SYS_compat_13_sigreturn13,-(%sp) | push syscall number
jbsr _C_LABEL(syscall) | handle it
addql #4,%sp | pop syscall#
- movl %sp@(FR_SP),%a0 | grab and restore
+ movl FR_SP(%sp),%a0 | grab and restore
movl %a0,%usp | user SP
- lea %sp@(FR_HW),%a1 | pointer to HW frame
- movw %sp@(FR_ADJ),%d0 | do we need to adjust the stack?
+ lea FR_HW(%sp),%a1 | pointer to HW frame
+ movw FR_ADJ(%sp),%d0 | do we need to adjust the stack?
jeq Lc13sigr1 | no, just continue
moveq #92,%d1 | total size
subw %d0,%d1 | - hole size = frame size
- lea %a1@(92),%a0 | destination
+ lea 92(%a1),%a0 | destination
addw %d1,%a1 | source
lsrw #1,%d1 | convert to word count
subqw #1,%d1 | minus 1 for dbf
Lc13sigrlp:
- movw %a1@-,%a0@- | copy a word
+ movw -(%a1),-(%a0) | copy a word
dbf %d1,Lc13sigrlp | continue
movl %a0,%a1 | new HW frame base
Lc13sigr1:
- movl %a1,%sp@(FR_SP) | new SP value
- moveml %sp@+,#0x7FFF | restore user registers
- movl %sp@,%sp | and our SP
+ movl %a1,FR_SP(%sp) | new SP value
+ moveml (%sp)+,#0x7FFF | restore user registers
+ movl (%sp),%sp | and our SP
jra _ASM_LABEL(rei) | all done
Index: src/sys/arch/m68k/m68k/sunos_sigcode.s
diff -u src/sys/arch/m68k/m68k/sunos_sigcode.s:1.5 src/sys/arch/m68k/m68k/sunos_sigcode.s:1.6
--- src/sys/arch/m68k/m68k/sunos_sigcode.s:1.5 Tue Feb 8 20:20:16 2011
+++ src/sys/arch/m68k/m68k/sunos_sigcode.s Thu Aug 1 13:42:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos_sigcode.s,v 1.5 2011/02/08 20:20:16 rmind Exp $ */
+/* $NetBSD: sunos_sigcode.s,v 1.6 2013/08/01 13:42:52 matt Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -51,11 +51,11 @@
.data
.align 2
GLOBAL(sunos_sigcode)
- movl %sp@(12),%a0 | signal handler addr (4 bytes)
- jsr %a0@ | call signal handler (2 bytes)
+ movl 12(%sp),%a0 | signal handler addr (4 bytes)
+ jsr (%a0) | call signal handler (2 bytes)
addql #4,%sp | pop signal number (2 bytes)
trap #1 | special syscall entry (2 bytes)
- movl %d0,%sp@(4) | save errno (4 bytes)
+ movl %d0,4(%sp) | save errno (4 bytes)
moveq #1,%d0 | syscall == exit (2 bytes)
trap #0 | exit(errno) (2 bytes)
.align 2
Index: src/sys/arch/m68k/m68k/compat_16_sigreturn14.s
diff -u src/sys/arch/m68k/m68k/compat_16_sigreturn14.s:1.3 src/sys/arch/m68k/m68k/compat_16_sigreturn14.s:1.4
--- src/sys/arch/m68k/m68k/compat_16_sigreturn14.s:1.3 Tue Feb 8 20:20:16 2011
+++ src/sys/arch/m68k/m68k/compat_16_sigreturn14.s Thu Aug 1 13:42:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_16_sigreturn14.s,v 1.3 2011/02/08 20:20:16 rmind Exp $ */
+/* $NetBSD: compat_16_sigreturn14.s,v 1.4 2013/08/01 13:42:52 matt Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -48,33 +48,33 @@
* (possibly much larger) original stack frame.
*/
ENTRY_NOPROFILE(m68k_compat_16_sigreturn14_stub)
- lea %sp@(-84),%sp | leave enough space for largest frame
- movl %sp@(84),%sp@ | move up current 8 byte frame
- movl %sp@(88),%sp@(4)
- movl #84,%sp@- | default: adjust by 84 bytes
- moveml #0xFFFF,%sp@- | save user registers
+ lea -84(%sp),%sp | leave enough space for largest frame
+ movl 84(%sp),(%sp) | move up current 8 byte frame
+ movl 88(%sp),4(%sp)
+ movl #84,-(%sp) | default: adjust by 84 bytes
+ moveml #0xFFFF,-(%sp) | save user registers
movl %usp,%a0 | save the user SP
- movl %a0,%sp@(FR_SP) | in the savearea
- movl #SYS_compat_16___sigreturn14,%sp@- | push syscall number
+ movl %a0,FR_SP(%sp) | in the savearea
+ movl #SYS_compat_16___sigreturn14,-(%sp) | push syscall number
jbsr _C_LABEL(syscall) | handle it
addql #4,%sp | pop syscall#
- movl %sp@(FR_SP),%a0 | grab and restore
+ movl FR_SP(%sp),%a0 | grab and restore
movl %a0,%usp | user SP
- lea %sp@(FR_HW),%a1 | pointer to HW frame
- movw %sp@(FR_ADJ),%d0 | do we need to adjust the stack?
+ lea FR_HW(%sp),%a1 | pointer to HW frame
+ movw FR_ADJ(%sp),%d0 | do we need to adjust the stack?
jeq Lsigr1 | no, just continue
moveq #92,%d1 | total size
subw %d0,%d1 | - hole size = frame size
- lea %a1@(92),%a0 | destination
+ lea 92(%a1),%a0 | destination
addw %d1,%a1 | source
lsrw #1,%d1 | convert to word count
subqw #1,%d1 | minus 1 for dbf
Lsigrlp:
- movw %a1@-,%a0@- | copy a word
+ movw -(%a1),-(%a0) | copy a word
dbf %d1,Lsigrlp | continue
movl %a0,%a1 | new HW frame base
Lsigr1:
- movl %a1,%sp@(FR_SP) | new SP value
- moveml %sp@+,#0x7FFF | restore user registers
- movl %sp@,%sp | and our SP
+ movl %a1,FR_SP(%sp) | new SP value
+ moveml (%sp)+,#0x7FFF | restore user registers
+ movl (%sp),%sp | and our SP
jra _ASM_LABEL(rei) | all done
Index: src/sys/arch/m68k/m68k/copypage.s
diff -u src/sys/arch/m68k/m68k/copypage.s:1.14 src/sys/arch/m68k/m68k/copypage.s:1.15
--- src/sys/arch/m68k/m68k/copypage.s:1.14 Sun Jun 6 04:50:07 2010
+++ src/sys/arch/m68k/m68k/copypage.s Thu Aug 1 13:42:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: copypage.s,v 1.14 2010/06/06 04:50:07 mrg Exp $ */
+/* $NetBSD: copypage.s,v 1.15 2013/08/01 13:42:52 matt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -50,12 +50,12 @@
*/
#if defined(M68040) || defined(M68060)
ENTRY(copypage040)
- movl %sp@(4),%a0 | source address
- movl %sp@(8),%a1 | destiniation address
+ movl 4(%sp),%a0 | source address
+ movl 8(%sp),%a1 | destiniation address
movw #PAGE_SIZE/32-1,%d0 | number of 32 byte chunks - 1
Lm16loop:
- .long 0xf6209000 | move16 %a0@+,%a1@+
- .long 0xf6209000 | move16 %a0@+,%a1@+
+ .long 0xf6209000 | move16 (%a0)+,(%a1)+
+ .long 0xf6209000 | move16 (%a0)+,(%a1)+
dbf %d0,Lm16loop
rts
#endif /* M68040 || M68060 */
@@ -66,24 +66,24 @@ Lm16loop:
* Optimized version of bcopy for a single page-aligned PAGE_SIZE byte copy.
*/
ENTRY(copypage)
- movl %sp@(4),%a0 | source address
- movl %sp@(8),%a1 | destiniation address
+ movl 4(%sp),%a0 | source address
+ movl 8(%sp),%a1 | destiniation address
#ifndef __mc68010__
movw #PAGE_SIZE/32-1,%d0 | number of 32 byte chunks - 1
Lmlloop:
- movl %a0@+,%a1@+
- movl %a0@+,%a1@+
- movl %a0@+,%a1@+
- movl %a0@+,%a1@+
- movl %a0@+,%a1@+
- movl %a0@+,%a1@+
- movl %a0@+,%a1@+
- movl %a0@+,%a1@+
+ movl (%a0)+,(%a1)+
+ movl (%a0)+,(%a1)+
+ movl (%a0)+,(%a1)+
+ movl (%a0)+,(%a1)+
+ movl (%a0)+,(%a1)+
+ movl (%a0)+,(%a1)+
+ movl (%a0)+,(%a1)+
+ movl (%a0)+,(%a1)+
dbf %d0,Lmlloop
#else /* __mc68010__ */
movw #PAGE_SIZE/4-1,%d0 | number of 4 byte chunks - 1
Lmlloop:
- movl %a0@+,%a1@+
+ movl (%a0)+,(%a1)+
dbf %d0,Lmlloop | use the 68010 loop mode
#endif /* __mc68010__ */
rts
@@ -94,10 +94,10 @@ Lmlloop:
* Optimized version of bzero for a single page-aligned PAGE_SIZE byte zero.
*/
ENTRY(zeropage)
- movl %sp@(4),%a0 | dest address
+ movl 4(%sp),%a0 | dest address
#ifndef __mc68010__
movql #PAGE_SIZE/256-1,%d0 | number of 256 byte chunks - 1
- movml %d2-%d7,%sp@-
+ movml %d2-%d7,-(%sp)
movql #0,%d1
movql #0,%d2
movql #0,%d3
@@ -106,22 +106,22 @@ ENTRY(zeropage)
movql #0,%d6
movql #0,%d7
movl %d1,%a1
- lea %a0@(PAGE_SIZE),%a0
+ lea PAGE_SIZE(%a0),%a0
Lzloop:
- movml %d1-%d7/%a1,%a0@-
- movml %d1-%d7/%a1,%a0@-
- movml %d1-%d7/%a1,%a0@-
- movml %d1-%d7/%a1,%a0@-
- movml %d1-%d7/%a1,%a0@-
- movml %d1-%d7/%a1,%a0@-
- movml %d1-%d7/%a1,%a0@-
- movml %d1-%d7/%a1,%a0@-
+ movml %d1-%d7/%a1,-(%a0)
+ movml %d1-%d7/%a1,-(%a0)
+ movml %d1-%d7/%a1,-(%a0)
+ movml %d1-%d7/%a1,-(%a0)
+ movml %d1-%d7/%a1,-(%a0)
+ movml %d1-%d7/%a1,-(%a0)
+ movml %d1-%d7/%a1,-(%a0)
+ movml %d1-%d7/%a1,-(%a0)
dbf %d0,Lzloop
- movml %sp@+,%d2-%d7
+ movml (%sp)+,%d2-%d7
#else /* __mc68010__ */
movw #PAGE_SIZE/4-1,%d0 | number of 4 byte chunks - 1
Lzloop:
- clrl %a0@+
+ clrl (%a0)+
dbf %d0,Lzloop | use the 68010 loop mode
#endif /* __mc68010__ */
rts
Index: src/sys/arch/m68k/m68k/sigcode.s
diff -u src/sys/arch/m68k/m68k/sigcode.s:1.14 src/sys/arch/m68k/m68k/sigcode.s:1.15
--- src/sys/arch/m68k/m68k/sigcode.s:1.14 Tue Feb 8 20:20:16 2011
+++ src/sys/arch/m68k/m68k/sigcode.s Thu Aug 1 13:42:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sigcode.s,v 1.14 2011/02/08 20:20:16 rmind Exp $ */
+/* $NetBSD: sigcode.s,v 1.15 2013/08/01 13:42:52 matt Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -60,11 +60,11 @@
.data
.align 2
GLOBAL(sigcode)
- leal %sp@(12),%a0 /* get pointer to sigcontext */
- movl %a0,%sp@(4) /* put it in the argument slot */
+ leal 12(%sp),%a0 /* get pointer to sigcontext */
+ movl %a0,4(%sp) /* put it in the argument slot */
/* fake return address already there */
trap #3 /* special sigreturn trap */
- movl %d0,%sp@(4) /* exit with errno */
+ movl %d0,4(%sp) /* exit with errno */
moveq #SYS_exit,%d0 /* if sigreturn fails */
trap #0
Index: src/sys/arch/m68k/m68k/trap_subr.s
diff -u src/sys/arch/m68k/m68k/trap_subr.s:1.14 src/sys/arch/m68k/m68k/trap_subr.s:1.15
--- src/sys/arch/m68k/m68k/trap_subr.s:1.14 Tue Feb 8 20:20:17 2011
+++ src/sys/arch/m68k/m68k/trap_subr.s Thu Aug 1 13:42:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: trap_subr.s,v 1.14 2011/02/08 20:20:17 rmind Exp $ */
+/* $NetBSD: trap_subr.s,v 1.15 2013/08/01 13:42:52 matt Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -53,16 +53,16 @@
*/
ASENTRY_NOPROFILE(fault)
movl %usp,%a0 | get and save
- movl %a0,%sp@(FR_SP) | the user stack pointer
- clrl %sp@- | no VA arg
- clrl %sp@- | or code arg
- movl %d0,%sp@- | push trap type
- pea %sp@(12) | address of trap frame
+ movl %a0,FR_SP(%sp) | the user stack pointer
+ clrl -(%sp) | no VA arg
+ clrl -(%sp) | or code arg
+ movl %d0,-(%sp) | push trap type
+ pea 12(%sp) | address of trap frame
jbsr _C_LABEL(trap) | handle trap
- lea %sp@(16),%sp | pop value args
- movl %sp@(FR_SP),%a0 | restore
+ lea 16(%sp),%sp | pop value args
+ movl FR_SP(%sp),%a0 | restore
movl %a0,%usp | user SP
- moveml %sp@+,#0x7FFF | restore most user regs
+ moveml (%sp)+,#0x7FFF | restore most user regs
addql #8,%sp | pop SP and stack adjust
jra _ASM_LABEL(rei) | all done
@@ -70,28 +70,28 @@ ASENTRY_NOPROFILE(fault)
* Similar to above, but will tidy up the stack, if necessary.
*/
ASENTRY(faultstkadj)
- pea %sp@(12) | address of trap frame
+ pea 12(%sp) | address of trap frame
jbsr _C_LABEL(trap) | handle the error
- lea %sp@(16),%sp | pop value args
+ lea 16(%sp),%sp | pop value args
/* for new 68060 Branch Prediction Error handler */
_ASM_LABEL(faultstkadjnotrap2):
- movl %sp@(FR_SP),%a0 | restore user SP
+ movl FR_SP(%sp),%a0 | restore user SP
movl %a0,%usp | from save area
- movw %sp@(FR_ADJ),%d0 | need to adjust stack?
+ movw FR_ADJ(%sp),%d0 | need to adjust stack?
jne 1f | yes, go to it
- moveml %sp@+,#0x7FFF | no, restore most user regs
+ moveml (%sp)+,#0x7FFF | no, restore most user regs
addql #8,%sp | toss SSP and stkadj
jra _ASM_LABEL(rei) | all done
1:
- lea %sp@(FR_HW),%a1 | pointer to HW frame
+ lea FR_HW(%sp),%a1 | pointer to HW frame
addql #8,%a1 | source pointer
movl %a1,%a0 | source
addw %d0,%a0 | + hole size = dest pointer
- movl %a1@-,%a0@- | copy
- movl %a1@-,%a0@- | 8 bytes
- movl %a0,%sp@(FR_SP) | new SSP
- moveml %sp@+,#0x7FFF | restore user registers
- movl %sp@,%sp | and our SP
+ movl -(%a1),-(%a0) | copy
+ movl -(%a1),-(%a0) | 8 bytes
+ movl %a0,FR_SP(%sp) | new SSP
+ moveml (%sp)+,#0x7FFF | restore user registers
+ movl (%sp),%sp | and our SP
jra _ASM_LABEL(rei) | all done
#if defined(COMPAT_13) || defined(COMPAT_SUNOS)
@@ -127,32 +127,32 @@ ENTRY_NOPROFILE(trap3)
* and require no post-trap stack adjustment.
*/
ENTRY_NOPROFILE(illinst)
- clrl %sp@-
- moveml #0xFFFF,%sp@-
+ clrl -(%sp)
+ moveml #0xFFFF,-(%sp)
moveq #T_ILLINST,%d0
jra _ASM_LABEL(fault)
ENTRY_NOPROFILE(zerodiv)
- clrl %sp@-
- moveml #0xFFFF,%sp@-
+ clrl -(%sp)
+ moveml #0xFFFF,-(%sp)
moveq #T_ZERODIV,%d0
jra _ASM_LABEL(fault)
ENTRY_NOPROFILE(chkinst)
- clrl %sp@-
- moveml #0xFFFF,%sp@-
+ clrl -(%sp)
+ moveml #0xFFFF,-(%sp)
moveq #T_CHKINST,%d0
jra _ASM_LABEL(fault)
ENTRY_NOPROFILE(trapvinst)
- clrl %sp@-
- moveml #0xFFFF,%sp@-
+ clrl -(%sp)
+ moveml #0xFFFF,-(%sp)
moveq #T_TRAPVINST,%d0
jra _ASM_LABEL(fault)
ENTRY_NOPROFILE(privinst)
- clrl %sp@-
- moveml #0xFFFF,%sp@-
+ clrl -(%sp)
+ moveml #0xFFFF,-(%sp)
moveq #T_PRIVINST,%d0
jra _ASM_LABEL(fault)
@@ -162,23 +162,23 @@ ENTRY_NOPROFILE(privinst)
* stack adjustment.
*/
ENTRY_NOPROFILE(coperr)
- clrl %sp@- | stack adjust count
- moveml #0xFFFF,%sp@-
+ clrl -(%sp) | stack adjust count
+ moveml #0xFFFF,-(%sp)
movl %usp,%a0 | get and save
- movl %a0,%sp@(FR_SP) | the user stack pointer
- clrl %sp@- | no VA arg
- clrl %sp@- | or code arg
- movl #T_COPERR,%sp@- | push trap type
+ movl %a0,FR_SP(%sp) | the user stack pointer
+ clrl -(%sp) | no VA arg
+ clrl -(%sp) | or code arg
+ movl #T_COPERR,-(%sp) | push trap type
jra _ASM_LABEL(faultstkadj) | call trap and deal with stack
| adjustments
ENTRY_NOPROFILE(fmterr)
- clrl %sp@- | stack adjust count
- moveml #0xFFFF,%sp@-
+ clrl -(%sp) | stack adjust count
+ moveml #0xFFFF,-(%sp)
movl %usp,%a0 | get and save
- movl %a0,%sp@(FR_SP) | the user stack pointer
- clrl %sp@- | no VA arg
- clrl %sp@- | or code arg
- movl #T_FMTERR,%sp@- | push trap type
+ movl %a0,FR_SP(%sp) | the user stack pointer
+ clrl -(%sp) | no VA arg
+ clrl -(%sp) | or code arg
+ movl #T_FMTERR,-(%sp) | push trap type
jra _ASM_LABEL(faultstkadj) | call trap and deal with stack
| adjustments
Index: src/sys/arch/m68k/m68k/lock_stubs.s
diff -u src/sys/arch/m68k/m68k/lock_stubs.s:1.8 src/sys/arch/m68k/m68k/lock_stubs.s:1.9
--- src/sys/arch/m68k/m68k/lock_stubs.s:1.8 Wed Nov 11 11:25:52 2009
+++ src/sys/arch/m68k/m68k/lock_stubs.s Thu Aug 1 13:42:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lock_stubs.s,v 1.8 2009/11/11 11:25:52 skrll Exp $ */
+/* $NetBSD: lock_stubs.s,v 1.9 2013/08/01 13:42:52 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -47,14 +47,14 @@
* see sun68k/sun68k/isr.c
*/
ENTRY(_atomic_cas_32)
- movl %sp@(4),%a0
+ movl 4(%sp),%a0
.globl _C_LABEL(_atomic_cas_ras_start)
_C_LABEL(_atomic_cas_ras_start):
- movl %a0@,%d0
- cmpl %sp@(8),%d0
+ movl (%a0),%d0
+ cmpl 8(%sp),%d0
jne 1f
- movl %sp@(12),%a0@
+ movl 12(%sp),(%a0)
.globl _C_LABEL(_atomic_cas_ras_end)
_C_LABEL(_atomic_cas_ras_end):
@@ -90,8 +90,8 @@ ENTRY(mutex_enter)
#if !defined(__mc68010__)
movq #0,%d0
movl _C_LABEL(curlwp),%d1
- movl %sp@(4),%a0
- casl %d0,%d1,%a0@
+ movl 4(%sp),%a0
+ casl %d0,%d1,(%a0)
bnes 1f
rts
#endif /* !__mc68010__ */
@@ -104,8 +104,8 @@ ENTRY(mutex_exit)
#if !defined(__mc68010__)
movl _C_LABEL(curlwp),%d0
movq #0,%d1
- movl %sp@(4),%a0
- casl %d0,%d1,%a0@
+ movl 4(%sp),%a0
+ casl %d0,%d1,(%a0)
bnes 1f
rts
#endif /* !__mc68010__ */
Index: src/sys/arch/m68k/m68k/reenter_syscall.s
diff -u src/sys/arch/m68k/m68k/reenter_syscall.s:1.2 src/sys/arch/m68k/m68k/reenter_syscall.s:1.3
--- src/sys/arch/m68k/m68k/reenter_syscall.s:1.2 Wed Nov 10 23:17:21 1999
+++ src/sys/arch/m68k/m68k/reenter_syscall.s Thu Aug 1 13:42:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: reenter_syscall.s,v 1.2 1999/11/10 23:17:21 thorpej Exp $ */
+/* $NetBSD: reenter_syscall.s,v 1.3 2013/08/01 13:42:52 matt Exp $ */
/*
* Written by ITOH Yasufumi.
@@ -18,8 +18,8 @@
ENTRY_NOPROFILE(reenter_syscall)
addql #4,%sp | pop PC
- movel %sp@+,%a0 | current frame addr
- movel %sp@,%d1 | stkadj
+ movel (%sp)+,%a0 | current frame addr
+ movel (%sp),%d1 | stkadj
| The m68k frame (struct trapframe) format:
| 16:l d0-d7/a0-a6/usp
@@ -35,11 +35,11 @@ ENTRY_NOPROFILE(reenter_syscall)
| copy down frame (16*4 + 2 + 2 + 2 + 4 + 2 = 76 bytes = 19 longs)
moveq #19-1,%d0
-Lcpfr: movel %a0@+,%a1@+
+Lcpfr: movel (%a0)+,(%a1)+
dbra %d0,Lcpfr
movew %d1,%sp@(16*4+2) | set stack adjust count
- movel %sp@,%sp@- | push syscall no (original d0 value)
+ movel (%sp),-(%sp) | push syscall no (original d0 value)
jbsr _C_LABEL(syscall) | re-enter syscall()
addql #4,%sp | pop syscall no
#ifdef DEBUG
@@ -50,7 +50,7 @@ Ladjzero:
#endif
moveal %sp@(15*4),%a0 | grab and restore
movel %a0,%usp | user SP
- moveml %sp@+,#0x7FFF | restore user registers
+ moveml (%sp)+,#0x7FFF | restore user registers
addql #8,%sp | pop SP and stack adjust
jra _ASM_LABEL(rei) | rte
Index: src/sys/arch/m68k/m68k/w16copy.s
diff -u src/sys/arch/m68k/m68k/w16copy.s:1.2 src/sys/arch/m68k/m68k/w16copy.s:1.3
--- src/sys/arch/m68k/m68k/w16copy.s:1.2 Mon Apr 28 20:23:27 2008
+++ src/sys/arch/m68k/m68k/w16copy.s Thu Aug 1 13:42:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: w16copy.s,v 1.2 2008/04/28 20:23:27 martin Exp $ */
+/* $NetBSD: w16copy.s,v 1.3 2013/08/01 13:42:52 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -41,15 +41,15 @@
* properly aligned 8- and 16-bit accesses.
*/
ENTRY(w16zero)
- movl %sp@(8), %d0 | get our count
+ movl 8(%sp), %d0 | get our count
beq 6f | return if count is zero
- movl %sp@(4), %a0 | get our address
+ movl 4(%sp), %a0 | get our address
| align %a0 to a 16-bit boundary:
movl %a0, %d1
btst #0, %d1 | is %a0 even?
beq 1f | if so, skip ahead
- clrb %a0@+ | zero one byte
+ clrb (%a0)+ | zero one byte
subql #1, %d0 | decrement count
| now zero 32 bits at a time:
@@ -59,11 +59,11 @@ ENTRY(w16zero)
bcs 3f | skip ahead if long count % 64k == 0
#ifdef __mc68010__
| on a 68010, 32-bit accesses become 16-bit accesses externally:
-2: clrl %a0@+
+2: clrl (%a0)+
dbf %d1, 2b | will use the 68010 loop mode
#else /* !__mc68010__ */
-2: clrw %a0@+
- clrw %a0@+
+2: clrw (%a0)+
+ clrw (%a0)+
dbf %d1, 2b
#endif /* !__mc68010__ */
| since DBcc only uses the low 16-bits of the count
@@ -75,7 +75,7 @@ ENTRY(w16zero)
4: andil #3, %d0 | odd byte count in %d0
subqw #1, %d0 | set up for dbf
bcs 6f | skip ahead if no odd bytes
-5: clrb %a0@+
+5: clrb (%a0)+
dbf %d0, 5b | will use the 68010 loop mode
6: rts
@@ -86,16 +86,16 @@ ENTRY(w16zero)
* 16-bit accesses.
*/
ENTRY(w16copy)
- movl %sp@(12), %d0 | get our count
+ movl 12(%sp), %d0 | get our count
beq 8f | return if count is zero
- movl %sp@(4), %a0 | get our source address
- movl %sp@(8), %a1 | get our destination address
+ movl 4(%sp), %a0 | get our source address
+ movl 8(%sp), %a1 | get our destination address
| align %a0 to a 16-bit boundary:
movl %a0, %d1
btst #0, %d1 | is %a0 even?
beq 1f | if so, skip ahead
- movb %a0@+, %a1@+ | copy one byte
+ movb (%a0)+, (%a1)+ | copy one byte
subql #1, %d0 | decrement count
| branch on whether or not %a1 is aligned to a 16-bit boundary:
@@ -111,11 +111,11 @@ ENTRY(w16copy)
bcs 3f | skip ahead if long count % 64k == 0
#ifdef __mc68010__
| on a 68010, 32-bit accesses become 16-bit accesses externally:
-2: movl %a0@+, %a1@+
+2: movl (%a0)+, (%a1)+
dbf %d1, 2b | will use the 68010 loop mode
#else /* !__mc68010__ */
-2: movw %a0@+, %a1@+
- movw %a0@+, %a1@+
+2: movw (%a0)+, (%a1)+
+ movw (%a0)+, (%a1)+
dbf %d1, 2b
#endif /* !__mc68010__ */
| since DBcc only uses the low 16-bits of the count
@@ -129,27 +129,27 @@ ENTRY(w16copy)
4: cmpil #4, %d0 | is count less than 4?
bcs 6f | if so, skip ahead
| prime the FIFO:
- movw %a0@+, %d1 | FIFO: xx01
+ movw (%a0)+, %d1 | FIFO: xx01
rorl #8, %d1 | FIFO: 1xx0
- movb %d1, %a1@+ | FIFO: 1xxx
+ movb %d1, (%a1)+ | FIFO: 1xxx
subql #4, %d0 | subtract 4 from count
| run the FIFO:
5: rorl #8, %d1 | FIFO: x1xx
- movw %a0@+, %d1 | FIFO: x123
+ movw (%a0)+, %d1 | FIFO: x123
rorl #8, %d1 | FIFO: 3x12
- movw %d1, %a1@+ | FIFO: 3xxx -> 1xxx
+ movw %d1, (%a1)+ | FIFO: 3xxx -> 1xxx
subql #2, %d0 | two or more bytes remaining?
bcc 5b | loop back, if so.
| flush the FIFO:
roll #8, %d1 | FIFO: xxx1
- movb %d1, %a1@+ | FIFO: xxxx
+ movb %d1, (%a1)+ | FIFO: xxxx
addl #2, %d0 | fix up count
| copy the odd bytes:
6: andil #3, %d0 | odd byte count in %d0
subqw #1, %d0 | set up for dbf
bcs 8f | skip ahead if no odd bytes
-7: movb %a0@+, %a1@+
+7: movb (%a0)+, (%a1)+
dbf %d0, 7b | use loop mode
8: rts
Index: src/sys/arch/m68k/m68k/support.s
diff -u src/sys/arch/m68k/m68k/support.s:1.7 src/sys/arch/m68k/m68k/support.s:1.8
--- src/sys/arch/m68k/m68k/support.s:1.7 Tue Nov 15 10:57:02 2011
+++ src/sys/arch/m68k/m68k/support.s Thu Aug 1 13:42:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: support.s,v 1.7 2011/11/15 10:57:02 tsutsui Exp $ */
+/* $NetBSD: support.s,v 1.8 2013/08/01 13:42:52 matt Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -53,16 +53,16 @@
* non-local gotos
*/
ENTRY(setjmp)
- movl %sp@(4),%a0 | savearea pointer
- moveml #0xFCFC,%a0@ | save d2-d7/a2-a7
- movl %sp@,%a0@(48) | and return address
+ movl 4(%sp),%a0 | savearea pointer
+ moveml #0xFCFC,(%a0) | save d2-d7/a2-a7
+ movl (%sp),48(%a0) | and return address
moveq #0,%d0 | return 0
rts
ENTRY(longjmp)
- movl %sp@(4),%a0
- moveml %a0@+,#0xFCFC
- movl %a0@,%sp@
+ movl 4(%sp),%a0
+ moveml (%a0)+,#0xFCFC
+ movl (%a0),(%sp)
moveq #1,%d0
rts
Index: src/sys/arch/m68k/m68k/svr4_sigcode.s
diff -u src/sys/arch/m68k/m68k/svr4_sigcode.s:1.7 src/sys/arch/m68k/m68k/svr4_sigcode.s:1.8
--- src/sys/arch/m68k/m68k/svr4_sigcode.s:1.7 Tue Feb 8 20:20:16 2011
+++ src/sys/arch/m68k/m68k/svr4_sigcode.s Thu Aug 1 13:42:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_sigcode.s,v 1.7 2011/02/08 20:20:16 rmind Exp $ */
+/* $NetBSD: svr4_sigcode.s,v 1.8 2013/08/01 13:42:52 matt Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -88,15 +88,15 @@
.data
.align 2
GLOBAL(svr4_sigcode)
- movl %sp@(SVR4_SIGF_HANDLER),%a0 | signal handler addr
- jsr %a0@ | call signal handler
- lea %sp@(SVR4_SIGF_UC),%a0 | ucontext to resume addr
- movl %a0,%sp@- | push pointer to ucontext
- movl #SVR4_SETCONTEXT,%sp@- | push context() subcode
+ movl SVR4_SIGF_HANDLER(%sp),%a0 | signal handler addr
+ jsr (%a0) | call signal handler
+ lea SVR4_SIGF_UC(%sp),%a0 | ucontext to resume addr
+ movl %a0,-(%sp) | push pointer to ucontext
+ movl #SVR4_SETCONTEXT,-(%sp) | push context() subcode
subql #4,%sp | padding for call frame layout
movql #SVR4_SYS_context,%d0 | setcontext(&sf.sf_uc)
trap #0 | shouldn't return
- movl %d0,%sp@(4) | so save `errno'
+ movl %d0,4(%sp) | so save `errno'
moveq #SVR4_SYS_exit,%d0 | and exit hard
trap #0 | _exit(errno)
.align 2
Index: src/sys/arch/m68k/m68k/switch_subr.s
diff -u src/sys/arch/m68k/m68k/switch_subr.s:1.29 src/sys/arch/m68k/m68k/switch_subr.s:1.30
--- src/sys/arch/m68k/m68k/switch_subr.s:1.29 Sun Feb 19 21:06:15 2012
+++ src/sys/arch/m68k/m68k/switch_subr.s Thu Aug 1 13:42:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: switch_subr.s,v 1.29 2012/02/19 21:06:15 rmind Exp $ */
+/* $NetBSD: switch_subr.s,v 1.30 2013/08/01 13:42:52 matt Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation.
@@ -88,7 +88,7 @@ GLOBAL(_Idle) /* For sun2/sun3's cloc
* Switch to the specific next LWP.
*/
ENTRY(cpu_switchto)
- movl %sp@(4),%a1 | fetch `current' lwp
+ movl 4(%sp),%a1 | fetch `current' lwp
#ifdef M68010
movl %a1,%d0
tstl %d0
@@ -100,10 +100,10 @@ ENTRY(cpu_switchto)
/*
* Save state of previous process in its pcb.
*/
- movl %a1@(L_PCB),%a1
- moveml %d2-%d7/%a2-%a7,%a1@(PCB_REGS) | save non-scratch registers
+ movl L_PCB(%a1),%a1
+ moveml %d2-%d7/%a2-%a7,PCB_REGS(%a1) | save non-scratch registers
movl %usp,%a2 | grab USP (a2 has been saved)
- movl %a2,%a1@(PCB_USP) | and save it
+ movl %a2,PCB_USP(%a1) | and save it
#ifdef _M68K_CUSTOM_FPU_CTX
jbsr _ASM_LABEL(m68k_fpuctx_save)
@@ -113,50 +113,50 @@ ENTRY(cpu_switchto)
tstl _C_LABEL(fputype) | Do we have an FPU?
jeq Lcpu_switch_nofpsave | No Then don't attempt save.
#endif
- lea %a1@(PCB_FPCTX),%a2 | pointer to FP save area
- fsave %a2@ | save FP state
+ lea PCB_FPCTX(%a1),%a2 | pointer to FP save area
+ fsave (%a2) | save FP state
#if defined(M68020) || defined(M68030) || defined(M68040)
#if defined(M68060)
cmpl #FPU_68060,_C_LABEL(fputype)
jeq Lcpu_switch_savfp60
#endif
- tstb %a2@ | null state frame?
+ tstb (%a2) | null state frame?
jeq Lcpu_switch_nofpsave | yes, all done
- fmovem %fp0-%fp7,%a2@(FPF_REGS) | save FP general registers
- fmovem %fpcr/%fpsr/%fpi,%a2@(FPF_FPCR) | save FP control registers
+ fmovem %fp0-%fp7,FPF_REGS(%a2) | save FP general registers
+ fmovem %fpcr/%fpsr/%fpi,FPF_FPCR(%a2) | save FP control registers
#if defined(M68060)
jra Lcpu_switch_nofpsave
#endif
#endif
#if defined(M68060)
Lcpu_switch_savfp60:
- tstb %a2@(2) | null state frame?
+ tstb 2(%a2) | null state frame?
jeq Lcpu_switch_nofpsave | yes, all done
- fmovem %fp0-%fp7,%a2@(FPF_REGS) | save FP general registers
- fmovem %fpcr,%a2@(FPF_FPCR) | save FP control registers
- fmovem %fpsr,%a2@(FPF_FPSR)
- fmovem %fpi,%a2@(FPF_FPI)
+ fmovem %fp0-%fp7,FPF_REGS(%a2) | save FP general registers
+ fmovem %fpcr,FPF_FPCR(%a2) | save FP control registers
+ fmovem %fpsr,FPF_FPSR(%a2)
+ fmovem %fpi,FPF_FPI(%a2)
#endif
Lcpu_switch_nofpsave:
#endif /* FPCOPROC */
#endif /* !_M68K_CUSTOM_FPU_CTX */
Lcpu_switch_noctxsave:
- movl %sp@(8),%a0 | get newlwp
+ movl 8(%sp),%a0 | get newlwp
movl %a0,_C_LABEL(curlwp)
- movl %a0@(L_PCB),%a1 | get its pcb
+ movl L_PCB(%a0),%a1 | get its pcb
movl %a1,_C_LABEL(curpcb)
#if defined(sun2) || defined(sun3)
- movl %a0@(L_PROC),%a2
- movl %a2@(P_VMSPACE),%a2 | vm = p->p_vmspace
+ movl L_PROC(%a0),%a2
+ movl P_VMSPACE(%a2),%a2 | vm = p->p_vmspace
#if defined(DIAGNOSTIC) && !defined(sun2)
tstl %a2 | vm == VM_MAP_NULL?
jeq Lcpu_switch_badsw | panic
#endif
- pea %a0@ | save newlwp
+ pea (%a0) | save newlwp
#if !defined(_SUN3X_) || defined(PMAP_DEBUG)
- movl %a2@(VM_PMAP),%sp@- | push vm->vm_map.pmap
+ movl VM_PMAP(%a2),-(%sp) | push vm->vm_map.pmap
jbsr _C_LABEL(_pmap_switch) | _pmap_switch(pmap)
addql #4,%sp
movl _C_LABEL(curpcb),%a1 | restore curpcb
@@ -164,16 +164,16 @@ Lcpu_switch_noctxsave:
#else
/* Use this inline version on sun3x when not debugging the pmap. */
lea _C_LABEL(kernel_crp),%a3 | our CPU Root Ptr. (CRP)
- movl %a2@(VM_PMAP),%a2 | pmap = vm->vm_map.pmap
- movl %a2@(PM_A_PHYS),%d0 | phys = pmap->pm_a_phys
- cmpl %a3@(4),%d0 | == kernel_crp.rp_addr ?
+ movl VM_PMAP(%a2),%a2 | pmap = vm->vm_map.pmap
+ movl PM_A_PHYS(%a2),%d0 | phys = pmap->pm_a_phys
+ cmpl 4(%a3),%d0 | == kernel_crp.rp_addr ?
jeq Lsame_mmuctx | skip loadcrp/flush
/* OK, it is a new MMU context. Load it up. */
- movl %d0,%a3@(4)
+ movl %d0,4(%a3)
movl #CACHE_CLR,%d0
movc %d0,%cacr | invalidate cache(s)
pflusha | flush entire TLB
- pmove %a3@,%crp | load new user root pointer
+ pmove (%a3),%crp | load new user root pointer
Lsame_mmuctx:
#endif /* !defined(_SUN3X_) || defined(PMAP_DEBUG) */
#else /* !defined(sun2) && !defined(sun3) */
@@ -182,7 +182,7 @@ Lsame_mmuctx:
* XXX Should remember the last USTP value loaded, and call this
* XXX only of it has changed.
*/
- pea %a0@ | push newlwp
+ pea (%a0) | push newlwp
jbsr _C_LABEL(pmap_activate) | pmap_activate(newlwp)
/* Note that newlwp will be popped off the stack later. */
#endif
@@ -191,51 +191,51 @@ Lsame_mmuctx:
* Check for restartable atomic sequences (RAS)
*/
movl _C_LABEL(curlwp),%a0
- movl %a0@(L_PROC),%a2
- tstl %a2@(P_RASLIST)
+ movl L_PROC(%a0),%a2
+ tstl P_RASLIST(%a2)
jeq 1f
- movl %a0@(L_MD_REGS),%a1
- movl %a1@(TF_PC),%sp@-
- movl %a2,%sp@-
+ movl L_MD_REGS(%a0),%a1
+ movl TF_PC(%a1),-(%sp)
+ movl %a2,-(%sp)
jbsr _C_LABEL(ras_lookup)
addql #8,%sp
movql #-1,%d0
cmpl %a0,%d0
jeq 1f
movl _C_LABEL(curlwp),%a1
- movl %a1@(L_MD_REGS),%a1
- movl %a0,%a1@(TF_PC)
+ movl L_MD_REGS(%a1),%a1
+ movl %a0,TF_PC(%a1)
1:
- movl %sp@+,%d0 | restore newlwp
+ movl (%sp)+,%d0 | restore newlwp
movl _C_LABEL(curpcb),%a1 | restore pcb
- movl %sp@(4),%d1 | restore oldlwp for a return value
+ movl 4(%sp),%d1 | restore oldlwp for a return value
lea _ASM_LABEL(tmpstk),%sp | now goto a tmp stack for NMI
- moveml %a1@(PCB_REGS),%d2-%d7/%a2-%a7 | and registers
- movl %a1@(PCB_USP),%a0
+ moveml PCB_REGS(%a1),%d2-%d7/%a2-%a7 | and registers
+ movl PCB_USP(%a1),%a0
movl %a0,%usp | and USP
#ifdef _M68K_CUSTOM_FPU_CTX
- moveml %d0/%d1,%sp@-
+ moveml %d0/%d1,-(%sp)
jbsr _ASM_LABEL(m68k_fpuctx_restore)
- moveml %sp@+,%d0/%d1
+ moveml (%sp)+,%d0/%d1
#else
#ifdef FPCOPROC
#ifdef FPU_EMULATE
tstl _C_LABEL(fputype) | Do we have an FPU?
jeq Lcpu_switch_nofprest | No Then don't attempt restore.
#endif
- lea %a1@(PCB_FPCTX),%a0 | pointer to FP save area
+ lea PCB_FPCTX(%a1),%a0 | pointer to FP save area
#if defined(M68020) || defined(M68030) || defined(M68040)
#if defined(M68060)
cmpl #FPU_68060,_C_LABEL(fputype)
jeq Lcpu_switch_resfp60rest1
#endif
- tstb %a0@ | null state frame?
+ tstb (%a0) | null state frame?
jeq Lcpu_switch_resfprest | yes, easy
- fmovem %a0@(FPF_FPCR),%fpcr/%fpsr/%fpi | restore FP control registers
- fmovem %a0@(FPF_REGS),%fp0-%fp7 | restore FP general registers
+ fmovem FPF_FPCR(%a0),%fpcr/%fpsr/%fpi | restore FP control registers
+ fmovem FPF_REGS(%a0),%fp0-%fp7 | restore FP general registers
#if defined(M68060)
jra Lcpu_switch_resfprest
#endif
@@ -243,15 +243,15 @@ Lsame_mmuctx:
#if defined(M68060)
Lcpu_switch_resfp60rest1:
- tstb %a0@(2) | null state frame?
+ tstb 2(%a0) | null state frame?
jeq Lcpu_switch_resfprest | yes, easy
- fmovem %a0@(FPF_FPCR),%fpcr | restore FP control registers
- fmovem %a0@(FPF_FPSR),%fpsr
- fmovem %a0@(FPF_FPI),%fpi
- fmovem %a0@(FPF_REGS),%fp0-%fp7 | restore FP general registers
+ fmovem FPF_FPCR(%a0),%fpcr | restore FP control registers
+ fmovem FPF_FPSR(%a0),%fpsr
+ fmovem FPF_FPI(%a0),%fpi
+ fmovem FPF_REGS(%a0),%fp0-%fp7 | restore FP general registers
#endif
Lcpu_switch_resfprest:
- frestore %a0@ | restore state
+ frestore (%a0) | restore state
#endif /* FPCOPROC */
#endif /* !_M68K_CUSTOM_FPU_CTX */
@@ -269,11 +269,11 @@ Lcpu_switch_badsw:
* Update pcb, saving current processor state.
*/
ENTRY(savectx)
- movl %sp@(4),%a1
- movw %sr,%a1@(PCB_PS)
+ movl 4(%sp),%a1
+ movw %sr,PCB_PS(%a1)
movl %usp,%a0 | grab USP
- movl %a0,%a1@(PCB_USP) | and save it
- moveml %d2-%d7/%a2-%a7,%a1@(PCB_REGS) | save non-scratch registers
+ movl %a0,PCB_USP(%a1) | and save it
+ moveml %d2-%d7/%a2-%a7,PCB_REGS(%a1) | save non-scratch registers
#ifdef _M68K_CUSTOM_FPU_CTX
jbsr _ASM_LABEL(m68k_fpuctx_save)
@@ -283,29 +283,29 @@ ENTRY(savectx)
tstl _C_LABEL(fputype) | Do we have FPU?
jeq Lsavectx_nofpsave | No? Then don't save state.
#endif
- lea %a1@(PCB_FPCTX),%a0 | pointer to FP save area
- fsave %a0@ | save FP state
+ lea PCB_FPCTX(%a1),%a0 | pointer to FP save area
+ fsave (%a0) | save FP state
#if defined(M68020) || defined(M68030) || defined(M68040)
#if defined(M68060)
cmpl #FPU_68060,_C_LABEL(fputype)
jeq Lsavectx_savfp60
#endif
- tstb %a0@ | null state frame?
+ tstb (%a0) | null state frame?
jeq Lsavectx_nofpsave | yes, all done
- fmovem %fp0-%fp7,%a0@(FPF_REGS) | save FP general registers
- fmovem %fpcr/%fpsr/%fpi,%a0@(FPF_FPCR) | save FP control registers
+ fmovem %fp0-%fp7,FPF_REGS(%a0) | save FP general registers
+ fmovem %fpcr/%fpsr/%fpi,FPF_FPCR(%a0) | save FP control registers
#if defined(M68060)
jra Lsavectx_nofpsave
#endif
#endif
#if defined(M68060)
Lsavectx_savfp60:
- tstb %a0@(2) | null state frame?
+ tstb 2(%a0) | null state frame?
jeq Lsavectx_nofpsave | yes, all done
- fmovem %fp0-%fp7,%a0@(FPF_REGS) | save FP general registers
- fmovem %fpcr,%a0@(FPF_FPCR) | save FP control registers
- fmovem %fpsr,%a0@(FPF_FPSR)
- fmovem %fpi,%a0@(FPF_FPI)
+ fmovem %fp0-%fp7,FPF_REGS(%a0) | save FP general registers
+ fmovem %fpcr,FPF_FPCR(%a0) | save FP control registers
+ fmovem %fpsr,FPF_FPSR(%a0)
+ fmovem %fpi,FPF_FPI(%a0)
#endif
Lsavectx_nofpsave:
#endif /* FPCOPROC */
@@ -323,10 +323,10 @@ Lsavectx_nofpsave:
* Before calling, make sure the machine actually has an FPU ...
*/
ENTRY(m68k_make_fpu_idle_frame)
- clrl %sp@-
+ clrl -(%sp)
fnop
- frestore %sp@ | Effectively `resets' the FPU
+ frestore (%sp) | Effectively `resets' the FPU
fnop
/* Loading '0.0' will change FPU to "idle". */
@@ -335,11 +335,11 @@ ENTRY(m68k_make_fpu_idle_frame)
/* Save the resulting idle frame into the buffer */
lea _C_LABEL(m68k_cached_fpu_idle_frame),%a0
- fsave %a0@
+ fsave (%a0)
fnop
/* Reset the FPU again */
- frestore %sp@
+ frestore (%sp)
fnop
addql #4,%sp
rts
@@ -350,59 +350,59 @@ ENTRY(m68k_make_fpu_idle_frame)
*/
#ifdef FPCOPROC
ENTRY(m68881_save)
- movl %sp@(4),%a0 | save area pointer
- fsave %a0@ | save state
+ movl 4(%sp),%a0 | save area pointer
+ fsave (%a0) | save state
#if defined(M68020) || defined(M68030) || defined(M68040)
#if defined(M68060)
cmpl #FPU_68060,_C_LABEL(fputype)
jeq Lm68060fpsave
#endif
Lm68881fpsave:
- tstb %a0@ | null state frame?
+ tstb (%a0) | null state frame?
jeq Lm68881sdone | yes, all done
- fmovem %fp0-%fp7,%a0@(FPF_REGS) | save FP general registers
- fmovem %fpcr/%fpsr/%fpi,%a0@(FPF_FPCR) | save FP control registers
+ fmovem %fp0-%fp7,FPF_REGS(%a0) | save FP general registers
+ fmovem %fpcr/%fpsr/%fpi,FPF_FPCR(%a0) | save FP control registers
Lm68881sdone:
rts
#endif
#if defined(M68060)
Lm68060fpsave:
- tstb %a0@(2) | null state frame?
+ tstb 2(%a0) | null state frame?
jeq Lm68060sdone | yes, all done
- fmovem %fp0-%fp7,%a0@(FPF_REGS) | save FP general registers
- fmovem %fpcr,%a0@(FPF_FPCR) | save FP control registers
- fmovem %fpsr,%a0@(FPF_FPSR)
- fmovem %fpi,%a0@(FPF_FPI)
+ fmovem %fp0-%fp7,FPF_REGS(%a0) | save FP general registers
+ fmovem %fpcr,FPF_FPCR(%a0) | save FP control registers
+ fmovem %fpsr,FPF_FPSR(%a0)
+ fmovem %fpi,FPF_FPI(%a0)
Lm68060sdone:
rts
#endif
ENTRY(m68881_restore)
- movl %sp@(4),%a0 | save area pointer
+ movl 4(%sp),%a0 | save area pointer
#if defined(M68020) || defined(M68030) || defined(M68040)
#if defined(M68060)
cmpl #FPU_68060,_C_LABEL(fputype)
jeq Lm68060fprestore
#endif
Lm68881fprestore:
- tstb %a0@ | null state frame?
+ tstb (%a0) | null state frame?
jeq Lm68881rdone | yes, easy
- fmovem %a0@(FPF_FPCR),%fpcr/%fpsr/%fpi | restore FP control registers
- fmovem %a0@(FPF_REGS),%fp0-%fp7 | restore FP general registers
+ fmovem FPF_FPCR(%a0),%fpcr/%fpsr/%fpi | restore FP control registers
+ fmovem FPF_REGS(%a0),%fp0-%fp7 | restore FP general registers
Lm68881rdone:
- frestore %a0@ | restore state
+ frestore (%a0) | restore state
rts
#endif
#if defined(M68060)
Lm68060fprestore:
- tstb %a0@(2) | null state frame?
+ tstb 2(%a0) | null state frame?
jeq Lm68060fprdone | yes, easy
- fmovem %a0@(FPF_FPCR),%fpcr | restore FP control registers
- fmovem %a0@(FPF_FPSR),%fpsr
- fmovem %a0@(FPF_FPI),%fpi
- fmovem %a0@(FPF_REGS),%fp0-%fp7 | restore FP general registers
+ fmovem FPF_FPCR(%a0),%fpcr | restore FP control registers
+ fmovem FPF_FPSR(%a0),%fpsr
+ fmovem FPF_FPI(%a0),%fpi
+ fmovem FPF_REGS(%a0),%fp0-%fp7 | restore FP general registers
Lm68060fprdone:
- frestore %a0@ | restore state
+ frestore (%a0) | restore state
rts
#endif
#endif
@@ -413,15 +413,15 @@ Lm68060fprdone:
* %a0 will have old lwp from cpu_switchto(), and %a4 is new lwp
*/
ENTRY_NOPROFILE(lwp_trampoline)
- movl %a4,%sp@- | new lwp
- movl %a0,%sp@- | old lpw
+ movl %a4,-(%sp) | new lwp
+ movl %a0,-(%sp) | old lpw
jbsr _C_LABEL(lwp_startup)
addql #8,%sp
- movl %a3,%sp@- | push function arg
- jbsr %a2@ | call function
+ movl %a3,-(%sp) | push function arg
+ jbsr (%a2) | call function
addql #4,%sp | pop arg
- movl %sp@(FR_SP),%a0 | grab and load
+ movl FR_SP(%sp),%a0 | grab and load
movl %a0,%usp | user SP
- moveml %sp@+,#0x7FFF | restore most user regs
+ moveml (%sp)+,#0x7FFF | restore most user regs
addql #8,%sp | toss SP and stack adjust
jra _ASM_LABEL(rei) | and return
