Module Name: src
Committed By: maxv
Date: Sun May 22 10:11:55 UTC 2016
Modified Files:
src/sys/arch/amd64/amd64: locore.S
Log Message:
Save L4's physical address earlier. Also, PDE_SIZE has nothing to do
here, we are just zeroing out the upper 32bits of the 64bit pointer.
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/amd64/amd64/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.92 src/sys/arch/amd64/amd64/locore.S:1.93
--- src/sys/arch/amd64/amd64/locore.S:1.92 Sun May 15 07:17:53 2016
+++ src/sys/arch/amd64/amd64/locore.S Sun May 22 10:11:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.92 2016/05/15 07:17:53 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.93 2016/05/22 10:11:55 maxv Exp $ */
/*
* Copyright-o-rama!
@@ -606,6 +606,11 @@ no_NOX:
addl $PGOFSET,%esi
andl $~PGOFSET,%esi
+ /* We are on the BOOTSTRAP TABLES. Save L4's physical address. */
+ movl $RELOC(PDPpaddr),%ebp
+ movl %esi,(%ebp)
+ movl $0,4(%ebp)
+
/* Now, zero out the BOOTSTRAP TABLES (before filling them in). */
movl %esi,%edi
xorl %eax,%eax
@@ -733,11 +738,6 @@ no_NOX:
movl %eax,(%ebx)
movl $0,(PDE_SIZE-4)(%ebx)
- /* Save physical address of L4. */
- movl $RELOC(PDPpaddr),%ebp
- movl %esi,(%ebp)
- movl $0,(PDE_SIZE-4)(%ebp)
-
/*
* Startup checklist:
* 1. Enable PAE (and SSE while here).
