Module Name: src
Committed By: maxv
Date: Sat Jun 4 10:19:09 UTC 2016
Modified Files:
src/sys/arch/amd64/amd64: locore.S
src/sys/arch/i386/i386: locore.S
Log Message:
Use the same instruction layout to map the ISA I/O. No functional
change.
The comment is still wrong: we are not on (4), we are actually below
the kernel area in physical memory. I'll fix that later.
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.129 -r1.130 src/sys/arch/i386/i386/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/amd64/amd64/locore.S
diff -u src/sys/arch/amd64/amd64/locore.S:1.100 src/sys/arch/amd64/amd64/locore.S:1.101
--- src/sys/arch/amd64/amd64/locore.S:1.100 Sat Jun 4 09:45:57 2016
+++ src/sys/arch/amd64/amd64/locore.S Sat Jun 4 10:19:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.100 2016/06/04 09:45:57 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.101 2016/06/04 10:19:09 maxv Exp $ */
/*
* Copyright-o-rama!
@@ -611,9 +611,9 @@ no_NOX:
* +------+--------+------+-----+--------+---------------------+----------
* (1) (2) (3)
*
- * --------------+-----+-----+----+------------+
- * -> PROC0 STK -> L3 -> L2 -> L1 | ISA IO MEM |
- * --------------+-----+-----+----+------------+
+ * --------------+-----+-----+----+-------------+
+ * -> PROC0 STK -> L3 -> L2 -> L1 | ISA I/O MEM |
+ * --------------+-----+-----+----+-------------+
* (4)
*
* PROC0 STK is obviously not linked as a page level. It just happens to be
@@ -718,9 +718,11 @@ no_NOX:
orl $(PG_V|PG_KW),%eax
fillkpt_nox
- /* We are on (4). Map ISA I/O mem (later atdevbase) RWX. */
- movl $(IOM_BEGIN|PG_V|PG_KW/*|PG_N*/),%eax
- movl $(IOM_SIZE>>PGSHIFT),%ecx
+ /* We are on (4). Map ISA I/O MEM RWX. */
+ movl $IOM_BEGIN,%eax
+ movl $IOM_SIZE,%ecx /* size of ISA I/O MEM */
+ shrl $PGSHIFT,%ecx
+ orl $(PG_V|PG_KW/*|PG_N*/),%eax
fillkpt
/*
Index: src/sys/arch/i386/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.129 src/sys/arch/i386/i386/locore.S:1.130
--- src/sys/arch/i386/i386/locore.S:1.129 Sat Jun 4 10:02:12 2016
+++ src/sys/arch/i386/i386/locore.S Sat Jun 4 10:19:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.129 2016/06/04 10:02:12 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.130 2016/06/04 10:19:09 maxv Exp $ */
/*
* Copyright-o-rama!
@@ -128,7 +128,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.129 2016/06/04 10:02:12 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.130 2016/06/04 10:19:09 maxv Exp $");
#include "opt_compat_oldboot.h"
#include "opt_copy_symtab.h"
@@ -627,9 +627,9 @@ no_NOX:
* +------+--------+------+-----+--------+---------------------+-----------
* (1) (2) (3)
*
- * -------+------------+
- * TABLES | ISA IO MEM |
- * -------+------------+
+ * -------+-------------+
+ * TABLES | ISA I/O MEM |
+ * -------+-------------+
* (4)
*
* PROC0 STK is obviously not linked as a page level. It just happens to be
@@ -753,9 +753,11 @@ no_NOX:
orl $(PG_V|PG_KW),%eax
fillkpt_nox
- /* We are on (4). Map ISA I/O mem (later atdevbase) RWX. */
- movl $(IOM_BEGIN|PG_V|PG_KW/*|PG_N*/),%eax
- movl $(IOM_SIZE>>PGSHIFT),%ecx
+ /* We are on (4). Map ISA I/O MEM RWX. */
+ movl $IOM_BEGIN,%eax
+ movl $IOM_SIZE,%ecx /* size of ISA I/O MEM */
+ shrl $PGSHIFT,%ecx
+ orl $(PG_V|PG_KW/*|PG_N*/),%eax
fillkpt
/*
