Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I removed the extra instructions which compute the return value in Hiroshi 

Horitomo's implementation a bit too hastily.  They are required to handle
the unsigned comparison required by the standard.
This commit is contained in:
jtc 1997-05-18 21:24:46 +00:00
parent 7fd669bfe6
commit f486d77a92
2 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/libc/arch/m68k/string/strcmp.S
View File

@ -1,10 +1,11 @@
/* $NetBSD: strcmp.S,v 1.9 1997/05/18 20:32:20 jtc Exp $ */ /* $NetBSD: strcmp.S,v 1.10 1997/05/18 21:24:46 jtc Exp $ */
/*- /*-
* Copyright (c) 1997 The NetBSD Foundation, Inc. * Copyright (c) 1997 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.
* *
* This code is derived from software contributed to The NetBSD Foundation * This code is derived from software contributed to The NetBSD Foundation
* by Hiroshi Horitomo <horimoto@cs-aoi.cs.sist.ac.jp> and
* by J.T. Conklin <jtc@netbsd.org>. * by J.T. Conklin <jtc@netbsd.org>.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -39,35 +40,40 @@
#include <machine/asm.h> #include <machine/asm.h>
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
RCSID("$NetBSD: strcmp.S,v 1.9 1997/05/18 20:32:20 jtc Exp $") RCSID("$NetBSD: strcmp.S,v 1.10 1997/05/18 21:24:46 jtc Exp $")
#endif /* LIBC_SCCS and not lint */ #endif /* LIBC_SCCS and not lint */
ENTRY(strcmp) ENTRY(strcmp)
movl sp@(4),a0 movl sp@(4),a0
movl sp@(8),a1 movl sp@(8),a1
L1: /* unrolled by 4 for 680[23]0's */ L1: /* unrolled by 4 for 680[23]0's */
movb a0@+,d0 movb a0@+,d1
jeq L2 jeq L2
subb a1@+,d0 subb a1@+,d1
jne L3 jne L3
movb a0@+,d0 movb a0@+,d1
jeq L2 jeq L2
subb a1@+,d0 subb a1@+,d1
jne L3 jne L3
movb a0@+,d0 movb a0@+,d1
jeq L2 jeq L2
subb a1@+,d0 subb a1@+,d1
jne L3 jne L3
movb a0@+,d0 movb a0@+,d1
jeq L2 jeq L2
subb a1@+,d0 subb a1@+,d1
jeq L1 jeq L1
scs d0
extbl d0 extbl d0
movb d1,d0
rts rts
L2: subb a1@,d0 L2: subb a1@,d1
L3: extbl d0 L3: scs d0
extbl d0
movb d1,d0
rts rts

47
lib/libc/arch/m68k/string/strncmp.S
View File

@ -1,10 +1,11 @@
/* $NetBSD: strncmp.S,v 1.8 1997/05/18 20:32:21 jtc Exp $ */ /* $NetBSD: strncmp.S,v 1.9 1997/05/18 21:24:48 jtc Exp $ */
/*- /*-
* Copyright (c) 1997 The NetBSD Foundation, Inc. * Copyright (c) 1997 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.
* *
* This code is derived from software contributed to The NetBSD Foundation * This code is derived from software contributed to The NetBSD Foundation
* by Hiroshi Horitomo <horimoto@cs-aoi.cs.sist.ac.jp> and
* by J.T. Conklin <jtc@netbsd.org>. * by J.T. Conklin <jtc@netbsd.org>.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -39,46 +40,46 @@
#include <machine/asm.h> #include <machine/asm.h>
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
RCSID("$NetBSD: strncmp.S,v 1.8 1997/05/18 20:32:21 jtc Exp $") RCSID("$NetBSD: strncmp.S,v 1.9 1997/05/18 21:24:48 jtc Exp $")
#endif /* LIBC_SCCS and not lint */ #endif /* LIBC_SCCS and not lint */
ENTRY(strncmp) ENTRY(strncmp)
movl sp@(12),d1 movl sp@(12),d0
jeq L4 jeq L4
movl sp@(4),a0 movl sp@(4),a0
movl sp@(8),a1 movl sp@(8),a1
L1: /* unroll by 4 for m680[23]0's */ L1: /* unroll by 4 for m680[23]0's */
movb a0@+,d0 movb a0@+,d1
jeq L2 jeq L2
subb a1@+,d0 subb a1@+,d1
jne L3 jne L3
subql #1,d1 subql #1,d0
jne L4 jeq L4
movb a0@+,d0 movb a0@+,d1
jeq L2 jeq L2
subb a1@+,d0 subb a1@+,d1
jne L3 jne L3
subql #1,d1 subql #1,d0
jne L4 jeq L4
movb a0@+,d0 movb a0@+,d1
jeq L2 jeq L2
subb a1@+,d0 subb a1@+,d1
jne L3 jne L3
subql #1,d1 subql #1,d0
jne L4 jeq L4
movb a0@+,d0 movb a0@+,d1
jeq L2 jeq L2
subb a1@+,d0 subb a1@+,d1
jne L3 jne L3
subql #1,d1 subql #1,d0
jne L1 jne L1
L4: rts
L4: moveq #0,d0 L2: subb a1@,d1
rts L3: scs d0
extbl d0
L2: subb a1@,d0 movb d1,d0
L3: extbl d0
rts rts