From owner-p4-projects@FreeBSD.ORG  Fri Nov  5 23:16:12 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 50C5416A4D0; Fri,  5 Nov 2004 23:16:12 +0000 (GMT)
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 2469C16A4CE
	for <perforce@freebsd.org>; Fri,  5 Nov 2004 23:16:12 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 189C743D1D
	for <perforce@freebsd.org>; Fri,  5 Nov 2004 23:16:12 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA5NGBnv040483
	for <perforce@freebsd.org>; Fri, 5 Nov 2004 23:16:11 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA5NGBZo040480
	for perforce@freebsd.org; Fri, 5 Nov 2004 23:16:11 GMT
	(envelope-from peter@freebsd.org)
Date: Fri, 5 Nov 2004 23:16:11 GMT
Message-Id: <200411052316.iA5NGBZo040480@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 64386 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: Fri, 05 Nov 2004 23:16:13 -0000

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

Change 64386 by peter@peter_daintree on 2004/11/05 23:15:13

	use amd64-centric methods for the emulated environment

Affected files ...

.. //depot/projects/hammer/lib/libc/i386/gen/_set_tp.c#2 edit

Differences ...

==== //depot/projects/hammer/lib/libc/i386/gen/_set_tp.c#2 (text+ko) ====

@@ -34,9 +34,12 @@
 void
 _set_tp(void *tp)
 {
+#ifndef COMPAT_32BIT
 	union descriptor ldt;
+#endif
 	int sel;
 
+#ifndef COMPAT_32BIT
 	memset(&ldt, 0, sizeof(ldt));
 	ldt.sd.sd_lolimit = 0xffff;	/* 4G limit */
 	ldt.sd.sd_lobase = ((uintptr_t)tp) & 0xffffff;
@@ -49,4 +52,7 @@
 	ldt.sd.sd_hibase = (((uintptr_t)tp) >> 24) & 0xff;
 	sel = i386_set_ldt(LDT_AUTO_ALLOC, &ldt, 1);
 	__asm __volatile("movl %0,%%gs" : : "rm" ((sel << 3) | 7));
+#else
+	_amd64_set_gs(tp);
+#endif
 }