From owner-svn-src-all@FreeBSD.ORG  Tue Mar  6 07:47:29 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 50626106567A;
	Tue,  6 Mar 2012 07:47:29 +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 3BAB28FC18;
	Tue,  6 Mar 2012 07:47:29 +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 q267lT75026198;
	Tue, 6 Mar 2012 07:47:29 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q267lTm1026195;
	Tue, 6 Mar 2012 07:47:29 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201203060747.q267lTm1026195@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Tue, 6 Mar 2012 07:47:29 +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: r232583 - in head/sys/mips: include mips
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Mar 2012 07:47:29 -0000

Author: jmallett
Date: Tue Mar  6 07:47:28 2012
New Revision: 232583
URL: http://svn.freebsd.org/changeset/base/232583

Log:
  When emulating rdhwr for TLS, use the 32-bit offset under COMPAT_FREEBSD32.

Modified:
  head/sys/mips/include/tls.h
  head/sys/mips/mips/trap.c

Modified: head/sys/mips/include/tls.h
==============================================================================
--- head/sys/mips/include/tls.h	Tue Mar  6 03:42:54 2012	(r232582)
+++ head/sys/mips/include/tls.h	Tue Mar  6 07:47:28 2012	(r232583)
@@ -32,6 +32,10 @@
 #ifndef	__MIPS_TLS_H__
 #define	__MIPS_TLS_H__
 
+#if defined(_KERNEL) && !defined(KLD_MODULE) && !defined(_STANDALONE)
+#include "opt_compat.h"
+#endif
+
 /*
  * TLS parameters
  */
@@ -41,6 +45,9 @@
 
 #ifdef __mips_n64
 #define TLS_TCB_SIZE	16
+#ifdef COMPAT_FREEBSD32
+#define TLS_TCB_SIZE32	8
+#endif
 #else
 #define TLS_TCB_SIZE	8
 #endif

Modified: head/sys/mips/mips/trap.c
==============================================================================
--- head/sys/mips/mips/trap.c	Tue Mar  6 03:42:54 2012	(r232582)
+++ head/sys/mips/mips/trap.c	Tue Mar  6 07:47:28 2012	(r232583)
@@ -814,6 +814,11 @@ dofault:
 					if (inst.RType.rd == 29) {
 						frame_regs = &(trapframe->zero);
 						frame_regs[inst.RType.rt] = (register_t)(intptr_t)td->td_md.md_tls;
+#if defined(__mips_n64) && defined(COMPAT_FREEBSD32)
+						if (SV_PROC_FLAG(td->td_proc, SV_ILP32))
+							frame_regs[inst.RType.rt] += TLS_TP_OFFSET + TLS_TCB_SIZE32;
+						else
+#endif
 						frame_regs[inst.RType.rt] += TLS_TP_OFFSET + TLS_TCB_SIZE;
 						trapframe->pc += sizeof(int);
 						goto out;