From owner-svn-src-all@FreeBSD.ORG  Mon Mar 26 01:26:34 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 92DB7106564A;
	Mon, 26 Mar 2012 01:26:34 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7E2E78FC18;
	Mon, 26 Mar 2012 01:26:34 +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 q2Q1QYpx007894;
	Mon, 26 Mar 2012 01:26:34 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2Q1QYVD007892;
	Mon, 26 Mar 2012 01:26:34 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <201203260126.q2Q1QYVD007892@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Mon, 26 Mar 2012 01:26:34 +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: r233484 - head/sys/cddl/dev/dtrace/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: Mon, 26 Mar 2012 01:26:34 -0000

Author: gonzo
Date: Mon Mar 26 01:26:33 2012
New Revision: 233484
URL: http://svn.freebsd.org/changeset/base/233484

Log:
  Use macroses to load/store pointers and increase indexes instead of
      hardcoded MIPS64 instructions

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

Modified: head/sys/cddl/dev/dtrace/mips/dtrace_asm.S
==============================================================================
--- head/sys/cddl/dev/dtrace/mips/dtrace_asm.S	Mon Mar 26 01:16:56 2012	(r233483)
+++ head/sys/cddl/dev/dtrace/mips/dtrace_asm.S	Mon Mar 26 01:26:33 2012	(r233484)
@@ -158,7 +158,7 @@ uint32_t
 dtrace_fuword32_nocheck(void *addr)
 */
 LEAF(dtrace_fuword32_nocheck)
-	lwu	v0, 0(a0)
+	lw	v0, 0(a0)
 	j	ra
 	nop
 END(dtrace_fuword32_nocheck)
@@ -189,9 +189,9 @@ LEAF(dtrace_copy)
 	nop
 	lbu	t0, 0(a0)
 	sb	t0, 0(a1)
-	daddu	a0, a0, 1
-	daddu	a1, a1, 1
-	dsubu	a2, a2, 1
+	PTR_ADDU	a0, a0, 1
+	PTR_ADDU	a1, a1, 1
+	INT_SUBU	a2, a2, 1
 	j	1b
 	nop
 2:
@@ -209,9 +209,9 @@ LEAF(dtrace_copystr)
 1:
 	lbu	t0, 0(a0)
 	sb	t0, 0(a1)
-	daddu	a0, a0, 1
-	daddu	a1, a1, 1
-	dsubu	a2, a2, 1
+	PTR_ADDU	a0, a0, 1
+	PTR_ADDU	a1, a1, 1
+	INT_SUBU	a2, a2, 1
 	beqz	t0, 2f
 	nop
 	lhu	t1, (a3)
@@ -231,9 +231,9 @@ void dtrace_invop_init(void)
 */
 LEAF(dtrace_invop_init)
 	/* XXX: impement it properly */
-	dla	t0, dtrace_invop_jump_addr
+	PTR_LA	t0, dtrace_invop_jump_addr
 	/* dla	t1, dtrace_invop_start */
-	sd	zero, 0(t0)
+	PTR_S	zero, 0(t0)
 	j	ra
 	nop
 END(dtrace_invop_init)
@@ -242,8 +242,8 @@ END(dtrace_invop_init)
 void dtrace_invop_uninit(void)
 */
 LEAF(dtrace_invop_uninit)
-	dla	t0, dtrace_invop_jump_addr
-	sd	zero, 0(t0)
+	PTR_LA	t0, dtrace_invop_jump_addr
+	PTR_S	zero, 0(t0)
 	j	ra
 	nop
 END(dtrace_invop_uninit)