Revert "parisc: Add assembly implementations for memset, strlen, strcpy, strncpy and strcat"

-15

arch/parisc/include/asm/string.h

··· 8 8 #define __HAVE_ARCH_MEMCPY 9 9 void * memcpy(void * dest,const void *src,size_t count); 10 10 11 - #define __HAVE_ARCH_STRLEN 12 - extern size_t strlen(const char *s); 13 - 14 - #define __HAVE_ARCH_STRCPY 15 - extern char *strcpy(char *dest, const char *src); 16 - 17 - #define __HAVE_ARCH_STRNCPY 18 - extern char *strncpy(char *dest, const char *src, size_t count); 19 - 20 - #define __HAVE_ARCH_STRCAT 21 - extern char *strcat(char *dest, const char *src); 22 - 23 - #define __HAVE_ARCH_MEMSET 24 - extern void *memset(void *, int, size_t); 25 - 26 11 #endif

-4

arch/parisc/kernel/parisc_ksyms.c

··· 17 17 18 18 #include <linux/string.h> 19 19 EXPORT_SYMBOL(memset); 20 - EXPORT_SYMBOL(strlen); 21 - EXPORT_SYMBOL(strcpy); 22 - EXPORT_SYMBOL(strncpy); 23 - EXPORT_SYMBOL(strcat); 24 20 25 21 #include <linux/atomic.h> 26 22 EXPORT_SYMBOL(__xchg8);

+2 -2

arch/parisc/lib/Makefile

··· 3 3 # Makefile for parisc-specific library files 4 4 # 5 5 6 - lib-y := lusercopy.o bitops.o checksum.o io.o memcpy.o \ 7 - ucmpdi2.o delay.o string.o 6 + lib-y := lusercopy.o bitops.o checksum.o io.o memset.o memcpy.o \ 7 + ucmpdi2.o delay.o 8 8 9 9 obj-y := iomap.o

+72

arch/parisc/lib/memset.c

··· 1 + /* SPDX-License-Identifier: GPL-2.0-or-later */ 2 + #include <linux/types.h> 3 + #include <asm/string.h> 4 + 5 + #define OPSIZ (BITS_PER_LONG/8) 6 + typedef unsigned long op_t; 7 + 8 + void * 9 + memset (void *dstpp, int sc, size_t len) 10 + { 11 + unsigned int c = sc; 12 + long int dstp = (long int) dstpp; 13 + 14 + if (len >= 8) 15 + { 16 + size_t xlen; 17 + op_t cccc; 18 + 19 + cccc = (unsigned char) c; 20 + cccc |= cccc << 8; 21 + cccc |= cccc << 16; 22 + if (OPSIZ > 4) 23 + /* Do the shift in two steps to avoid warning if long has 32 bits. */ 24 + cccc |= (cccc << 16) << 16; 25 + 26 + /* There are at least some bytes to set. 27 + No need to test for LEN == 0 in this alignment loop. */ 28 + while (dstp % OPSIZ != 0) 29 + { 30 + ((unsigned char *) dstp)[0] = c; 31 + dstp += 1; 32 + len -= 1; 33 + } 34 + 35 + /* Write 8 `op_t' per iteration until less than 8 `op_t' remain. */ 36 + xlen = len / (OPSIZ * 8); 37 + while (xlen > 0) 38 + { 39 + ((op_t *) dstp)[0] = cccc; 40 + ((op_t *) dstp)[1] = cccc; 41 + ((op_t *) dstp)[2] = cccc; 42 + ((op_t *) dstp)[3] = cccc; 43 + ((op_t *) dstp)[4] = cccc; 44 + ((op_t *) dstp)[5] = cccc; 45 + ((op_t *) dstp)[6] = cccc; 46 + ((op_t *) dstp)[7] = cccc; 47 + dstp += 8 * OPSIZ; 48 + xlen -= 1; 49 + } 50 + len %= OPSIZ * 8; 51 + 52 + /* Write 1 `op_t' per iteration until less than OPSIZ bytes remain. */ 53 + xlen = len / OPSIZ; 54 + while (xlen > 0) 55 + { 56 + ((op_t *) dstp)[0] = cccc; 57 + dstp += OPSIZ; 58 + xlen -= 1; 59 + } 60 + len %= OPSIZ; 61 + } 62 + 63 + /* Write the last few bytes. */ 64 + while (len > 0) 65 + { 66 + ((unsigned char *) dstp)[0] = c; 67 + dstp += 1; 68 + len -= 1; 69 + } 70 + 71 + return dstpp; 72 + }

-136

arch/parisc/lib/string.S

··· 1 - // SPDX-License-Identifier: GPL-2.0 2 - /* 3 - * PA-RISC assembly string functions 4 - * 5 - * Copyright (C) 2019 Helge Deller <deller@gmx.de> 6 - */ 7 - 8 - #include <asm/assembly.h> 9 - #include <linux/linkage.h> 10 - 11 - .section .text.hot 12 - .level PA_ASM_LEVEL 13 - 14 - t0 = r20 15 - t1 = r21 16 - t2 = r22 17 - 18 - ENTRY_CFI(strlen, frame=0,no_calls) 19 - or,COND(<>) arg0,r0,ret0 20 - b,l,n .Lstrlen_null_ptr,r0 21 - depwi 0,31,2,ret0 22 - cmpb,COND(<>) arg0,ret0,.Lstrlen_not_aligned 23 - ldw,ma 4(ret0),t0 24 - cmpib,tr 0,r0,.Lstrlen_loop 25 - uxor,nbz r0,t0,r0 26 - .Lstrlen_not_aligned: 27 - uaddcm arg0,ret0,t1 28 - shladd t1,3,r0,t1 29 - mtsar t1 30 - depwi -1,%sar,32,t0 31 - uxor,nbz r0,t0,r0 32 - .Lstrlen_loop: 33 - b,l,n .Lstrlen_end_loop,r0 34 - ldw,ma 4(ret0),t0 35 - cmpib,tr 0,r0,.Lstrlen_loop 36 - uxor,nbz r0,t0,r0 37 - .Lstrlen_end_loop: 38 - extrw,u,<> t0,7,8,r0 39 - addib,tr,n -3,ret0,.Lstrlen_out 40 - extrw,u,<> t0,15,8,r0 41 - addib,tr,n -2,ret0,.Lstrlen_out 42 - extrw,u,<> t0,23,8,r0 43 - addi -1,ret0,ret0 44 - .Lstrlen_out: 45 - bv r0(rp) 46 - uaddcm ret0,arg0,ret0 47 - .Lstrlen_null_ptr: 48 - bv,n r0(rp) 49 - ENDPROC_CFI(strlen) 50 - 51 - 52 - ENTRY_CFI(strcpy, frame=0,no_calls) 53 - ldb 0(arg1),t0 54 - stb t0,0(arg0) 55 - ldo 0(arg0),ret0 56 - ldo 1(arg1),t1 57 - cmpb,= r0,t0,2f 58 - ldo 1(arg0),t2 59 - 1: ldb 0(t1),arg1 60 - stb arg1,0(t2) 61 - ldo 1(t1),t1 62 - cmpb,<> r0,arg1,1b 63 - ldo 1(t2),t2 64 - 2: bv,n r0(rp) 65 - ENDPROC_CFI(strcpy) 66 - 67 - 68 - ENTRY_CFI(strncpy, frame=0,no_calls) 69 - ldb 0(arg1),t0 70 - stb t0,0(arg0) 71 - ldo 1(arg1),t1 72 - ldo 0(arg0),ret0 73 - cmpb,= r0,t0,2f 74 - ldo 1(arg0),arg1 75 - 1: ldo -1(arg2),arg2 76 - cmpb,COND(=),n r0,arg2,2f 77 - ldb 0(t1),arg0 78 - stb arg0,0(arg1) 79 - ldo 1(t1),t1 80 - cmpb,<> r0,arg0,1b 81 - ldo 1(arg1),arg1 82 - 2: bv,n r0(rp) 83 - ENDPROC_CFI(strncpy) 84 - 85 - 86 - ENTRY_CFI(strcat, frame=0,no_calls) 87 - ldb 0(arg0),t0 88 - cmpb,= t0,r0,2f 89 - ldo 0(arg0),ret0 90 - ldo 1(arg0),arg0 91 - 1: ldb 0(arg0),t1 92 - cmpb,<>,n r0,t1,1b 93 - ldo 1(arg0),arg0 94 - 2: ldb 0(arg1),t2 95 - stb t2,0(arg0) 96 - ldo 1(arg0),arg0 97 - ldb 0(arg1),t0 98 - cmpb,<> r0,t0,2b 99 - ldo 1(arg1),arg1 100 - bv,n r0(rp) 101 - ENDPROC_CFI(strcat) 102 - 103 - 104 - ENTRY_CFI(memset, frame=0,no_calls) 105 - copy arg0,ret0 106 - cmpb,COND(=) r0,arg0,4f 107 - copy arg0,t2 108 - cmpb,COND(=) r0,arg2,4f 109 - ldo -1(arg2),arg3 110 - subi -1,arg3,t0 111 - subi 0,t0,t1 112 - cmpiclr,COND(>=) 0,t1,arg2 113 - ldo -1(t1),arg2 114 - extru arg2,31,2,arg0 115 - 2: stb arg1,0(t2) 116 - ldo 1(t2),t2 117 - addib,>= -1,arg0,2b 118 - ldo -1(arg3),arg3 119 - cmpiclr,COND(<=) 4,arg2,r0 120 - b,l,n 4f,r0 121 - #ifdef CONFIG_64BIT 122 - depd,* r0,63,2,arg2 123 - #else 124 - depw r0,31,2,arg2 125 - #endif 126 - ldo 1(t2),t2 127 - 3: stb arg1,-1(t2) 128 - stb arg1,0(t2) 129 - stb arg1,1(t2) 130 - stb arg1,2(t2) 131 - addib,COND(>) -4,arg2,3b 132 - ldo 4(t2),t2 133 - 4: bv,n r0(rp) 134 - ENDPROC_CFI(memset) 135 - 136 - .end

Configure Feed

Configure Feed