From owner-p4-projects@FreeBSD.ORG  Thu Mar  1 00:22:40 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1C0C81065672; Thu,  1 Mar 2012 00:22:40 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D2F22106564A
	for <perforce@FreeBSD.org>; Thu,  1 Mar 2012 00:22:39 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id C0AEF8FC18
	for <perforce@FreeBSD.org>; Thu,  1 Mar 2012 00:22:39 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q210MdxO013865
	for <perforce@FreeBSD.org>; Thu, 1 Mar 2012 00:22:39 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q210MdIK013862
	for perforce@freebsd.org; Thu, 1 Mar 2012 00:22:39 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Thu, 1 Mar 2012 00:22:39 GMT
Message-Id: <201203010022.q210MdIK013862@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 207134 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Mar 2012 00:22:40 -0000

http://p4web.freebsd.org/@@207134?ac=10

Change 207134 by gonzo@gonzo_thinkpad on 2012/03/01 00:22:01

	Fix MIPS64-only code

Affected files ...

.. //depot/projects/dtrace-mips/sys/cddl/dev/dtrace/mips/dtrace_asm.S#3 edit

Differences ...

==== //depot/projects/dtrace-mips/sys/cddl/dev/dtrace/mips/dtrace_asm.S#3 (text+ko) ====

@@ -110,15 +110,14 @@
 /*
 void *
 dtrace_casptr(void *target, void *cmp, void *new)
-XXX: mips64 only
 */
 LEAF(dtrace_casptr)
 1:
 	move	t1, a2
-	lld	t0, 0(a0)
+	PTR_LL	t0, 0(a0)
 	bne	t0, a1, 2f
 	nop
-	scd	t1, 0(a0)
+	PTR_SC	t1, 0(a0)
 	beqz	t1, 1b
 	nop
 2:	move	v0, t0
@@ -165,12 +164,16 @@
 END(dtrace_fuword32_nocheck)
 
 /*
-XXX: mips64 only
 uint64_t
 dtrace_fuword64_nocheck(void *addr)
 */
 LEAF(dtrace_fuword64_nocheck)
+#if defined(__mips_n64) || defined(__mips_n32)
 	ld	v0, 0(a0)
+#else
+	lw	v1,4(a0)
+	lw	v0,0(a0)
+#endif
 	j	ra
 	nop
 END(dtrace_fuword64_nocheck)