1 files changed, 71 insertions, 43 deletions
diff --git a/arch/m68k/lib/memset.c b/arch/m68k/lib/memset.c
index 1389bf455633..f649e6a2e644 100644
--- a/arch/m68k/lib/memset.c
+++ b/arch/m68k/lib/memset.c
@@ -1,47 +1,75 @@
-#include <linux/types.h>
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file COPYING in the main directory of this archive
+ * for more details.
+ */
-void * memset(void * s, int c, size_t count)
+#include <linux/module.h>
+#include <linux/string.h>
+void *memset(void *s, int c, size_t count)
 {
-  void *xs = s;
+        void *xs = s;
-  size_t temp;
+        size_t temp;
-  if (!count)
+        if (!count)
-    return xs;
+                return xs;
-  c &= 0xff;
+        c &= 0xff;
-  c |= c << 8;
+        c |= c << 8;
-  c |= c << 16;
+        c |= c << 16;
-  if ((long) s & 1)
+        if ((long)s & 1) {
-    {
+                char *cs = s;
-      char *cs = s;
+                *cs++ = c;
-      *cs++ = c;
+                s = cs;
-      s = cs;
+                count--;
-      count--;
+        }
-    }
+        if (count > 2 && (long)s & 2) {
-  if (count > 2 && (long) s & 2)
+                short *ss = s;
-    {
+                *ss++ = c;
-      short *ss = s;
+                s = ss;
-      *ss++ = c;
+                count -= 2;
-      s = ss;
+        }
-      count -= 2;
+        temp = count >> 2;
-    }
+        if (temp) {
-  temp = count >> 2;
+                long *ls = s;
-  if (temp)
+#if defined(__mc68020__) || defined(__mc68030__) || \
-    {
+    defined(__mc68040__) || defined(__mc68060__) || defined(__mcpu32__)
-      long *ls = s;
+                size_t temp1;
-      for (; temp; temp--)
+                asm volatile (
-        *ls++ = c;
+                        "       movel %1,%2\n"
-      s = ls;
+                        "       andw  #7,%2\n"
-    }
+                        "       lsrl  #3,%1\n"
-  if (count & 2)
+                        "       negw  %2\n"
-    {
+                        "       jmp   %%pc@(2f,%2:w:2)\n"
-      short *ss = s;
+                        "1:     movel %3,%0@+\n"
-      *ss++ = c;
+                        "       movel %3,%0@+\n"
-      s = ss;
+                        "       movel %3,%0@+\n"
-    }
+                        "       movel %3,%0@+\n"
-  if (count & 1)
+                        "       movel %3,%0@+\n"
-    {
+                        "       movel %3,%0@+\n"
-      char *cs = s;
+                        "       movel %3,%0@+\n"
-      *cs = c;
+                        "       movel %3,%0@+\n"
-    }
+                        "2:     dbra  %1,1b\n"
-  return xs;
+                        "       clrw  %1\n"
+                        "       subql #1,%1\n"
+                        "       jpl   1b"
+                        : "=a" (ls), "=d" (temp), "=&d" (temp1)
+                        : "d" (c), "0" (ls), "1" (temp));
+#else
+                for (; temp; temp--)
+                        *ls++ = c;
+#endif
+                s = ls;
+        }
+        if (count & 2) {
+                short *ss = s;
+                *ss++ = c;
+                s = ss;
+        }
+        if (count & 1) {
+                char *cs = s;
+                *cs = c;
+        }
+        return xs;
 }
+EXPORT_SYMBOL(memset);

diff --git a/arch/m68k/lib/memset.c b/arch/m68k/lib/memset.c index 1389bf455633..f649e6a2e644 100644 --- a/arch/m68k/lib/memset.c +++ b/arch/m68k/lib/memset.c
@@ -1,47 +1,75 @@
1	#include <linux/types.h>	1	/*
		2	* This file is subject to the terms and conditions of the GNU General Public
		3	* License. See the file COPYING in the main directory of this archive
		4	* for more details.
		5	*/
2		6
3	void * memset(void * s, int c, size_t count)	7	#include <linux/module.h>
		8	#include <linux/string.h>
		9
		10	void memset(void s, int c, size_t count)
4	{	11	{
5	void *xs = s;	12	void *xs = s;
6	size_t temp;	13	size_t temp;
7		14
8	if (!count)	15	if (!count)
9	return xs;	16	return xs;
10	c &= 0xff;	17	c &= 0xff;
11	c \|= c << 8;	18	c \|= c << 8;
12	c \|= c << 16;	19	c \|= c << 16;
13	if ((long) s & 1)	20	if ((long)s & 1) {
14	{	21	char *cs = s;
15	char *cs = s;	22	*cs++ = c;
16	*cs++ = c;	23	s = cs;
17	s = cs;	24	count--;
18	count--;	25	}
19	}	26	if (count > 2 && (long)s & 2) {
20	if (count > 2 && (long) s & 2)	27	short *ss = s;
21	{	28	*ss++ = c;
22	short *ss = s;	29	s = ss;
23	*ss++ = c;	30	count -= 2;
24	s = ss;	31	}
25	count -= 2;	32	temp = count >> 2;
26	}	33	if (temp) {
27	temp = count >> 2;	34	long *ls = s;
28	if (temp)	35	#if defined(__mc68020__) \|\| defined(__mc68030__) \|\| \
29	{	36	defined(__mc68040__) \|\| defined(__mc68060__) \|\| defined(__mcpu32__)
30	long *ls = s;	37	size_t temp1;
31	for (; temp; temp--)	38	asm volatile (
32	*ls++ = c;	39	" movel %1,%2\n"
33	s = ls;	40	" andw #7,%2\n"
34	}	41	" lsrl #3,%1\n"
35	if (count & 2)	42	" negw %2\n"
36	{	43	" jmp %%pc@(2f,%2:w:2)\n"
37	short *ss = s;	44	"1: movel %3,%0@+\n"
38	*ss++ = c;	45	" movel %3,%0@+\n"
39	s = ss;	46	" movel %3,%0@+\n"
40	}	47	" movel %3,%0@+\n"
41	if (count & 1)	48	" movel %3,%0@+\n"
42	{	49	" movel %3,%0@+\n"
43	char *cs = s;	50	" movel %3,%0@+\n"
44	*cs = c;	51	" movel %3,%0@+\n"
45	}	52	"2: dbra %1,1b\n"
46	return xs;	53	" clrw %1\n"
		54	" subql #1,%1\n"
		55	" jpl 1b"
		56	: "=a" (ls), "=d" (temp), "=&d" (temp1)
		57	: "d" (c), "0" (ls), "1" (temp));
		58	#else
		59	for (; temp; temp--)
		60	*ls++ = c;
		61	#endif
		62	s = ls;
		63	}
		64	if (count & 2) {
		65	short *ss = s;
		66	*ss++ = c;
		67	s = ss;
		68	}
		69	if (count & 1) {
		70	char *cs = s;
		71	*cs = c;
		72	}
		73	return xs;
47	}	74	}
		75	EXPORT_SYMBOL(memset);