This commit is contained in:
msaitoh 1999-09-16 21:39:24 +00:00
parent 3323319940
commit 4014b40eb8
2 changed files with 9 additions and 12 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.3 1999/09/16 21:23:40 msaitoh Exp $ */
/* $NetBSD: locore.s,v 1.4 1999/09/16 21:39:24 msaitoh Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995, 1997
@ -1109,7 +1109,6 @@ NENTRY(exphandler)
jmp @r0
1:
cmp/eq #0x60, r0 /* T_TLBINVALIDW */
cmp/eq r0, r1
bt 3b
mov.l XL_TLBPROTWR, r1
@ -1235,7 +1234,6 @@ _MonTrap600_end:
/************************************************************************/
/* Immediate Data */
/************************************************************************/
.align 2
XL_curpcb: .long _curpcb
@ -1387,7 +1385,6 @@ XL_splimit_low2: .long 0x80000000
1: INTRFASTEXIT
.align 2
XL_INTEVTREG: .long SHREG_INTEVT
XL_intrhandler: .long _intrhandler
XXL_astpending: .long _astpending
XXLT_ASTFLT: .long T_ASTFLT
@ -1460,7 +1457,7 @@ load_and_reset:
.align 2
XL_start_address:
.long 0x8c010000
.long 0x8c010000
load_and_reset_end:
ENTRY(XLoadAndReset)

View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.2 1999/09/14 11:20:54 tsubai Exp $ */
/* $NetBSD: locore.s,v 1.3 1999/09/16 21:39:25 msaitoh Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995, 1997
@ -79,8 +79,8 @@
shld r10, r9 ; /* r9 = 0xc0000000 */ \
and r9, r8 ; \
mov #2, r9 ; \
shld r10, r9 ; /* r9 = 0x80000000 */ \
and r15, r9 ; \
shld r10, r9 ; /* r9 = 0x80000000 */ \
and r15, r9 ; \
cmp/eq r8, r9 ; \
bt 1f ; /* If already kernel mode then jump */ \
nop ; \
@ -1273,7 +1273,7 @@ ENTRY(ConvVtoP)
mov #SHREG_TTB, r1
mov.l @r1, r1
add r0, r1
mov.l @r1, r2 /* r2 = pde */
mov.l @r1, r2 /* r2 = pde */
mov.l XL_PG_FRAME, r1
and r1, r2 /* r2 = page table address */
mov r4, r0
@ -1455,7 +1455,7 @@ load_and_reset:
dt r1
bf 1b
jmp @r8 /* jump to start address */
jmp @r8 /* jump to start address */
nop
.align 2
@ -1470,14 +1470,14 @@ ENTRY(XLoadAndReset)
mov.l XL_load_and_reset_end, r1
mov.l XL_load_trampoline_addr, r2
mov r2, r8
sub r0, r1 /* r1 = bytes to be copied */
sub r0, r1 /* r1 = bytes to be copied */
1: mov.b @r0+, r3
mov.b r3, @r2
add #1, r2
dt r1
bf 1b
jmp @r8 /* jump to trampoline code */
jmp @r8 /* jump to trampoline code */
nop
.align 2