sockaddr's now require length (K. Sklower);

[unix-history] / usr / src / lib / libc / vax / string / strcmp.s

diff --git a/usr/src/lib/libc/vax/string/strcmp.s b/usr/src/lib/libc/vax/string/strcmp.s
index 2b7f4d4..6f788b1 100644 (file)
--- a/usr/src/lib/libc/vax/string/strcmp.s
+++ b/usr/src/lib/libc/vax/string/strcmp.s
@@ -1,4 +1,23 @@
-/*     strcmp.s        4.1     84/11/01        */
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+       .asciz "@(#)strcmp.s    5.5 (Berkeley) %G%"
+#endif /* LIBC_SCCS and not lint */

 
 /*
  * Compare string s1 lexicographically to string s2.
 
 /*
  * Compare string s1 lexicographically to string s2.


@@ -10,25 +29,41 @@
  * strcmp(s1, s2)
  *     char *s1, *s2;
  */
  * strcmp(s1, s2)
  *     char *s1, *s2;
  */

-       .globl  _strcmp
+#include "DEFS.h"

 
 

-_strcmp:
-       .word   0x0
-       movq    4(ap),r3        # r3 = s1; r4 = s2
+ENTRY(strcmp, 0)
+       movl    4(ap),r1        # r1 = s1
+       movl    8(ap),r3        # r3 = s2
+       subb3   (r3),(r1),r0    # quick check for first char different
+       beql    1f              # have to keep checking
+       cvtbl   r0,r0
+       ret

 1:
 1:

-       locc    $0,$65535,(r4)  # look for '\0' in s2
-       bneq    2f
-       cmpc3   $65535,(r4),(r3)# compare full block
-       bneq    3f
-       movl    r1,r4           # advance s2
-       jbr     1b              # matched, next block
+       clrl    r5              # calculate min bytes to next page boundry
+       subb3   r1,$255,r5      # r5 = (bytes - 1) to end of page for s1
+       subb3   r3,$255,r0      # r0 = (bytes - 1) to end of page for s2
+       cmpb    r0,r5           # r5 = min(r0, r5);
+       bgtru   2f
+       movb    r0,r5

 2:
 2:

-       subl2   r4,r1           # calculate length
-       incl    r1              # +1 for '\0'
-       cmpc3   r1,(r4),(r3)    # compare remainder
+       incl    r5              # r5 = min bytes to next page boundry
+       cmpc3   r5,(r1),(r3)    # compare strings

        bneq    3f
        bneq    3f

-       ret                     # r0 = 0 already
+       subl2   r5,r1           # check if found null yet
+       locc    $0,r5,(r1)
+       beql    1b              # not yet done, continue checking
+       subl2   r0,r3
+       mnegb   (r3),r0         # r0 = '\0' - *s2
+       cvtbl   r0,r0
+       ret

 3:
 3:

-       subb3   (r1),(r3),r0    # r0 = *s1 - *s2
+       subl2   r0,r5           # check for null in matching string
+       subl2   r5,r1
+       locc    $0,r5,(r1)
+       bneq    4f
+       subb3   (r3),(r1),r0    # r0 = *s1 - *s2

        cvtbl   r0,r0
        ret
        cvtbl   r0,r0
        ret

+4:
+       clrl    r0              # both the same to null
+       ret