From owner-svn-src-all@freebsd.org Tue Dec 13 19:27:33 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1775AC76D4B; Tue, 13 Dec 2016 19:27:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CE34CCE9; Tue, 13 Dec 2016 19:27:32 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBDJRWru087487; Tue, 13 Dec 2016 19:27:32 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBDJRWBO087486; Tue, 13 Dec 2016 19:27:32 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201612131927.uBDJRWBO087486@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Tue, 13 Dec 2016 19:27:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r310029 - head/sys/mips/mips X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Dec 2016 19:27:33 -0000 Author: jhb Date: Tue Dec 13 19:27:31 2016 New Revision: 310029 URL: https://svnweb.freebsd.org/changeset/base/310029 Log: Fix remove_userlocal_code() for n32. n32 kernels use a 64-bit store to the TLS register rather than a 32-bit store. Sponsored by: DARPA / AFRL Modified: head/sys/mips/mips/cpu.c Modified: head/sys/mips/mips/cpu.c ============================================================================== --- head/sys/mips/mips/cpu.c Tue Dec 13 19:22:43 2016 (r310028) +++ head/sys/mips/mips/cpu.c Tue Dec 13 19:27:31 2016 (r310029) @@ -78,9 +78,6 @@ struct mips_cpuinfo cpuinfo; # define _ADDU_V0_T0_T1 \ _ENCODE_INSN(0, T0, T1, V0, OP_DADDU) -# define _MTC0_V0_USERLOCAL \ - _ENCODE_INSN(OP_COP0, OP_DMT, V0, 4, 2) - #else /* mips 32 */ # define _LOAD_T0_MDTLS_A1 \ @@ -93,10 +90,19 @@ struct mips_cpuinfo cpuinfo; # define _ADDU_V0_T0_T1 \ _ENCODE_INSN(0, T0, T1, V0, OP_ADDU) +#endif /* ! __mips_n64 */ + +#if defined(__mips_n64) || defined(__mips_n32) + +# define _MTC0_V0_USERLOCAL \ + _ENCODE_INSN(OP_COP0, OP_DMT, V0, 4, 2) + +#else /* mips o32 */ + # define _MTC0_V0_USERLOCAL \ _ENCODE_INSN(OP_COP0, OP_MT, V0, 4, 2) -#endif /* ! __mips_n64 */ +#endif /* ! (__mips_n64 || __mipsn32) */ #define _JR_RA _ENCODE_INSN(OP_SPECIAL, RA, 0, 0, OP_JR) #define _NOP 0