Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The recent buserr handler cleanup in the Amiga locore.s made the label 

_buserr point to the 68020/030 buserr code _only_. This has broken access
error handling in the 060 support code.
This is repaired by jumping to _buserr60 from the 060SP, and by providing
a _buserr60 label identical to the _buserr in the unchanged m68k ports
using the 68060.
This commit is contained in:
is 1997-06-26 22:28:42 +00:00
parent b59135a6fb
commit f3efbb406a
4 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/atari/atari/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.41 1997/06/05 19:45:32 leo Exp $ */
/* $NetBSD: locore.s,v 1.42 1997/06/26 22:28:46 is Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -86,6 +86,8 @@ _doadump:
#include <m68k/m68k/trap_subr.s>
.globl _trap, _nofault, _longjmp
.globl _buserr60 | for 060SP
_buserr60:
_buserr:
tstl _nofault | device probe?
jeq _addrerr | no, handle as usual

74
sys/arch/m68k/060sp/netbsd.S
View File

@ -1,5 +1,5 @@
#
# $NetBSD: netbsd.S,v 1.1 1996/05/15 21:06:24 is Exp $
# $NetBSD: netbsd.S,v 1.2 1997/06/26 22:28:42 is Exp $
#
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# MOTOROLA MICROPROCESSOR & MEMORY TECHNOLOGY GROUP
@ -93,19 +93,19 @@
#
.global _060_dmem_write
_060_dmem_write:
btst #0x5,a6@(0x4) |# check for supervisor state
btst #0x5,a6@(0x4) |# check for supervisor state
beqs user_write
super_write:
moveb a0@+,a1@+ |# copy 1 byte
moveb a0@+,a1@+ |# copy 1 byte
subql #0x1,d0 |# decr byte counter
bnes super_write |# quit if ctr = 0
bnes super_write |# quit if ctr = 0
clrl d1 |# return success
rts
user_write:
movel d0,sp@- |# pass: counter
movel a1,sp@- |# pass: user dst
movel a0,sp@- |# pass: supervisor src
bsrl _copyout |# write byte to user mem
bsrl _copyout |# write byte to user mem
movel d0,d1 |# return success
addl #0xc,sp |# clear 3 lw params
rts
@ -127,12 +127,12 @@ user_write:
.global _060_dmem_read
_060_imem_read:
_060_dmem_read:
btst #0x5,a6@(0x4) |# check for supervisor state
btst #0x5,a6@(0x4) |# check for supervisor state
beqs user_read
super_read:
moveb a0@+,a1@+ |# copy 1 byte
moveb a0@+,a1@+ |# copy 1 byte
subql #0x1,d0 |# decr byte counter
bnes super_read |# quit if ctr = 0
bnes super_read |# quit if ctr = 0
clrl d1 |# return success
rts
user_read:
@ -158,12 +158,12 @@ user_read:
#
.global _060_dmem_read_byte
_060_dmem_read_byte:
btst #0x5,a6@(0x4) |# check for supervisor state
btst #0x5,a6@(0x4) |# check for supervisor state
bnes dmrbs |# supervisor
dmrbu:
clrl sp@- |# clear space on stack for result
movel #0x1,sp@- |# pass: # bytes to copy
pea sp@(0x7) |# pass: dst addr (stack)
movel #0x1,sp@- |# pass: # bytes to copy
pea sp@(0x7) |# pass: dst addr (stack)
movel a0,sp@- |# pass: src addr (user mem)
bsrl _copyin |# "copy in" the data
movel d0,d1 |# return success
@ -195,12 +195,12 @@ dmrbs:
_060_imem_read_word:
_060_dmem_read_word:
btst #0x5,a6@(0x4) |# check for supervisor state
btst #0x5,a6@(0x4) |# check for supervisor state
bnes dmrws |# supervisor
dmrwu:
clrl sp@- |# clear result space on stack
movel #0x2,sp@- |# pass: # bytes to copy
pea sp@(0x6) |# pass: dst addr (stack)
movel #0x2,sp@- |# pass: # bytes to copy
pea sp@(0x6) |# pass: dst addr (stack)
movel a0,sp@- |# pass: src addr (user mem)
bsrl _copyin |# "copy in" the data
movel d0,d1 |# return success
@ -235,12 +235,12 @@ dmrws:
_060_imem_read_long:
_060_dmem_read_long:
btst #0x5,a6@(0x4) |# check for supervisor state
btst #0x5,a6@(0x4) |# check for supervisor state
bnes dmrls |# supervisor
dmrlu:
subql #0x4,sp |# clear result space on stack
movel #0x4,sp@- |# pass: # bytes to copy
pea sp@(0x4) |# pass: dst addr (stack)
movel #0x4,sp@- |# pass: # bytes to copy
pea sp@(0x4) |# pass: dst addr (stack)
movel a0,sp@- |# pass: src addr (user mem)
bsrl _copyin |# "copy in" the data
movel d0,d1 |# return success
@ -266,16 +266,16 @@ dmrls:
#
.global _060_dmem_write_byte
_060_dmem_write_byte:
btst #0x5,a6@(0x4) |# check for supervisor state
btst #0x5,a6@(0x4) |# check for supervisor state
bnes dmwbs |# supervisor
dmwbu:
movel d0,sp@- |# put src on stack
movel #0x1,sp@- |# pass: # bytes to copy
movel #0x1,sp@- |# pass: # bytes to copy
movel a0,sp@- |# pass: dst addr (user mem)
pea sp@(0xb) |# pass: src addr (stack)
bsrl _copyout |# "copy out" the data
pea sp@(0xb) |# pass: src addr (stack)
bsrl _copyout |# "copy out" the data
movel d0,d1 |# return success
addl #0x10,sp |# delete params + src
addl #0x10,sp |# delete params + src
rts
dmwbs:
moveb d0,a0@ |# store super byte
@ -296,16 +296,16 @@ dmwbs:
#
.global _060_dmem_write_word
_060_dmem_write_word:
btst #0x5,a6@(0x4) |# check for supervisor state
btst #0x5,a6@(0x4) |# check for supervisor state
bnes dmwws |# supervisor
dmwwu:
movel d0,sp@- |# put src on stack
movel #0x2,sp@- |# pass: # bytes to copy
movel #0x2,sp@- |# pass: # bytes to copy
movel a0,sp@- |# pass: dst addr (user mem)
pea sp@(0xa) |# pass: src addr (stack)
bsrl _copyout |# "copy out" the data
pea sp@(0xa) |# pass: src addr (stack)
bsrl _copyout |# "copy out" the data
movel d0,d1 |# return success
addl #0x10,sp |# delete params + src
addl #0x10,sp |# delete params + src
rts
dmwws:
movew d0,a0@ |# store super word
@ -326,16 +326,16 @@ dmwws:
#
.global _060_dmem_write_long
_060_dmem_write_long:
btst #0x5,a6@(0x4) |# check for supervisor state
btst #0x5,a6@(0x4) |# check for supervisor state
bnes dmwls |# supervisor
dmwlu:
movel d0,sp@- |# put src on stack
movel #0x4,sp@- |# pass: # bytes to copy
movel #0x4,sp@- |# pass: # bytes to copy
movel a0,sp@- |# pass: dst addr (user mem)
pea sp@(0x8) |# pass: src addr (stack)
bsrl _copyout |# "copy out" the data
pea sp@(0x8) |# pass: src addr (stack)
bsrl _copyout |# "copy out" the data
movel d0,d1 |# return success
addl #0x10,sp |# delete params + src
addl #0x10,sp |# delete params + src
rts
dmwls:
movel d0,a0@ |# store super longword
@ -365,14 +365,12 @@ _060_real_trace:
# handler for access error exceptions. The exception stack frame is an
# 8-word access error frame.
#
# The sample routine below simply executes an "rte" instruction which
# is most likely the incorrect thing to do and could put the system
# into an infinite loop.
# We jump directly to the 68060 buserr handler.
# If we had a sane ld, we could use use that entry point directly...
#
.global _060_real_access
.globl _060_real_access,_buserr60
_060_real_access:
.globl _buserr
jmp _buserr
jra _buserr60
.include "inetbsd.S"
.include "fnetbsd.S"

74
sys/arch/m68k/060sp/netbsd060sp.S
View File

@ -1,5 +1,5 @@
#
# $NetBSD: netbsd060sp.S,v 1.1 1996/05/15 21:06:24 is Exp $
# $NetBSD: netbsd060sp.S,v 1.2 1997/06/26 22:28:42 is Exp $
#
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# MOTOROLA MICROPROCESSOR & MEMORY TECHNOLOGY GROUP
@ -93,19 +93,19 @@
#
.global _060_dmem_write
_060_dmem_write:
btst #0x5,a6@(0x4) |# check for supervisor state
btst #0x5,a6@(0x4) |# check for supervisor state
beqs user_write
super_write:
moveb a0@+,a1@+ |# copy 1 byte
moveb a0@+,a1@+ |# copy 1 byte
subql #0x1,d0 |# decr byte counter
bnes super_write |# quit if ctr = 0
bnes super_write |# quit if ctr = 0
clrl d1 |# return success
rts
user_write:
movel d0,sp@- |# pass: counter
movel a1,sp@- |# pass: user dst
movel a0,sp@- |# pass: supervisor src
bsrl _copyout |# write byte to user mem
bsrl _copyout |# write byte to user mem
movel d0,d1 |# return success
addl #0xc,sp |# clear 3 lw params
rts
@ -127,12 +127,12 @@ user_write:
.global _060_dmem_read
_060_imem_read:
_060_dmem_read:
btst #0x5,a6@(0x4) |# check for supervisor state
btst #0x5,a6@(0x4) |# check for supervisor state
beqs user_read
super_read:
moveb a0@+,a1@+ |# copy 1 byte
moveb a0@+,a1@+ |# copy 1 byte
subql #0x1,d0 |# decr byte counter
bnes super_read |# quit if ctr = 0
bnes super_read |# quit if ctr = 0
clrl d1 |# return success
rts
user_read:
@ -158,12 +158,12 @@ user_read:
#
.global _060_dmem_read_byte
_060_dmem_read_byte:
btst #0x5,a6@(0x4) |# check for supervisor state
btst #0x5,a6@(0x4) |# check for supervisor state
bnes dmrbs |# supervisor
dmrbu:
clrl sp@- |# clear space on stack for result
movel #0x1,sp@- |# pass: # bytes to copy
pea sp@(0x7) |# pass: dst addr (stack)
movel #0x1,sp@- |# pass: # bytes to copy
pea sp@(0x7) |# pass: dst addr (stack)
movel a0,sp@- |# pass: src addr (user mem)
bsrl _copyin |# "copy in" the data
movel d0,d1 |# return success
@ -195,12 +195,12 @@ dmrbs:
_060_imem_read_word:
_060_dmem_read_word:
btst #0x5,a6@(0x4) |# check for supervisor state
btst #0x5,a6@(0x4) |# check for supervisor state
bnes dmrws |# supervisor
dmrwu:
clrl sp@- |# clear result space on stack
movel #0x2,sp@- |# pass: # bytes to copy
pea sp@(0x6) |# pass: dst addr (stack)
movel #0x2,sp@- |# pass: # bytes to copy
pea sp@(0x6) |# pass: dst addr (stack)
movel a0,sp@- |# pass: src addr (user mem)
bsrl _copyin |# "copy in" the data
movel d0,d1 |# return success
@ -235,12 +235,12 @@ dmrws:
_060_imem_read_long:
_060_dmem_read_long:
btst #0x5,a6@(0x4) |# check for supervisor state
btst #0x5,a6@(0x4) |# check for supervisor state
bnes dmrls |# supervisor
dmrlu:
subql #0x4,sp |# clear result space on stack
movel #0x4,sp@- |# pass: # bytes to copy
pea sp@(0x4) |# pass: dst addr (stack)
movel #0x4,sp@- |# pass: # bytes to copy
pea sp@(0x4) |# pass: dst addr (stack)
movel a0,sp@- |# pass: src addr (user mem)
bsrl _copyin |# "copy in" the data
movel d0,d1 |# return success
@ -266,16 +266,16 @@ dmrls:
#
.global _060_dmem_write_byte
_060_dmem_write_byte:
btst #0x5,a6@(0x4) |# check for supervisor state
btst #0x5,a6@(0x4) |# check for supervisor state
bnes dmwbs |# supervisor
dmwbu:
movel d0,sp@- |# put src on stack
movel #0x1,sp@- |# pass: # bytes to copy
movel #0x1,sp@- |# pass: # bytes to copy
movel a0,sp@- |# pass: dst addr (user mem)
pea sp@(0xb) |# pass: src addr (stack)
bsrl _copyout |# "copy out" the data
pea sp@(0xb) |# pass: src addr (stack)
bsrl _copyout |# "copy out" the data
movel d0,d1 |# return success
addl #0x10,sp |# delete params + src
addl #0x10,sp |# delete params + src
rts
dmwbs:
moveb d0,a0@ |# store super byte
@ -296,16 +296,16 @@ dmwbs:
#
.global _060_dmem_write_word
_060_dmem_write_word:
btst #0x5,a6@(0x4) |# check for supervisor state
btst #0x5,a6@(0x4) |# check for supervisor state
bnes dmwws |# supervisor
dmwwu:
movel d0,sp@- |# put src on stack
movel #0x2,sp@- |# pass: # bytes to copy
movel #0x2,sp@- |# pass: # bytes to copy
movel a0,sp@- |# pass: dst addr (user mem)
pea sp@(0xa) |# pass: src addr (stack)
bsrl _copyout |# "copy out" the data
pea sp@(0xa) |# pass: src addr (stack)
bsrl _copyout |# "copy out" the data
movel d0,d1 |# return success
addl #0x10,sp |# delete params + src
addl #0x10,sp |# delete params + src
rts
dmwws:
movew d0,a0@ |# store super word
@ -326,16 +326,16 @@ dmwws:
#
.global _060_dmem_write_long
_060_dmem_write_long:
btst #0x5,a6@(0x4) |# check for supervisor state
btst #0x5,a6@(0x4) |# check for supervisor state
bnes dmwls |# supervisor
dmwlu:
movel d0,sp@- |# put src on stack
movel #0x4,sp@- |# pass: # bytes to copy
movel #0x4,sp@- |# pass: # bytes to copy
movel a0,sp@- |# pass: dst addr (user mem)
pea sp@(0x8) |# pass: src addr (stack)
bsrl _copyout |# "copy out" the data
pea sp@(0x8) |# pass: src addr (stack)
bsrl _copyout |# "copy out" the data
movel d0,d1 |# return success
addl #0x10,sp |# delete params + src
addl #0x10,sp |# delete params + src
rts
dmwls:
movel d0,a0@ |# store super longword
@ -365,14 +365,12 @@ _060_real_trace:
# handler for access error exceptions. The exception stack frame is an
# 8-word access error frame.
#
# The sample routine below simply executes an "rte" instruction which
# is most likely the incorrect thing to do and could put the system
# into an infinite loop.
# We jump directly to the 68060 buserr handler.
# If we had a sane ld, we could use use that entry point directly...
#
.global _060_real_access
.globl _060_real_access,_buserr60
_060_real_access:
.globl _buserr
jmp _buserr
jra _buserr60
.include "inetbsd.S"
.include "fnetbsd.S"

4
sys/arch/x68k/x68k/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.18 1997/05/13 18:01:17 gwr Exp $ */
/* $NetBSD: locore.s,v 1.19 1997/06/26 22:28:50 is Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -100,6 +100,8 @@ _doadump:
#include <m68k/m68k/trap_subr.s>
.globl _trap, _nofault, _longjmp
.globl _buserr60 | for 060SP
_buserr60:
_buserr:
tstl _nofault | device probe?
jeq Lberr | no, handle as usual