[src/trunk]: src/sys/arch/amd64/amd64 Save L4's physical address earlier. Als...

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/78d388f5a88b
branches:  trunk
changeset: 815510:78d388f5a88b
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sun May 22 10:11:55 2016 +0000

description:
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.

diffstat:

 sys/arch/amd64/amd64/locore.S |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (33 lines):

diff -r 27dbc014a6e5 -r 78d388f5a88b sys/arch/amd64/amd64/locore.S
--- a/sys/arch/amd64/amd64/locore.S     Sun May 22 09:10:37 2016 +0000
+++ b/sys/arch/amd64/amd64/locore.S     Sun May 22 10:11:55 2016 +0000
@@ -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 @@
        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 @@
        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).