Module Name: src
Committed By: uwe
Date: Sun Jul 12 03:52:51 UTC 2020
Modified Files:
src/sys/arch/evbsh3/evbsh3: locore.S
Log Message:
Use symbolic constants for SR and CCR init values.
Same object code is generated.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbsh3/evbsh3/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/evbsh3/evbsh3/locore.S
diff -u src/sys/arch/evbsh3/evbsh3/locore.S:1.12 src/sys/arch/evbsh3/evbsh3/locore.S:1.13
--- src/sys/arch/evbsh3/evbsh3/locore.S:1.12 Sun Jul 12 01:52:22 2020
+++ src/sys/arch/evbsh3/evbsh3/locore.S Sun Jul 12 03:52:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.12 2020/07/12 01:52:22 uwe Exp $ */
+/* $NetBSD: locore.S,v 1.13 2020/07/12 03:52:51 uwe Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -81,6 +81,7 @@
#endif
#include <sh3/asm.h>
+#include <sh3/psl.h>
#include <sh3/exception.h>
#include <sh3/locore.h>
#include <sh3/mmu_sh3.h>
@@ -111,7 +112,7 @@ ALTENTRY(kernel_text)
bra start1
nop
.align 2
-SR_init: .long 0x500000F0
+SR_init: .long PSL_MD | PSL_BL | PSL_IMASK
REG_SYMBOL(MMUCR)
start1:
@@ -230,8 +231,8 @@ XLinitSH3: .long _C_LABEL(initSH3)
XLmain: .long _C_LABEL(main)
XLtoP2: .long 0x20000000
REG_SYMBOL(CCR)
-#ifdef SH4
-XL_CCRVAL: .long 0x0909 /* Operand cache ON */
+#ifdef SH4 /* invalidate and enable instruction and operand caches */
+XL_CCRVAL: .long SH4_CCR_ICI | SH4_CCR_ICE | SH4_CCR_OCI | SH4_CCR_OCE
#endif /* SH4 */
load_and_reset:
