Module Name: src
Committed By: maxv
Date: Fri Jan 6 08:36:56 UTC 2017
Modified Files:
src/sys/arch/i386/i386: locore.S
Log Message:
Explain the computation
To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 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/i386/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.143 src/sys/arch/i386/i386/locore.S:1.144
--- src/sys/arch/i386/i386/locore.S:1.143 Fri Dec 16 19:52:22 2016
+++ src/sys/arch/i386/i386/locore.S Fri Jan 6 08:36:56 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.143 2016/12/16 19:52:22 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.144 2017/01/06 08:36:56 maxv Exp $ */
/*
* Copyright-o-rama!
@@ -128,7 +128,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.143 2016/12/16 19:52:22 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.144 2017/01/06 08:36:56 maxv Exp $");
#include "opt_compat_oldboot.h"
#include "opt_copy_symtab.h"
@@ -633,7 +633,7 @@ no_NOX:
incl %eax /* one more PTP for VAs stolen by bootstrap */
1: movl %eax,RELOC(nkptp)+1*4
- /* tablesize = (PDP_SIZE + UPAGES + nkptp) << PGSHIFT; */
+ /* tablesize = (PDP_SIZE + UPAGES + nkptp[1]) << PGSHIFT; */
addl $(PDP_SIZE+UPAGES),%eax
#ifdef PAE
incl %eax /* one more page for L3 */
@@ -643,7 +643,8 @@ no_NOX:
#endif
movl %eax,RELOC(tablesize)
- /* Ensure that nkptp covers BOOTSTRAP TABLES. */
+ /* Ensure that nkptp[1] covers BOOTSTRAP TABLES, ie:
+ * (esi + tablesize) >> L2_SHIFT + 1 < nkptp[1] */
addl %esi,%eax
addl $~L2_FRAME,%eax
shrl $L2_SHIFT,%eax
