From owner-svn-src-head@FreeBSD.ORG  Sun Mar  4 05:19:56 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A510E106566C;
	Sun,  4 Mar 2012 05:19:56 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 949238FC08;
	Sun,  4 Mar 2012 05:19:56 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q245JuaB015766;
	Sun, 4 Mar 2012 05:19:56 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q245Ju6e015764;
	Sun, 4 Mar 2012 05:19:56 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201203040519.q245Ju6e015764@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Sun, 4 Mar 2012 05:19:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232478 - head/sys/mips/mips
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Mar 2012 05:19:56 -0000

Author: jmallett
Date: Sun Mar  4 05:19:55 2012
New Revision: 232478
URL: http://svn.freebsd.org/changeset/base/232478

Log:
  Fix tls base computation with COMPAT_FREEBSD32 on n64 kernels.  The previous
  version was missing an else and would always use the n64 TP_OFFSET.  Eliminate
  some duplication of logic here.
  
  It may be worth getting rid of some of the ifdefs and introducing gratuitous
  SV_ILP32 runtime checks on n64 kernels without COMPAT_FREEBSD32 and on o32
  kernels, similarly to how PowerPC works.

Modified:
  head/sys/mips/mips/vm_machdep.c

Modified: head/sys/mips/mips/vm_machdep.c
==============================================================================
--- head/sys/mips/mips/vm_machdep.c	Sun Mar  4 00:42:18 2012	(r232477)
+++ head/sys/mips/mips/vm_machdep.c	Sun Mar  4 05:19:55 2012	(r232478)
@@ -618,14 +618,18 @@ cpu_set_user_tls(struct thread *td, void
 
 #ifdef __mips_n64
 #ifdef COMPAT_FREEBSD32
-	if (SV_PROC_FLAG(td->td_proc, SV_ILP32))
-		td->td_md.md_tls = (char*)tls_base + 0x7008;
+	if (!SV_PROC_FLAG(td->td_proc, SV_ILP32)) {
 #endif
-	td->td_md.md_tls = (char*)tls_base + 0x7010;
-#else
-	td->td_md.md_tls = (char*)tls_base + 0x7008;
+		td->td_md.md_tls = (char*)tls_base + 0x7010;
+		return (0);
+#ifdef COMPAT_FREEBSD32
+	}
 #endif
+#endif
+#if !defined(__mips_n64) || defined(COMPAT_FREEBSD32)
+	td->td_md.md_tls = (char*)tls_base + 0x7008;
 	return (0);
+#endif
 }
 
 #ifdef DDB