From owner-p4-projects@FreeBSD.ORG Mon Jul 17 19:22:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 654E616A4E8; Mon, 17 Jul 2006 19:22:44 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C10C16A4E6 for ; Mon, 17 Jul 2006 19:22:44 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E8A1743D5D for ; Mon, 17 Jul 2006 19:22:43 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6HJMh2d030520 for ; Mon, 17 Jul 2006 19:22:43 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6HJMhUr030517 for perforce@freebsd.org; Mon, 17 Jul 2006 19:22:43 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 17 Jul 2006 19:22:43 GMT Message-Id: <200607171922.k6HJMhUr030517@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 101790 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jul 2006 19:22:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=101790 Change 101790 by gonzo@gonzo_hq on 2006/07/17 19:22:02 o Fixed stupid bug in bcmp(3) funtion. o copystr(9) implementation added. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/copystr.S#3 edit .. //depot/projects/mips2/src/sys/mips/mips/support.S#6 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/copystr.S#3 (text+ko) ==== @@ -36,11 +36,35 @@ /* * XXXMIPS: Implement these routines */ - +/* + * copystr(9) + * int copystr(const void *src, void *dst, size_t len, + * size_t *done) + */ ENTRY(copystr) - break + move v0, zero + beqz a2, 2f + move t1, zero +1: subu a2, 1 + lbu t0, 0(a0) + addu a0, 1 + sb t0, 0(a1) + addu a1, 1 + beqz t0, 3f /* NULL - end of string*/ + addu t1, 1 + bnez a2, 1b + nop +2: /* ENAMETOOLONG */ + li v0, ENAMETOOLONG +3: /* done != NULL -> how many bytes were copied */ + beqz a3, 4f + nop + sw t1, 0(a3) +4: jr ra + nop END(copystr) + ENTRY(copyinstr) break END(copyinstr) ==== //depot/projects/mips2/src/sys/mips/mips/support.S#6 (text+ko) ==== @@ -58,7 +58,7 @@ nop END(bcopy) -/* XXXMIPS: test/optimize this function. +/* * The normal C bcmp(3), * int bcmp(const void *b1, const void *b2, size_t len) */ @@ -68,7 +68,8 @@ 1: subu a2, 1 lbu t0, 0(a0) lbu t1, 0(a1) - bne t0, t1, 3f + bne t0, t1, 2f + nop addu a0, 1 addu a1, 1 bnezl a2, 1b