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

Fix some obvious problems in my MIPS kcopy() implementation (a significant 

typo, plus get delay slots right on the R3000).
This commit is contained in:
thorpej 1998-03-23 00:57:13 +00:00
parent 99c03c4382
commit afe0f98a85
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/mips/mips/locore.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.S,v 1.48 1998/03/12 05:45:05 thorpej Exp $ */ /* $NetBSD: locore.S,v 1.49 1998/03/23 00:57:13 thorpej Exp $ */
/* /*
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
@ -976,26 +976,26 @@ NON_LEAF(kcopy, 48, ra)
sw ra, 44(sp) # save ra sw ra, 44(sp) # save ra
sw s0, 32(sp) # save s0 sw s0, 32(sp) # save s0
lw v1, _C_LABEL(curpcb) # set up fault handler lw v1, _C_LABEL(curpcb) # set up fault handler
lw v0, _C_LABEL(kcopyerr) la v0, _C_LABEL(kcopyerr)
lw s0, U_PCB_ONFAULT(v1) # save old handler lw s0, U_PCB_ONFAULT(v1) # save old handler
jal _C_LABEL(bcopy) # do the copy jal _C_LABEL(bcopy) # do the copy
sw v0, U_PCB_ONFAULT(v1) sw v0, U_PCB_ONFAULT(v1)
lw v1, _C_LABEL(curpcb) # restore the old handler lw v1, _C_LABEL(curpcb) # restore the old handler
sw s0, U_PCB_ONFAULT(v1)
lw ra, 44(sp) # restore ra lw ra, 44(sp) # restore ra
lw s0, 32(sp) # restore s0 lw s0, 32(sp) # restore s0
addu sp, sp, 48 # kill stack frame addu sp, sp, 48 # kill stack frame
sw s0, U_PCB_ONFAULT(v1)
j ra j ra
move v0, zero # success! move v0, zero # success!
END(kcopy) END(kcopy)
LEAF(kcopyerr) LEAF(kcopyerr)
lw v1, _C_LABEL(curpcb) # restore the old handler lw v1, _C_LABEL(curpcb) # restore the old handler
sw s0, U_PCB_ONFAULT(v1)
lw ra, 44(sp) # restore ra lw ra, 44(sp) # restore ra
lw s0, 32(sp) # restore s0 lw s0, 32(sp) # restore s0
addu sp, sp, 48 # kill stack frame addu sp, sp, 48 # kill stack frame
sw s0, U_PCB_ONFAULT(v1)
j ra j ra
li v0, EFAULT # return EFAULT li v0, EFAULT # return EFAULT
END(kcopyerr) END(kcopyerr)