From owner-p4-projects@FreeBSD.ORG  Wed Apr 30 15:21:11 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4DC4D37B404; Wed, 30 Apr 2003 15:21:11 -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 DD57137B401
	for <perforce@freebsd.org>; Wed, 30 Apr 2003 15:21:10 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8598243F93
	for <perforce@freebsd.org>; Wed, 30 Apr 2003 15:21:10 -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 h3UMLA0U010110
	for <perforce@freebsd.org>; Wed, 30 Apr 2003 15:21:10 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UML9Kw010102
	for perforce@freebsd.org; Wed, 30 Apr 2003 15:21:09 -0700 (PDT)
Date: Wed, 30 Apr 2003 15:21:09 -0700 (PDT)
Message-Id: <200304302221.h3UML9Kw010102@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 30162 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, 30 Apr 2003 22:21:12 -0000

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

Change 30162 by peter@peter_daintree on 2003/04/30 15:20:48

	Ok, make that 3 submits for the price of one.  Finish renaming
	x86_64_tramp to amd64_tramp (I hope).

Affected files ...

.. //depot/projects/hammer/sys/boot/i386/libi386/amd64_tramp.S#2 edit
.. //depot/projects/hammer/sys/boot/i386/libi386/elf64_freebsd.c#11 edit

Differences ...

==== //depot/projects/hammer/sys/boot/i386/libi386/amd64_tramp.S#2 (text+ko) ====

@@ -39,8 +39,8 @@
 	.text
 	.code32
 
-	.globl	x86_64_tramp
-x86_64_tramp:
+	.globl	amd64_tramp
+amd64_tramp:
 	/* Be sure that interrupts are disabled */
 	cli
 

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

@@ -41,7 +41,7 @@
 
 static int	elf64_exec(struct preloaded_file *amp);
 
-struct file_format x86_64_elf = { elf64_loadfile, elf64_exec };
+struct file_format amd64_elf = { elf64_loadfile, elf64_exec };
 
 #define PG_V	0x001
 #define PG_RW	0x002
@@ -58,7 +58,7 @@
 u_int32_t entry_hi;
 u_int32_t entry_lo;
 
-extern x86_64_tramp();
+extern amd64_tramp();
 
 /*
  * There is an a.out kernel and one or more a.out modules loaded.  
@@ -111,7 +111,7 @@
 #endif
 
     dev_cleanup();
-    __exec((void *)VTOP(x86_64_tramp), modulep, kernend);
+    __exec((void *)VTOP(amd64_tramp), modulep, kernend);
 
     panic("exec returned");
 }