The spans do now contain the size of a span, no longer the end offset.

[cc65] / libsrc / common / stricmp.s

diff --git a/libsrc/common/stricmp.s b/libsrc/common/stricmp.s
index 62e2f847c02265440f52a55d8b964c67de3a95ad..03638c8e2892befb39459cfdce1b329ebffb064f 100644 (file)
--- a/libsrc/common/stricmp.s
+++ b/libsrc/common/stricmp.s
@@ -7,40 +7,41 @@
 
        .export         _stricmp, _strcasecmp
        .import         popax
-       .import         __ctype, __cdiff
+       .import         __ctype
        .importzp       ptr1, ptr2, tmp1
 
+        .include        "ctype.inc"
 
 _stricmp:
 _strcasecmp:
-       sta     ptr2            ; Save s2
+       sta     ptr2            ; Save s2
        stx     ptr2+1
-       jsr     popax           ; get s1
+       jsr     popax           ; get s1
        sta     ptr1
        stx     ptr1+1
        ldy     #0
 
-loop:          lda     (ptr2),y        ; get char from second string
+loop:          lda     (ptr2),y        ; get char from second string
        tax
-       lda     __ctype,x       ; get character classification
-       and     #$01            ; lower case char?
-       beq     L1              ; jump if no
-       txa                     ; get character back
+       lda     __ctype,x       ; get character classification
+               and     #CT_LOWER       ; lower case char?
+       beq     L1              ; jump if no
+       txa                     ; get character back
        clc
-       adc     __cdiff         ; make upper case char
+       adc     #<('A'-'a')     ; make upper case char
        tax                     ;
 L1:    stx     tmp1            ; remember upper case equivalent
 
        lda     (ptr1),y        ; get character from first string
        tax
        lda     __ctype,x       ; get character classification
-       and     #$01            ; lower case char?
+       and     #CT_LOWER       ; lower case char?
                beq     L2              ; jump if no
        txa                     ; get character back
        clc
-       adc     __cdiff         ; make upper case char
+               adc     #<('A'-'a')     ; make upper case char
        tax
-
+                                
 L2:    cpx     tmp1            ; compare characters
        bne     L3
        txa                     ; end of strings?