From owner-svn-src-all@freebsd.org  Fri May 27 17:58:11 2016
Return-Path: <owner-svn-src-all@freebsd.org>
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 886C9B4CCCA;
 Fri, 27 May 2016 17:58:11 +0000 (UTC) (envelope-from br@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 5913417D0;
 Fri, 27 May 2016 17:58:11 +0000 (UTC) (envelope-from br@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4RHwAd3082214;
 Fri, 27 May 2016 17:58:10 GMT (envelope-from br@FreeBSD.org)
Received: (from br@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4RHwAmm082213;
 Fri, 27 May 2016 17:58:10 GMT (envelope-from br@FreeBSD.org)
Message-Id: <201605271758.u4RHwAmm082213@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org
 using -f
From: Ruslan Bukin <br@FreeBSD.org>
Date: Fri, 27 May 2016 17:58:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r300859 - head/sys/cddl/dev/dtrace/riscv
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.22
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 May 2016 17:58:11 -0000

Author: br
Date: Fri May 27 17:58:10 2016
New Revision: 300859
URL: https://svnweb.freebsd.org/changeset/base/300859

Log:
  Correct the implementation of dtrace_interrupt_disable/enable.
  
  Pointed out by:	andrew
  Sponsored by:	DARPA, AFRL
  Sponsored by:	HEIF5

Modified:
  head/sys/cddl/dev/dtrace/riscv/dtrace_asm.S

Modified: head/sys/cddl/dev/dtrace/riscv/dtrace_asm.S
==============================================================================
--- head/sys/cddl/dev/dtrace/riscv/dtrace_asm.S	Fri May 27 17:57:30 2016	(r300858)
+++ head/sys/cddl/dev/dtrace/riscv/dtrace_asm.S	Fri May 27 17:58:10 2016	(r300859)
@@ -57,7 +57,8 @@ END(dtrace_membar_consumer)
 dtrace_icookie_t dtrace_interrupt_disable(void)
 */
 ENTRY(dtrace_interrupt_disable)
-	csrci	sstatus, 1
+	csrrci	a0, sstatus, SSTATUS_IE
+	andi	a0, a0, SSTATUS_IE
 	RET
 END(dtrace_interrupt_disable)
 
@@ -65,7 +66,7 @@ END(dtrace_interrupt_disable)
 void dtrace_interrupt_enable(dtrace_icookie_t cookie)
 */
 ENTRY(dtrace_interrupt_enable)
-	csrsi	sstatus, 1
+	csrs	sstatus, a0
 	RET
 END(dtrace_interrupt_enable)
 /*