Commit 8f45db55 authored by Heiko Carstens's avatar Heiko Carstens Committed by Vasily Gorbik
Browse files

s390/string: get rid of register asm 



Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 79ee201e

arch/s390/include/asm/string.h

+35 −24
Original line number Diff line number Diff line
@@ -107,16 +107,18 @@ static inline void *memset64(uint64_t *s, uint64_t v, size_t count) 
#ifdef __HAVE_ARCH_MEMCHR

static inline void *memchr(const void * s, int c, size_t n)

{

	register int r0 asm("0") = (char) c;

	const void *ret = s + n;



	asm volatile(

		"0:	srst	%0,%1\n"

		"	lgr	0,%[c]\n"

		"0:	srst	%[ret],%[s]\n"

		"	jo	0b\n"

		"	jl	1f\n"

		"	la	%0,0\n"

		"	la	%[ret],0\n"

		"1:"

		: "+a" (ret), "+&a" (s) : "d" (r0) : "cc", "memory");

		: [ret] "+&a" (ret), [s] "+&a" (s)

		: [c] "d" (c)

		: "cc", "memory", "0");

	return (void *) ret;

}

#endif
@@ -124,13 +126,15 @@ static inline void *memchr(const void * s, int c, size_t n) 
#ifdef __HAVE_ARCH_MEMSCAN

static inline void *memscan(void *s, int c, size_t n)

{

	register int r0 asm("0") = (char) c;

	const void *ret = s + n;



	asm volatile(

		"0:	srst	%0,%1\n"

		"	lgr	0,%[c]\n"

		"0:	srst	%[ret],%[s]\n"

		"	jo	0b\n"

		: "+a" (ret), "+&a" (s) : "d" (r0) : "cc", "memory");

		: [ret] "+&a" (ret), [s] "+&a" (s)

		: [c] "d" (c)

		: "cc", "memory", "0");

	return (void *) ret;

}

#endif
@@ -138,17 +142,18 @@ static inline void *memscan(void *s, int c, size_t n) 
#ifdef __HAVE_ARCH_STRCAT

static inline char *strcat(char *dst, const char *src)

{

	register int r0 asm("0") = 0;

	unsigned long dummy;

	unsigned long dummy = 0;

	char *ret = dst;



	asm volatile(

		"0:	srst	%0,%1\n"

		"	lghi	0,0\n"

		"0:	srst	%[dummy],%[dst]\n"

		"	jo	0b\n"

		"1:	mvst	%0,%2\n"

		"1:	mvst	%[dummy],%[src]\n"

		"	jo	1b"

		: "=&a" (dummy), "+a" (dst), "+a" (src)

		: "d" (r0), "0" (0) : "cc", "memory" );

		: [dummy] "+&a" (dummy), [dst] "+&a" (dst), [src] "+&a" (src)

		:

		: "cc", "memory", "0");

	return ret;

}

#endif
@@ -156,14 +161,15 @@ static inline char *strcat(char *dst, const char *src) 
#ifdef __HAVE_ARCH_STRCPY

static inline char *strcpy(char *dst, const char *src)

{

	register int r0 asm("0") = 0;

	char *ret = dst;



	asm volatile(

		"0:	mvst	%0,%1\n"

		"	lghi	0,0\n"

		"0:	mvst	%[dst],%[src]\n"

		"	jo	0b"

		: "+&a" (dst), "+&a" (src) : "d" (r0)

		: "cc", "memory");

		: [dst] "+&a" (dst), [src] "+&a" (src)

		:

		: "cc", "memory", "0");

	return ret;

}

#endif
@@ -171,28 +177,33 @@ static inline char *strcpy(char *dst, const char *src) 
#if defined(__HAVE_ARCH_STRLEN) || (defined(CONFIG_KASAN) && !defined(__SANITIZE_ADDRESS__))

static inline size_t __no_sanitize_prefix_strfunc(strlen)(const char *s)

{

	register unsigned long r0 asm("0") = 0;

	unsigned long end = 0;

	const char *tmp = s;



	asm volatile(

		"0:	srst	%0,%1\n"

		"	lghi	0,0\n"

		"0:	srst	%[end],%[tmp]\n"

		"	jo	0b"

		: "+d" (r0), "+a" (tmp) :  : "cc", "memory");

	return r0 - (unsigned long) s;

		: [end] "+&a" (end), [tmp] "+&a" (tmp)

		:

		: "cc", "memory", "0");

	return end - (unsigned long)s;

}

#endif



#ifdef __HAVE_ARCH_STRNLEN

static inline size_t strnlen(const char * s, size_t n)

{

	register int r0 asm("0") = 0;

	const char *tmp = s;

	const char *end = s + n;



	asm volatile(

		"0:	srst	%0,%1\n"

		"	lghi	0,0\n"

		"0:	srst	%[end],%[tmp]\n"

		"	jo	0b"

		: "+a" (end), "+a" (tmp) : "d" (r0)  : "cc", "memory");

		: [end] "+&a" (end), [tmp] "+&a" (tmp)

		:

		: "cc", "memory", "0");

	return end - s;

}

#endif