From owner-p4-projects@FreeBSD.ORG  Sun Apr  6 11:37:49 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2EA8C37B404; Sun,  6 Apr 2003 11:37:49 -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 C3ED637B401
	for <perforce@freebsd.org>; Sun,  6 Apr 2003 11:37:48 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6676843F75
	for <perforce@freebsd.org>; Sun,  6 Apr 2003 11:37:48 -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 h36Ibm0U058617
	for <perforce@freebsd.org>; Sun, 6 Apr 2003 11:37:48 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h36IblQ2058614
	for perforce@freebsd.org; Sun, 6 Apr 2003 11:37:47 -0700 (PDT)
Date: Sun, 6 Apr 2003 11:37:47 -0700 (PDT)
Message-Id: <200304061837.h36IblQ2058614@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 28345 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: Sun, 06 Apr 2003 18:37:50 -0000

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

Change 28345 by peter@peter_overcee on 2003/04/06 11:36:54

	connect up the x86-64 trampoline to elf64_freebsd

Affected files ...

.. //depot/projects/hammer/sys/boot/i386/libi386/elf64_freebsd.c#4 edit

Differences ...

==== //depot/projects/hammer/sys/boot/i386/libi386/elf64_freebsd.c#4 (text+ko) ====

@@ -53,6 +53,8 @@
 u_int32_t entry_hi;
 u_int32_t entry_lo;
 
+extern x86_64_tramp();
+
 /*
  * There is an a.out kernel and one or more a.out modules loaded.  
  * We wish to start executing the kernel image, so make such 
@@ -98,12 +100,12 @@
 	bzero(PT2, PAGE_SIZE);
 
 	/* single PML4 entry */
-	PT4[0] = (p4_entry_t)&PT3[0];
+	PT4[0] = (p4_entry_t)(uintptr_t)&PT3[0];
 	PT4[0] |= PG_V | PG_RW | PG_U;
 
 	/* four PDP entries, 1G each */
 	for (i = 0; i < 4; i++) {
-		PT3[i] = (p3_entry_t)&PT2[i * 512];
+		PT3[i] = (p3_entry_t)(uintptr_t)&PT2[i * 512];
 		PT3[i] |= PG_V | PG_RW | PG_U;
 	}
 
@@ -113,10 +115,12 @@
 		PT2[i] |= PG_V | PG_RW | PG_PS | PG_U;
 	}
 
-    printf("Start @ 0x%lx ...\n", entry);
+    printf("entry_hi: %#x \n", entry_hi);
+    printf("entry_lo: %#x \n", entry_lo);
+    printf("Start @ %#llx ...\n", entry);
 
     dev_cleanup();
-    __exec((void *)entry, boothowto, bootdev, 0, 0, 0, bootinfop, modulep, bi->bi_kernend);
+    __exec((void *)x86_64_tramp, boothowto, bootdev, 0, 0, 0, bootinfop, modulep, bi->bi_kernend);
 
     panic("exec returned");
 }