From owner-svn-src-projects@FreeBSD.ORG Fri Jul 10 19:09:35 2009 Return-Path: <owner-svn-src-projects@FreeBSD.ORG> Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 44EA3106564A; Fri, 10 Jul 2009 19:09:35 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 198DE8FC13; Fri, 10 Jul 2009 19:09:35 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6AJ9YUa029505; Fri, 10 Jul 2009 19:09:34 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6AJ9YYM029503; Fri, 10 Jul 2009 19:09:34 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200907101909.n6AJ9YYM029503@svn.freebsd.org> From: Warner Losh <imp@FreeBSD.org> Date: Fri, 10 Jul 2009 19:09:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r195584 - projects/mips/sys/mips/mips X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 10 Jul 2009 19:09:35 -0000 Author: imp Date: Fri Jul 10 19:09:34 2009 New Revision: 195584 URL: http://svn.freebsd.org/changeset/base/195584 Log: Use PTR_* macros for pointers, and not potentially mips64 unsafe operations. Modified: projects/mips/sys/mips/mips/copystr.S Modified: projects/mips/sys/mips/mips/copystr.S ============================================================================== --- projects/mips/sys/mips/mips/copystr.S Fri Jul 10 19:08:48 2009 (r195583) +++ projects/mips/sys/mips/mips/copystr.S Fri Jul 10 19:09:34 2009 (r195584) @@ -67,13 +67,13 @@ ENTRY(copystr) move v0, zero beqz a2, 2f move t1, zero -1: subu a2, 1 +1: subu a2, 1 /*XXX mips64 unsafe -- long */ lbu t0, 0(a0) - addu a0, 1 + PTR_ADDU a0, 1 sb t0, 0(a1) - addu a1, 1 + PTR_ADDU a1, 1 beqz t0, 3f /* NULL - end of string*/ - addu t1, 1 + addu t1, 1 /*XXX mips64 unsafe -- long */ bnez a2, 1b nop 2: /* ENAMETOOLONG */ @@ -81,7 +81,7 @@ ENTRY(copystr) 3: /* done != NULL -> how many bytes were copied */ beqz a3, 4f nop - sw t1, 0(a3) + sw t1, 0(a3) /*XXX mips64 unsafe -- long */ 4: jr ra nop .set reorder @@ -100,25 +100,25 @@ LEAF(copyinstr) .set noat lw t2, pcpup lw v1, PC_CURPCB(t2) - la v0, _C_LABEL(copystrerr) + PTR_LA v0, _C_LABEL(copystrerr) blt a0, zero, _C_LABEL(copystrerr) sw v0, PCB_ONFAULT(v1) move t0, a2 beq a2, zero, 4f 1: lbu v0, 0(a0) - subu a2, a2, 1 + subu a2, a2, 1 /*xxx mips64 unsafe -- long */ beq v0, zero, 2f sb v0, 0(a1) - addu a0, a0, 1 + PTR_ADDU a0, a0, 1 bne a2, zero, 1b - addu a1, a1, 1 + PTR_ADDU a1, a1, 1 4: li v0, ENAMETOOLONG 2: beq a3, zero, 3f - subu a2, t0, a2 - sw a2, 0(a3) + subu a2, t0, a2 /*xxx mips64 unsafe -- long */ + sw a2, 0(a3) /*xxx mips64 unsafe -- long */ 3: j ra # v0 is 0 or ENAMETOOLONG sw zero, PCB_ONFAULT(v1) @@ -138,25 +138,25 @@ LEAF(copyoutstr) .set noat lw t2, pcpup lw v1, PC_CURPCB(t2) - la v0, _C_LABEL(copystrerr) + PTR_LA v0, _C_LABEL(copystrerr) blt a1, zero, _C_LABEL(copystrerr) sw v0, PCB_ONFAULT(v1) move t0, a2 beq a2, zero, 4f 1: lbu v0, 0(a0) - subu a2, a2, 1 + subu a2, a2, 1 /*xxx mips64 unsafe -- long */ beq v0, zero, 2f sb v0, 0(a1) - addu a0, a0, 1 + PTR_ADDU a0, a0, 1 bne a2, zero, 1b - addu a1, a1, 1 + PTR_ADDU a1, a1, 1 4: li v0, ENAMETOOLONG 2: beq a3, zero, 3f - subu a2, t0, a2 - sw a2, 0(a3) + subu a2, t0, a2 /*xxx mips64 unsafe -- long */ + sw a2, 0(a3) /*xxx mips64 unsafe -- long */ 3: j ra # v0 is 0 or ENAMETOOLONG sw zero, PCB_ONFAULT(v1)