From owner-p4-projects@FreeBSD.ORG  Tue Apr  8 22:29:06 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 00DDA37B404; Tue,  8 Apr 2003 22:29:04 -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 870D537B401
	for <perforce@freebsd.org>; Tue,  8 Apr 2003 22:29:04 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2FE5243F93
	for <perforce@freebsd.org>; Tue,  8 Apr 2003 22:29:04 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h395T40U044595
	for <perforce@freebsd.org>; Tue, 8 Apr 2003 22:29:04 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h395T3Hi044592
	for perforce@freebsd.org; Tue, 8 Apr 2003 22:29:03 -0700 (PDT)
Date: Tue, 8 Apr 2003 22:29:03 -0700 (PDT)
Message-Id: <200304090529.h395T3Hi044592@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 28615 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: Wed, 09 Apr 2003 05:29:06 -0000

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

Change 28615 by peter@peter_daintree on 2003/04/08 22:28:12

	tidy up

Affected files ...

.. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#33 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#33 (text+ko) ====

@@ -71,7 +71,7 @@
  * This is where the loader trampoline start us, set the ball rolling...
  *
  * We are called with the stack looking like this:
- * 0(%rsp) = 32 bit return address
+ * 0(%rsp) = 32 bit return address (cannot be used)
  * 4(%rsp) = 32 bit modulep
  * 8(%rsp) = 32 bit kernend
  *
@@ -94,25 +94,10 @@
 	movl	8(%rbp),%eax		/* kernend */
 	movq	%rax,physfree
 
-	/* Get onto a stack that we can trust and set up a real frame. */
+	/* Get onto a stack that we can trust - there is no going back now. */
 	movq	$bootstack,%rsp
-	pushq	%rbp
-	movq	%rsp, %rbp
-
-#if 0
-	call	identify_cpu
-
-	/* set up bootstrap stack */
-	movq	proc0kstack,%rax	/* location of in-kernel stack */
-			/* bootstrap stack end location */
-	leaq	(KSTACK_PAGES*PAGE_SIZE-PCB_SIZE)(%rax),%rsp
-
-	xorq	%rbp,%rbp		/* mark end of frames */
+	xorq	%rbp, %rbp
 
-	movq	IdlePML4,%rsi
-	movq	%rsi,(KSTACK_PAGES*PAGE_SIZE-PCB_SIZE+PCB_CR3)(%rax)
-#endif
-
 	call	hammer_time		/* set up cpu for unix operation */
 	call	mi_startup		/* autoconfiguration, mountroot etc */
 0:	hlt
@@ -142,4 +127,3 @@
 	movl	%edx,cpu_feature		# store cpu_feature
 	ret
 #endif
-