From owner-svn-src-projects@FreeBSD.ORG Sun Feb 23 23:23:02 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 613ADD22; Sun, 23 Feb 2014 23:23:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 332E41153; Sun, 23 Feb 2014 23:23:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1NNN2Hu088246; Sun, 23 Feb 2014 23:23:02 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1NNN1dO088242; Sun, 23 Feb 2014 23:23:01 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201402232323.s1NNN1dO088242@svn.freebsd.org> From: Dimitry Andric Date: Sun, 23 Feb 2014 23:23:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r262415 - projects/clang-sparc64/contrib/llvm/lib/Target/Sparc X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Feb 2014 23:23:02 -0000 Author: dim Date: Sun Feb 23 23:23:01 2014 New Revision: 262415 URL: http://svnweb.freebsd.org/changeset/base/262415 Log: Pull in r201994 from upstream llvm trunk (by Benjamin Kramer): SPARC: Implement TRAP lowering. Matches what GCC emits. This lets clang emit "ta 5" for trap instructions on sparc64, instead of emitting a call to abort(), making it possible to link the kernel. Modified: projects/clang-sparc64/contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp projects/clang-sparc64/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.td Modified: projects/clang-sparc64/contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp ============================================================================== --- projects/clang-sparc64/contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp Sun Feb 23 23:13:53 2014 (r262414) +++ projects/clang-sparc64/contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp Sun Feb 23 23:23:01 2014 (r262415) @@ -1566,6 +1566,8 @@ SparcTargetLowering::SparcTargetLowering // VAARG needs to be lowered to not do unaligned accesses for doubles. setOperationAction(ISD::VAARG , MVT::Other, Custom); + setOperationAction(ISD::TRAP , MVT::Other, Legal); + // Use the default implementation. setOperationAction(ISD::VACOPY , MVT::Other, Expand); setOperationAction(ISD::VAEND , MVT::Other, Expand); Modified: projects/clang-sparc64/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.td ============================================================================== --- projects/clang-sparc64/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.td Sun Feb 23 23:13:53 2014 (r262414) +++ projects/clang-sparc64/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.td Sun Feb 23 23:23:01 2014 (r262415) @@ -312,6 +312,9 @@ let hasSideEffects = 1, mayStore = 1 in [(flushw)]>; } +let isBarrier = 1, isTerminator = 1, rd = 0b1000, rs1 = 0, simm13 = 5 in + def TA5 : F3_2<0b10, 0b111010, (outs), (ins), "ta 5", [(trap)]>; + let rd = 0 in def UNIMP : F2_1<0b000, (outs), (ins i32imm:$val), "unimp $val", []>;