Module Name: src
Committed By: tsutsui
Date: Sun Dec 13 11:24:04 UTC 2009
Modified Files:
src/sys/arch/cesfic/cesfic: locore.s
src/sys/arch/hp300/hp300: locore.s
src/sys/arch/luna68k/luna68k: locore.s
src/sys/arch/mvme68k/mvme68k: locore.s
src/sys/arch/news68k/news68k: locore.s
src/sys/arch/next68k/next68k: locore.s
src/sys/arch/x68k/x68k: locore.s
Log Message:
Now we have Sysseg_pa value so no need to calculate it from KVA Sysseg.
Tested on hp300.
XXX: mac68k seems to have a different VA vs PA mechanism so I leave it for now.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/cesfic/cesfic/locore.s
cvs rdiff -u -r1.150 -r1.151 src/sys/arch/hp300/hp300/locore.s
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/luna68k/luna68k/locore.s
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/mvme68k/mvme68k/locore.s
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/news68k/news68k/locore.s
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/next68k/next68k/locore.s
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/x68k/x68k/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/cesfic/cesfic/locore.s
diff -u src/sys/arch/cesfic/cesfic/locore.s:1.20 src/sys/arch/cesfic/cesfic/locore.s:1.21
--- src/sys/arch/cesfic/cesfic/locore.s:1.20 Fri Dec 11 18:28:35 2009
+++ src/sys/arch/cesfic/cesfic/locore.s Sun Dec 13 11:24:02 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.20 2009/12/11 18:28:35 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.21 2009/12/13 11:24:02 tsutsui Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -245,7 +245,7 @@
RELOC(physmem, %a0)
movl %d1,%a0@ | and physmem
/* configure kernel and lwp0 VA space so we can get going */
- .globl _Sysseg, _pmap_bootstrap, _avail_start
+ .globl _Sysseg_pa, _pmap_bootstrap, _avail_start
#if NKSYMS || defined(DDB) || defined(LKM)
RELOC(esym,%a0) | end of static kernel test/data/syms
movl %a0@,%d5
@@ -267,9 +267,8 @@
/*
* Prepare to enable MMU.
*/
- RELOC(Sysseg, %a0) | system segment table addr
- movl %a0@,%d1 | read value (a KVA)
- addl %a5,%d1 | convert to PA
+ RELOC(Sysseg_pa, %a0) | system segment table addr
+ movl %a0@,%d1 | read value (a PA)
subl #KERNBASE, %d1
RELOC(mmutype, %a0)
Index: src/sys/arch/hp300/hp300/locore.s
diff -u src/sys/arch/hp300/hp300/locore.s:1.150 src/sys/arch/hp300/hp300/locore.s:1.151
--- src/sys/arch/hp300/hp300/locore.s:1.150 Sat Dec 12 16:37:22 2009
+++ src/sys/arch/hp300/hp300/locore.s Sun Dec 13 11:24:02 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.150 2009/12/12 16:37:22 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.151 2009/12/13 11:24:02 tsutsui Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -453,9 +453,8 @@
*
* Is this all really necessary, or am I paranoid??
*/
- RELOC(Sysseg, %a0) | system segment table addr
- movl %a0@,%d1 | read value (a KVA)
- addl %a5,%d1 | convert to PA
+ RELOC(Sysseg_pa, %a0) | system segment table addr
+ movl %a0@,%d1 | read value (a PA)
RELOC(mmutype, %a0)
tstl %a0@ | HP MMU?
jeq Lhpmmu2 | yes, skip
Index: src/sys/arch/luna68k/luna68k/locore.s
diff -u src/sys/arch/luna68k/luna68k/locore.s:1.32 src/sys/arch/luna68k/luna68k/locore.s:1.33
--- src/sys/arch/luna68k/luna68k/locore.s:1.32 Fri Dec 11 18:28:35 2009
+++ src/sys/arch/luna68k/luna68k/locore.s Sun Dec 13 11:24:02 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.32 2009/12/11 18:28:35 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.33 2009/12/13 11:24:02 tsutsui Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -267,9 +267,8 @@
* Enable the MMU.
* Since the kernel is mapped logical == physical, we just turn it on.
*/
- RELOC(Sysseg,%a0) | system segment table addr
- movl %a0@,%d1 | read value (a KVA)
- addl %a5,%d1 | convert to PA (%a5 == 0, indeed)
+ RELOC(Sysseg_pa,%a0) | system segment table addr
+ movl %a0@,%d1 | read value (a PA)
#if defined(M68040)
RELOC(mmutype,%a0)
cmpl #MMU_68040,%a0@ | 68040?
Index: src/sys/arch/mvme68k/mvme68k/locore.s
diff -u src/sys/arch/mvme68k/mvme68k/locore.s:1.103 src/sys/arch/mvme68k/mvme68k/locore.s:1.104
--- src/sys/arch/mvme68k/mvme68k/locore.s:1.103 Fri Dec 11 18:28:35 2009
+++ src/sys/arch/mvme68k/mvme68k/locore.s Sun Dec 13 11:24:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.103 2009/12/11 18:28:35 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.104 2009/12/13 11:24:03 tsutsui Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -610,9 +610,8 @@
* Enable the MMU.
* Since the kernel is mapped logical == physical, we just turn it on.
*/
- RELOC(Sysseg, %a0) | system segment table addr
- movl %a0@,%d1 | read value (a KVA)
- addl %a5,%d1 | convert to PA
+ RELOC(Sysseg_pa, %a0) | system segment table addr
+ movl %a0@,%d1 | read value (a PA)
RELOC(mmutype, %a0)
cmpl #MMU_68040,%a0@ | 68040?
jne Lmotommu1 | no, skip
Index: src/sys/arch/news68k/news68k/locore.s
diff -u src/sys/arch/news68k/news68k/locore.s:1.51 src/sys/arch/news68k/news68k/locore.s:1.52
--- src/sys/arch/news68k/news68k/locore.s:1.51 Sat Dec 12 09:54:42 2009
+++ src/sys/arch/news68k/news68k/locore.s Sun Dec 13 11:24:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.51 2009/12/12 09:54:42 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.52 2009/12/13 11:24:03 tsutsui Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -365,7 +365,7 @@
/*
* configure kernel and lwp0 VA space so we can get going
*/
- .globl _Sysseg, _pmap_bootstrap, _avail_start
+ .globl _Sysseg_pa, _pmap_bootstrap, _avail_start
#if NKSYMS || defined(DDB) || defined(LKM)
RELOC(esym,%a0) | end of static kernel test/data/syms
@@ -398,9 +398,8 @@
movl #_C_LABEL(vectab),%d0 | get our VBR address
movc %d0,%vbr
- RELOC(Sysseg, %a0) | system segment table addr
- movl %a0@,%d1 | read value (a KVA)
- addl %a5,%d1 | convert to PA
+ RELOC(Sysseg_pa, %a0) | system segment table addr
+ movl %a0@,%d1 | read value (a PA)
RELOC(mmutype, %a0)
cmpl #MMU_68040,%a0@ | 68040?
jne Lmotommu1 | no, skip
Index: src/sys/arch/next68k/next68k/locore.s
diff -u src/sys/arch/next68k/next68k/locore.s:1.53 src/sys/arch/next68k/next68k/locore.s:1.54
--- src/sys/arch/next68k/next68k/locore.s:1.53 Fri Dec 11 18:28:35 2009
+++ src/sys/arch/next68k/next68k/locore.s Sun Dec 13 11:24:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.53 2009/12/11 18:28:35 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.54 2009/12/13 11:24:03 tsutsui Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
@@ -330,9 +330,8 @@
*
* Is this all really necessary, or am I paranoid??
*/
- RELOC(Sysseg, %a0) | system segment table addr
- movl %a0@,%d1 | read value (a KVA)
- addl %a5,%d1 | convert to PA
+ RELOC(Sysseg_pa, %a0) | system segment table addr
+ movl %a0@,%d1 | read value (a PA)
RELOC(mmutype, %a0)
#if defined(ENABLE_HP_CODE)
Index: src/sys/arch/x68k/x68k/locore.s
diff -u src/sys/arch/x68k/x68k/locore.s:1.95 src/sys/arch/x68k/x68k/locore.s:1.96
--- src/sys/arch/x68k/x68k/locore.s:1.95 Fri Dec 11 18:28:35 2009
+++ src/sys/arch/x68k/x68k/locore.s Sun Dec 13 11:24:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.95 2009/12/11 18:28:35 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.96 2009/12/13 11:24:04 tsutsui Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -863,9 +863,8 @@
*
* Is this all really necessary, or am I paranoid??
*/
- RELOC(Sysseg, %a0) | system segment table addr
- movl %a0@,%d1 | read value (a KVA)
- addl %a5,%d1 | convert to PA
+ RELOC(Sysseg_pa, %a0) | system segment table addr
+ movl %a0@,%d1 | read value (a PA)
RELOC(mmutype, %a0)
cmpl #MMU_68040,%a0@ | 68040?
jne Lmotommu1 | no, skip
