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

Back out (most of) previous. I was using an 1.5 asm.h and hadn't 

noticed cgd's fix..
This commit is contained in:
soren 2000-09-05 01:24:51 +00:00
parent a9c3f5c9d9
commit c5ce14be0a
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: locore.S,v 1.114 2000/09/05 00:55:48 soren Exp $ */ /* $NetBSD: locore.S,v 1.115 2000/09/05 01:24:51 soren Exp $ */
/* /*
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
@ -163,7 +163,6 @@ _C_LABEL(kernel_text):
jal _C_LABEL(main) # main(void) jal _C_LABEL(main) # main(void)
nop nop
PANIC("main() returned") # main never returns PANIC("main() returned") # main never returns
nop
.set at .set at
.globl _C_LABEL(verylocore) .globl _C_LABEL(verylocore)
_C_LABEL(verylocore): _C_LABEL(verylocore):
@ -215,7 +214,6 @@ NESTED(setrunqueue, CALLFRAME_SIZ, ra)
beq t0, zero, 1f beq t0, zero, 1f
lbu t0, P_PRIORITY(a0) # put on p->p_priority / 4 queue lbu t0, P_PRIORITY(a0) # put on p->p_priority / 4 queue
PANIC("setrunqueue") # PANIC("setrunqueue") #
nop
1: 1:
li t1, 1 # compute corresponding bit li t1, 1 # compute corresponding bit
srl t0, t0, 2 # compute index into 'whichqs' srl t0, t0, 2 # compute index into 'whichqs'
@ -254,7 +252,6 @@ NESTED(remrunqueue, CALLFRAME_SIZ, ra)
bne v0, zero, 1f bne v0, zero, 1f
lw v0, P_BACK(a0) # v0 = p->p_back lw v0, P_BACK(a0) # v0 = p->p_back
PANIC("remrunqueue") # it wasn't recorded to be on its q PANIC("remrunqueue") # it wasn't recorded to be on its q
nop
1: 1:
lw v1, P_FORW(a0) # v1 = p->p_forw lw v1, P_FORW(a0) # v1 = p->p_forw
nop nop
@ -382,7 +379,6 @@ cpu_switch_queuescan:
bne t0, a0, 2f # make sure something in queue bne t0, a0, 2f # make sure something in queue
sw v0, P_FORW(t0) # qp->ph_link = p->p_forw; sw v0, P_FORW(t0) # qp->ph_link = p->p_forw;
PANIC("cpu_switch") # nothing in queue PANIC("cpu_switch") # nothing in queue
nop
2: 2:
sw t0, P_BACK(v0) # p->p_forw->p_back = qp sw t0, P_BACK(v0) # p->p_forw->p_back = qp
bne v0, t0, 3f # queue still not empty bne v0, t0, 3f # queue still not empty

3
sys/arch/mips/mips/locore_mips1.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore_mips1.S,v 1.39 2000/09/05 00:55:48 soren Exp $ */ /* $NetBSD: locore_mips1.S,v 1.40 2000/09/05 01:24:52 soren Exp $ */
/* /*
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
@ -852,7 +852,6 @@ outofworld:
move a1, sp move a1, sp
la sp, start # set sp to a valid place la sp, start # set sp to a valid place
PANIC("TLB out of universe: ksp was %p") PANIC("TLB out of universe: ksp was %p")
nop
.set at .set at
END(mips1_TLBMissException) END(mips1_TLBMissException)