Module Name: src
Committed By: isaki
Date: Fri Sep 28 04:34:02 UTC 2018
Modified Files:
src/sys/arch/luna68k/stand/boot: locore.S
Log Message:
Improve codes. No functional changes intended.
Confirmed on LUNA-I. OK'ed by tsutsui@.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/luna68k/stand/boot/locore.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/luna68k/stand/boot/locore.S
diff -u src/sys/arch/luna68k/stand/boot/locore.S:1.13 src/sys/arch/luna68k/stand/boot/locore.S:1.14
--- src/sys/arch/luna68k/stand/boot/locore.S:1.13 Fri Sep 28 04:13:24 2018
+++ src/sys/arch/luna68k/stand/boot/locore.S Fri Sep 28 04:34:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.13 2018/09/28 04:13:24 isaki Exp $ */
+/* $NetBSD: locore.S,v 1.14 2018/09/28 04:34:02 isaki Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -137,7 +137,7 @@ ASGLOBAL(Reset)
VECTOR(badtrap) /* 28: level 4 interrupt autovector */
VECTOR(lev5intr) /* 29: level 5 interrupt autovector */
VECTOR(lev6intr) /* 30: level 6 interrupt autovector */
- VECTOR(badtrap) /* 31: level 7 interrupt autovector */
+ VECTOR(exit) /* 31: level 7 interrupt autovector */
VECTOR(illinst) /* 32: syscalls */
VECTOR(illinst) /* 33: sigreturn syscall or breakpoint */
VECTOR(illinst) /* 34: breakpoint or sigreturn syscall */
@@ -211,32 +211,21 @@ Lbssclr:
bne Lbssclr | no, keep going
/* save address to goto ROM monitor */
- movec %vbr,%a0 | ROM vbr to %a0
- movl %a0@(NMIVEC),%d0 | restore NMIVEC
- movl #_ASM_LABEL(gotoROM),%a0 | save to _gotoROM
- movl %d0,%a0@ |
+ movec %vbr,%a0 | save ROM vbr
+ movl %a0,_ASM_LABEL(romvbr)
movl #_ASM_LABEL(Reset),%a0 | BP vbr to %a0
- movl #_C_LABEL(exit),%a0@(NMIVEC) | save address
-
-
-/* switch vector tabel */
- movec %vbr,%a0
- movl %a0@(ILLGINST),%sp@- | save ILLINST vector for BrkPtr
- movl %a0@(EVTRAPF),%sp@-
-
- movl #_ASM_LABEL(Reset),%a0
- movl %sp@+,%a0@(EVTRAPF)
- movl %sp@+,%a0@(ILLGINST) | restore ILLINST vector
+/* copy ROM vectors */
+ movl %a0@(ILLGINST),_ASM_LABEL(Reset) + ILLGINST
+ movl %a0@(EVTRAPF),_ASM_LABEL(Reset) + EVTRAPF
movec %a0,%vbr
- movl #DIPSW,%a0
- movw %a0@,%d0
- lsrl #8,%d0
- andl #0xFF,%d0
- movl %d0,_C_LABEL(dipsw1)
- movw %a0@,%d0
- andl #0xFF,%d0
- movl %d0,_C_LABEL(dipsw2)
+ movw DIPSW,%d0
+ clrl %d1
+ movw %d0,%d1
+ lsrl #8,%d1
+ movl %d1,_C_LABEL(dipsw1)
+ movb %d0,%d1
+ movl %d1,_C_LABEL(dipsw2)
/* determine our CPU */
@@ -268,16 +257,12 @@ Lstart0:
/*
* exit to ROM monitor
*/
-
- ROM_VBR = 0
-
ENTRY_NOPROFILE(exit)
GLOBAL(_rtt)
movw #PSL_HIGHIPL,%sr | no interrupts
- movl #ROM_VBR,%a0
+ movl _ASM_LABEL(romvbr),%a0
movec %a0,%vbr
- movl #_ASM_LABEL(gotoROM),%a0
- movl %a0@,%a1
+ movl %a0@(NMIVEC),%a1
jmp %a1@
/*
@@ -760,7 +745,7 @@ ENTRY(spl7)
* Memory Information Field for secondary booter memory allocator
*/
-ASLOCAL(gotoROM)
+ASLOCAL(romvbr)
.long 0
GLOBAL(dipsw1)
