mods to make reentrant

SCCS-vsn: lib/libc/vax/string/index.s 4.3
SCCS-vsn: lib/libc/vax/string/rindex.s 4.3

diff --git a/usr/src/lib/libc/vax/string/index.s b/usr/src/lib/libc/vax/string/index.s
index 3afb612..943c157 100644 (file)
--- a/usr/src/lib/libc/vax/string/index.s
+++ b/usr/src/lib/libc/vax/string/index.s
@@ -1,4 +1,4 @@
-/*     index.s 4.2     84/11/01        */
+/*     index.s 4.3     84/11/04        */

 
 /*
  * Find the first occurence of c in the string cp.
 
 /*
  * Find the first occurence of c in the string cp.


@@ -20,11 +20,13 @@ ENTRY(index, 0)
        movl    r1,r0           # found it
        ret
 2:
        movl    r1,r0           # found it
        ret
 2:

-       movab   tbl[r2],r5      # table entry for c
+       moval   tbl,r3          # r3 = address of table
+       bbss    $0,(r3),5f      # insure not reentering
+       movab   (r3)[r2],r5     # table entry for c

        incb    (r5)
        movzwl  $65535,r4       # fast access
 3:
        incb    (r5)
        movzwl  $65535,r4       # fast access
 3:

-       scanc   r4,(r1),tbl,$1  # look for c or '\0'
+       scanc   r4,(r1),(r3),$1 # look for c or '\0'

        beql    3b              # still looking
        movl    r1,r0           # return pointer to char
        tstb    (r0)            #    if have found '\0'
        beql    3b              # still looking
        movl    r1,r0           # return pointer to char
        tstb    (r0)            #    if have found '\0'


@@ -32,9 +34,31 @@ ENTRY(index, 0)
        clrl    r0              # else return 0
 4:
        clrb    (r5)            # clean up table
        clrl    r0              # else return 0
 4:
        clrb    (r5)            # clean up table

+       clrb    (r3)

        ret
 
        .data
        ret
 
        .data

-tbl:   .byte   1
-       .space  255
+tbl:   .space  256

        .text
        .text

+
+/*
+ * Reentrant, but slower version of index
+ */
+5:
+       movl    r1,r3
+6:
+       locc    $0,$65535,(r3)  # look for '\0'
+       bneq    7f
+       locc    r2,$65535,(r3)  # look for c
+       bneq    8f
+       movl    r1,r3           # reset pointer and ...
+       jbr     6b              # ... try again
+7:
+       subl3   r3,r1,r4        # length of short block
+       incl    r4              # +1 for '\0'
+       locc    r2,r4,(r3)      # look for c
+       bneq    8f
+       ret
+8:
+       movl    r1,r0           # return pointer to char
+       ret

diff --git a/usr/src/lib/libc/vax/string/rindex.s b/usr/src/lib/libc/vax/string/rindex.s
index 591e0bb..bf949f1 100644 (file)
--- a/usr/src/lib/libc/vax/string/rindex.s
+++ b/usr/src/lib/libc/vax/string/rindex.s
@@ -1,4 +1,4 @@
-/*     rindex.s        4.2     84/11/01        */
+/*     rindex.s        4.3     84/11/04        */

 
 /*
  * Find the last occurence of c in the string cp.
 
 /*
  * Find the last occurence of c in the string cp.


@@ -20,11 +20,13 @@ ENTRY(rindex, 0)
        movl    r1,r0           # found it
        ret
 2:
        movl    r1,r0           # found it
        ret
 2:

-       movab   tbl[r2],r5      # table entry for c
+       moval   tbl,r3          # r3 = address of table
+       bbss    $0,(r3),5f      # insure not reentering
+       movab   (r3)[r2],r5     # table entry for c

        incb    (r5)
        clrl    r4              # last found
 3:
        incb    (r5)
        clrl    r4              # last found
 3:

-       scanc   $65535,(r1),tbl,$1      # look for c or '\0'
+       scanc   $65535,(r1),(r3),$1     # look for c or '\0'

        beql    3b              # keep looking
        tstb    (r1)            # if have found '\0'
        beql    4f              #    we are done
        beql    3b              # keep looking
        tstb    (r1)            # if have found '\0'
        beql    4f              #    we are done


@@ -34,9 +36,43 @@ ENTRY(rindex, 0)
 4:
        movl    r4,r0           # return last found (if any)
        clrb    (r5)            # clean up table
 4:
        movl    r4,r0           # return last found (if any)
        clrb    (r5)            # clean up table

+       clrb    (r3)

        ret
 
        .data
        ret
 
        .data

-tbl:   .byte   1
-       .space  255
+tbl:   .space  256

        .text
        .text

+
+/*
+ * Reentrant, but slower version of rindex
+ */
+5:
+       movl    r1,r3
+       clrl    r4              # r4 = pointer to last match
+6:
+       locc    $0,$65535,(r3)  # look for '\0'
+       bneq    8f
+       decw    r0              # r0 = 65535
+1:
+       locc    r2,r0,(r3)      # look for c
+       bneq    7f
+       movl    r1,r3           # reset pointer and ...
+       jbr     6b              # ... try again
+7:
+       movl    r1,r4           # stash pointer ...
+       addl3   $1,r1,r3        # ... skip over match and ...
+       decl    r0              # ... decrement count
+       jbr     6b              # ... try again
+8:
+       subl3   r3,r1,r0        # length of short block
+       incl    r0              # +1 for '\0'
+9:
+       locc    r2,r0,(r3)      # look for c
+       beql    0f
+       movl    r1,r4           # stash pointer ...
+       addl3   $1,r1,r3        # ... skip over match ...
+       decl    r0              # ... adjust count and ...
+       jbr     9b              # ... try again
+0:
+       movl    r4,r0           # return stashed pointer
+       ret