Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/m68k/m68k Convert to motorola style.
details: https://anonhg.NetBSD.org/src/rev/e78c6d8a632e
branches: trunk
changeset: 788978:e78c6d8a632e
user: matt <matt%NetBSD.org@localhost>
date: Thu Aug 01 13:42:52 2013 +0000
description:
Convert to motorola style.
diffstat:
sys/arch/m68k/m68k/compat_13_sigreturn13.s | 32 ++--
sys/arch/m68k/m68k/compat_16_sigreturn14.s | 32 ++--
sys/arch/m68k/m68k/copypage.s | 58 ++++----
sys/arch/m68k/m68k/lock_stubs.s | 18 +-
sys/arch/m68k/m68k/reenter_syscall.s | 12 +-
sys/arch/m68k/m68k/sigcode.s | 8 +-
sys/arch/m68k/m68k/sunos_sigcode.s | 8 +-
sys/arch/m68k/m68k/support.s | 14 +-
sys/arch/m68k/m68k/svr4_sigcode.s | 14 +-
sys/arch/m68k/m68k/switch_subr.s | 190 ++++++++++++++--------------
sys/arch/m68k/m68k/trap_subr.s | 84 ++++++------
sys/arch/m68k/m68k/w16copy.s | 42 +++---
12 files changed, 256 insertions(+), 256 deletions(-)
diffs (truncated from 1111 to 300 lines):
diff -r 359b15d8c325 -r e78c6d8a632e sys/arch/m68k/m68k/compat_13_sigreturn13.s
--- a/sys/arch/m68k/m68k/compat_13_sigreturn13.s Thu Aug 01 13:11:22 2013 +0000
+++ b/sys/arch/m68k/m68k/compat_13_sigreturn13.s Thu Aug 01 13:42:52 2013 +0000
@@ -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
diff -r 359b15d8c325 -r e78c6d8a632e sys/arch/m68k/m68k/compat_16_sigreturn14.s
--- a/sys/arch/m68k/m68k/compat_16_sigreturn14.s Thu Aug 01 13:11:22 2013 +0000
+++ b/sys/arch/m68k/m68k/compat_16_sigreturn14.s Thu Aug 01 13:42:52 2013 +0000
@@ -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
diff -r 359b15d8c325 -r e78c6d8a632e sys/arch/m68k/m68k/copypage.s
--- a/sys/arch/m68k/m68k/copypage.s Thu Aug 01 13:11:22 2013 +0000
+++ b/sys/arch/m68k/m68k/copypage.s Thu Aug 01 13:42:52 2013 +0000
@@ -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 @@
* 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 @@
* 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 @@
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
diff -r 359b15d8c325 -r e78c6d8a632e sys/arch/m68k/m68k/lock_stubs.s
--- a/sys/arch/m68k/m68k/lock_stubs.s Thu Aug 01 13:11:22 2013 +0000
+++ b/sys/arch/m68k/m68k/lock_stubs.s Thu Aug 01 13:42:52 2013 +0000
@@ -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 @@
#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 @@
#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__ */
diff -r 359b15d8c325 -r e78c6d8a632e sys/arch/m68k/m68k/reenter_syscall.s
--- a/sys/arch/m68k/m68k/reenter_syscall.s Thu Aug 01 13:11:22 2013 +0000
+++ b/sys/arch/m68k/m68k/reenter_syscall.s Thu Aug 01 13:42:52 2013 +0000
@@ -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 @@
| copy down frame (16*4 + 2 + 2 + 2 + 4 + 2 = 76 bytes = 19 longs)
moveq #19-1,%d0
-Lcpfr: movel %a0@+,%a1@+
Home |
Main Index |
Thread Index |
Old Index