From 851eb4eb8bb5de4bf2818413de3ce66665439767 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Wed, 1 May 1996 15:12:28 +0000
Subject: [PATCH] use .S version

---
 sys/lib/libkern/arch/m68k/Makefile.inc        |  6 +--
 .../libkern/arch/m68k/{strcat.c => strcat.S}  | 44 +++++++++++--------
 2 files changed, 28 insertions(+), 22 deletions(-)
 rename sys/lib/libkern/arch/m68k/{strcat.c => strcat.S} (72%)

diff --git a/sys/lib/libkern/arch/m68k/Makefile.inc b/sys/lib/libkern/arch/m68k/Makefile.inc
index 4a82786b2e9..643e746f3c1 100644
--- a/sys/lib/libkern/arch/m68k/Makefile.inc
+++ b/sys/lib/libkern/arch/m68k/Makefile.inc
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile.inc,v 1.2 1996/02/29 13:28:27 niklas Exp $
-#	$NetBSD: Makefile.inc,v 1.6 1996/02/06 21:22:06 christos Exp $
+#	$OpenBSD: Makefile.inc,v 1.3 1996/05/01 15:12:28 deraadt Exp $
+#	$NetBSD: Makefile.inc,v 1.7 1996/04/18 01:53:04 cgd Exp $
 
 SRCS+=	__main.c imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \
-	bcmp.S bzero.S ffs.S strcat.c strcmp.S strcpy.S strlen.S strncmp.S \
+	bcmp.S bzero.S ffs.S strcat.S strcmp.S strcpy.S strlen.S strncmp.S \
 	strncpy.S htonl.S htons.S ntohl.S ntohs.S scanc.S skpc.S locc.S \
 	strncasecmp.c
diff --git a/sys/lib/libkern/arch/m68k/strcat.c b/sys/lib/libkern/arch/m68k/strcat.S
similarity index 72%
rename from sys/lib/libkern/arch/m68k/strcat.c
rename to sys/lib/libkern/arch/m68k/strcat.S
index 07296b8ed42..0a8b8f08788 100644
--- a/sys/lib/libkern/arch/m68k/strcat.c
+++ b/sys/lib/libkern/arch/m68k/strcat.S
@@ -1,9 +1,13 @@
-/*	$NetBSD: strcat.c,v 1.2 1994/10/26 06:39:33 cgd Exp $	*/
+/*	$NetBSD: strcat.S,v 1.1 1996/04/18 01:53:06 cgd Exp $	*/
 
-/*
- * Copyright (c) 1988 Regents of the University of California.
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
+ * This code is derived from software contributed to Berkeley by
+ * the Systems Programming Group of the University of Utah Computer
+ * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -33,23 +37,25 @@
  * SUCH DAMAGE.
  */
 
+#include "DEFS.h"
+
 #if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static char *sccsid = "@(#)strcat.c	5.6 (Berkeley) 2/24/91";
+#if 0
+	RCSID("from: @(#)strcpy.s	5.1 (Berkeley) 5/12/90")
+#else
+	RCSID("$NetBSD: strcat.S,v 1.1 1996/04/18 01:53:06 cgd Exp $")
 #endif
-static char *rcsid = "$NetBSD: strcat.c,v 1.2 1994/10/26 06:39:33 cgd Exp $";
 #endif /* LIBC_SCCS and not lint */
 
-#include <string.h>
-
-char *
-strcat(s, append)
-	register char *s;
-	register const char *append;
-{
-	char *save = s;
-
-	for (; *s; ++s);
-	while (*s++ = *append++);
-	return(save);
-}
+ENTRY(strcat)
+	movl	sp@(8),a0		| a0 = fromaddr
+	movl	sp@(4),d0		| return value is toaddr
+	movl	d0,a1			| a1 = toaddr
+slloop:
+	tstb	a1@+			| null?
+	bne	slloop			| no, keep going
+	subql	#1,a1
+scloop:
+	movb	a0@+,a1@+		| copy a byte
+	bne	scloop			| copied non-null, keep going
+	rts
-- 
2.20.1