From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kuninori Morimoto Date: Thu, 19 Dec 2019 01:24:09 +0000 Subject: [PATCH v2 2/3] sh: fixup strncpy() warning and add missing padding Message-Id: <87tv5xyuo6.wl-kuninori.morimoto.gx@renesas.com> List-Id: References: <87woatyutt.wl-kuninori.morimoto.gx@renesas.com> In-Reply-To: <87woatyutt.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Yoshinori Sato , Rich Felker , Karl Nasrallah Cc: Linux-SH , Linux-Renesas , Geert Uytterhoeven From: Karl Nasrallah Current SH will get below warning at strncpy() In file included from ${LINUX}/arch/sh/include/asm/string.h:3, from ${LINUX}/include/linux/string.h:20, from ${LINUX}/include/linux/bitmap.h:9, from ${LINUX}/include/linux/nodemask.h:95, from ${LINUX}/include/linux/mmzone.h:17, from ${LINUX}/include/linux/gfp.h:6, from ${LINUX}/innclude/linux/slab.h:15, from ${LINUX}/linux/drivers/mmc/host/vub300.c:38: ${LINUX}/drivers/mmc/host/vub300.c: In function 'new_system_port_status': ${LINUX}/arch/sh/include/asm/string_32.h:51:42: warning: array subscript\ 80 is above array bounds of 'char[26]' [-Warray-bounds] : "0" (__dest), "1" (__src), "r" (__src+__n) ~~~~~^~~~ And current implementation is missing padding which strncpy() should support. This patch solves these 2 issues. Signed-off-by: Karl Nasrallah Signed-off-by: Kuninori Morimoto --- v1 -> v2 - tidyup git-log - tidyup 80char - tidyup Subject arch/sh/include/asm/string_32.h | 58 +++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/arch/sh/include/asm/string_32.h b/arch/sh/include/asm/string_32.h index 3558b1d..3b4aec0 100644 --- a/arch/sh/include/asm/string_32.h +++ b/arch/sh/include/asm/string_32.h @@ -31,27 +31,47 @@ static inline char *strcpy(char *__dest, const char *__src) #define __HAVE_ARCH_STRNCPY static inline char *strncpy(char *__dest, const char *__src, size_t __n) { - register char *__xdest = __dest; - unsigned long __dummy; + char * retval = __dest; + const char * __dest_end = __dest + __n - 1; + register unsigned int * r0_register __asm__ ("r0"); + /* size_t is always unsigned */ if (__n = 0) - return __xdest; - - __asm__ __volatile__( - "1:\n" - "mov.b @%1+, %2\n\t" - "mov.b %2, @%0\n\t" - "cmp/eq #0, %2\n\t" - "bt/s 2f\n\t" - " cmp/eq %5,%1\n\t" - "bf/s 1b\n\t" - " add #1, %0\n" - "2:" - : "=r" (__dest), "=r" (__src), "=&z" (__dummy) - : "0" (__dest), "1" (__src), "r" (__src+__n) - : "memory", "t"); - - return __xdest; + return retval; + + /* + * Some notes: + * - cmp/eq #imm8,r0 is its own instruction + * - incrementing dest and comparing to dest_end handles the size + * parameter in only one instruction + * - mov.b R0,@Rn+ is SH2A only, but we can fill a delay slot with + * "add #1,%[dest]" + */ + + __asm__ __volatile__ ( + "strncpy_start:\n\t" + "mov.b @%[src]+,%[r0_reg]\n\t" + "cmp/eq #0,%[r0_reg]\n\t" + "bt.s strncpy_pad\n\t" + "cmp/eq %[dest],%[dest_end]\n\t" + "bt.s strncpy_end\n\t" + "mov.b %[r0_reg],@%[dest]\n\t" + "bra strncpy_start\n\t" + "add #1,%[dest]\n\t" + "strncpy_pad:\n\t" + "bt.s strncpy_end\n\t" + "mov.b %[r0_reg],@%[dest]\n\t" + "add #1,%[dest]\n\t" + "bra strncpy_pad\n\t" + "cmp/eq %[dest],%[dest_end]\n\t" + "strncpy_end:\n\t" + : [src] "+r" (__src), [dest] "+r" (__dest), + [r0_reg] "+&z" (r0_register) + : [dest_end] "r" (__dest_end) + : "t","memory" + ); + + return retval; } #define __HAVE_ARCH_STRCMP -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8830FC43603 for ; Thu, 19 Dec 2019 01:24:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 63BE4227BF for ; Thu, 19 Dec 2019 01:24:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726671AbfLSBYL (ORCPT ); Wed, 18 Dec 2019 20:24:11 -0500 Received: from relmlor2.renesas.com ([210.160.252.172]:59169 "EHLO relmlie6.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726518AbfLSBYL (ORCPT ); Wed, 18 Dec 2019 20:24:11 -0500 Date: 19 Dec 2019 10:24:09 +0900 X-IronPort-AV: E=Sophos;i="5.69,330,1571670000"; d="scan'208";a="34579750" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie6.idc.renesas.com with ESMTP; 19 Dec 2019 10:24:09 +0900 Received: from morimoto-PC.renesas.com (unknown [10.166.18.140]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id C8F3C4007F52; Thu, 19 Dec 2019 10:24:09 +0900 (JST) Message-ID: <87tv5xyuo6.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 2/3] sh: fixup strncpy() warning and add missing padding User-Agent: Wanderlust/2.15.9 Emacs/24.5 Mule/6.0 To: Yoshinori Sato , Rich Felker , Karl Nasrallah Cc: Linux-SH , Linux-Renesas , Geert Uytterhoeven In-Reply-To: <87woatyutt.wl-kuninori.morimoto.gx@renesas.com> References: <87woatyutt.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org From: Karl Nasrallah Current SH will get below warning at strncpy() In file included from ${LINUX}/arch/sh/include/asm/string.h:3, from ${LINUX}/include/linux/string.h:20, from ${LINUX}/include/linux/bitmap.h:9, from ${LINUX}/include/linux/nodemask.h:95, from ${LINUX}/include/linux/mmzone.h:17, from ${LINUX}/include/linux/gfp.h:6, from ${LINUX}/innclude/linux/slab.h:15, from ${LINUX}/linux/drivers/mmc/host/vub300.c:38: ${LINUX}/drivers/mmc/host/vub300.c: In function 'new_system_port_status': ${LINUX}/arch/sh/include/asm/string_32.h:51:42: warning: array subscript\ 80 is above array bounds of 'char[26]' [-Warray-bounds] : "0" (__dest), "1" (__src), "r" (__src+__n) ~~~~~^~~~ And current implementation is missing padding which strncpy() should support. This patch solves these 2 issues. Signed-off-by: Karl Nasrallah Signed-off-by: Kuninori Morimoto --- v1 -> v2 - tidyup git-log - tidyup 80char - tidyup Subject arch/sh/include/asm/string_32.h | 58 +++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/arch/sh/include/asm/string_32.h b/arch/sh/include/asm/string_32.h index 3558b1d..3b4aec0 100644 --- a/arch/sh/include/asm/string_32.h +++ b/arch/sh/include/asm/string_32.h @@ -31,27 +31,47 @@ static inline char *strcpy(char *__dest, const char *__src) #define __HAVE_ARCH_STRNCPY static inline char *strncpy(char *__dest, const char *__src, size_t __n) { - register char *__xdest = __dest; - unsigned long __dummy; + char * retval = __dest; + const char * __dest_end = __dest + __n - 1; + register unsigned int * r0_register __asm__ ("r0"); + /* size_t is always unsigned */ if (__n == 0) - return __xdest; - - __asm__ __volatile__( - "1:\n" - "mov.b @%1+, %2\n\t" - "mov.b %2, @%0\n\t" - "cmp/eq #0, %2\n\t" - "bt/s 2f\n\t" - " cmp/eq %5,%1\n\t" - "bf/s 1b\n\t" - " add #1, %0\n" - "2:" - : "=r" (__dest), "=r" (__src), "=&z" (__dummy) - : "0" (__dest), "1" (__src), "r" (__src+__n) - : "memory", "t"); - - return __xdest; + return retval; + + /* + * Some notes: + * - cmp/eq #imm8,r0 is its own instruction + * - incrementing dest and comparing to dest_end handles the size + * parameter in only one instruction + * - mov.b R0,@Rn+ is SH2A only, but we can fill a delay slot with + * "add #1,%[dest]" + */ + + __asm__ __volatile__ ( + "strncpy_start:\n\t" + "mov.b @%[src]+,%[r0_reg]\n\t" + "cmp/eq #0,%[r0_reg]\n\t" + "bt.s strncpy_pad\n\t" + "cmp/eq %[dest],%[dest_end]\n\t" + "bt.s strncpy_end\n\t" + "mov.b %[r0_reg],@%[dest]\n\t" + "bra strncpy_start\n\t" + "add #1,%[dest]\n\t" + "strncpy_pad:\n\t" + "bt.s strncpy_end\n\t" + "mov.b %[r0_reg],@%[dest]\n\t" + "add #1,%[dest]\n\t" + "bra strncpy_pad\n\t" + "cmp/eq %[dest],%[dest_end]\n\t" + "strncpy_end:\n\t" + : [src] "+r" (__src), [dest] "+r" (__dest), + [r0_reg] "+&z" (r0_register) + : [dest_end] "r" (__dest_end) + : "t","memory" + ); + + return retval; } #define __HAVE_ARCH_STRCMP -- 2.7.4