From owner-p4-projects@FreeBSD.ORG  Mon Sep 29 19:53:23 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 55D0616A4C0; Mon, 29 Sep 2003 19:53:23 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2B9E016A4BF
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 19:53:23 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5E5844400F
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 19:53:22 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U2rMXJ031890
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 19:53:22 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U2rLh2031887
	for perforce@freebsd.org; Mon, 29 Sep 2003 19:53:21 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Mon, 29 Sep 2003 19:53:21 -0700 (PDT)
Message-Id: <200309300253.h8U2rLh2031887@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 38837 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Sep 2003 02:53:23 -0000

http://perforce.freebsd.org/chv.cgi?CH=38837

Change 38837 by peter@peter_hammer on 2003/09/29 19:53:08

	get out the BIG hammer

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/mpboot.s#6 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/mpboot.s#6 (text+ko) ====

@@ -45,6 +45,7 @@
  */
 	.p2align 4
 
+	.section .data32
 	.code32
 NON_GPROF_ENTRY(MPentry)
 	/*
@@ -61,12 +62,12 @@
 	movl	%eax,%cr4
 
 	/* Now enable paging mode */
-	movl	IdlePDT, %eax
+	movl	IdlePTD32, %eax
 	movl	%eax, %cr3
 	movl	%cr0,%eax
 	orl	$CR0_PE|CR0_PG,%eax		/* enable paging */
 	movl	%eax,%cr0			/* let the games begin! */
-	movl	bootSTK,%esp			/* boot stack end loc. */
+	movl	bootSTK32,%esp			/* boot stack end loc. */
 
 	pushl	$mp_begin			/* jump to high mem */
 	ret
@@ -75,13 +76,16 @@
 	 * Wait for the booting CPU to signal startup
 	 */
 mp_begin:	/* now running relocated at KERNBASE */
+	.code64
+#ifdef SMP_ME_HARDER
 	call	init_secondary			/* load i386 tables */
+#endif
 
 	/* disable the APIC, just to be SURE */
-	movl	lapic, %edx
-	movl	LA_SVR(%edx), %eax		/* get spurious vector reg. */
+	movq	lapic, %rdx
+	movl	LA_SVR(%rdx), %eax		/* get spurious vector reg. */
 	andl	$~APIC_SVR_SWEN, %eax		/* clear software enable bit */
-	movl	%eax, LA_SVR(%edx)
+	movl	%eax, LA_SVR(%rdx)
 
 	/* signal our startup to the BSP */
 	incl	mp_naps				/* signal BSP */
@@ -98,8 +102,7 @@
  * 1Meg.		-jackv
  */
 
-	.data
-	ALIGN_DATA				/* just to be sure */
+	.p2align 4
 
 BOOTMP1:
 
@@ -236,6 +239,13 @@
 	.space	0x100	/* space for boot_stk - 1st temporary stack */
 boot_stk:
 
+	.globl	bootSTK32
+bootSTK32:
+	.long	0
+	.globl	IdlePTD32
+IdlePTD32:
+	.long	0
+
 BOOTMP2:
 	.globl	bootMP_size
 bootMP_size: