Module Name: src
Committed By: tsutsui
Date: Sat Nov 5 15:37:17 UTC 2011
Modified Files:
src/sys/arch/luna68k/luna68k: genassym.cf locore.s
Log Message:
Replace two magic numbers with macro via assym.h.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/luna68k/luna68k/genassym.cf
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/luna68k/luna68k/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/luna68k/genassym.cf
diff -u src/sys/arch/luna68k/luna68k/genassym.cf:1.19 src/sys/arch/luna68k/luna68k/genassym.cf:1.20
--- src/sys/arch/luna68k/luna68k/genassym.cf:1.19 Fri Jan 14 02:06:27 2011
+++ src/sys/arch/luna68k/luna68k/genassym.cf Sat Nov 5 15:37:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.19 2011/01/14 02:06:27 rmind Exp $
+# $NetBSD: genassym.cf,v 1.20 2011/11/05 15:37:17 tsutsui Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -149,6 +149,8 @@ define SPL6 PSL_S | PSL_IPL6
# magic
define FC_USERD FC_USERD
define FC_SUPERD FC_SUPERD
+define DC_FREEZE DC_FREEZE
+define CACHE40_ON CACHE40_ON
define CACHE_ON CACHE_ON
define CACHE_OFF CACHE_OFF
define CACHE_CLR CACHE_CLR
Index: src/sys/arch/luna68k/luna68k/locore.s
diff -u src/sys/arch/luna68k/luna68k/locore.s:1.41 src/sys/arch/luna68k/luna68k/locore.s:1.42
--- src/sys/arch/luna68k/luna68k/locore.s:1.41 Sat Nov 5 15:33:18 2011
+++ src/sys/arch/luna68k/luna68k/locore.s Sat Nov 5 15:37:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.41 2011/11/05 15:33:18 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.42 2011/11/05 15:37:17 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -147,7 +147,7 @@ ASENTRY_NOPROFILE(start)
movc %d0,%cacr | clear and disable on-chip cache(s)
/* determine our CPU/MMU combo - check for all regardless of kernel config */
- movl #0x200,%d0 | data freeze bit
+ movl #DC_FREEZE,%d0 | data freeze bit
movc %d0,%cacr | only exists on 68030
movc %cacr,%d0 | read it back
tstl %d0 | zero?
@@ -252,7 +252,7 @@ Lmotommu0:
RELOC(proto040tc,%a0)
movl %a0@,%d0
.long 0x4e7b0003 | movc %d0,%tc
- movl #0x80008000,%d0
+ movl #CACHE40_ON,%d0
movc %d0,%cacr | turn on both caches
jmp Lenab1
Lmotommu1:
