fix strings.hash() on 6502 CPU's. NOTE: now takes string pointer in AY instead of R0 on all platforms

Author: irmen

compiler/res/prog8lib/strings.p8

@@ -391,16 +391,18 @@ fail    clc             ; yes, no match found, return with c=0
 		}}
 	}
 
-    asmsub hash(str string @R0) -> ubyte @A {
+    asmsub hash(str string @AY) -> ubyte @A {
         ; experimental 8 bit hashing function.
         ; hash(-1)=179;  clear carry;  hash(i) = ROL hash(i-1)  XOR  string[i]
         ; On the English word list in /usr/share/dict/words it seems to have a pretty even distribution
         %asm {{
+            sta  P8ZP_SCRATCH_W1
+            sty  P8ZP_SCRATCH_W1+1
             lda  #179
             sta  P8ZP_SCRATCH_REG
             ldy  #0
             clc
--           lda  (cx16.r0),y
+-           lda  (P8ZP_SCRATCH_W1),y
             beq  +
             rol  P8ZP_SCRATCH_REG
             eor  P8ZP_SCRATCH_REG

compiler/res/prog8lib/virtual/strings.p8

@@ -179,7 +179,7 @@ strings {
     sub hash(str st) -> ubyte {
         ; experimental 8 bit hashing function.
         ; hash(-1)=179;  hash(i) = ROL hash(i-1)  XOR  string[i]
-        ; (experimental because the quality of the resulting hash value still has to be determined)
+        ; On the English word list in /usr/share/dict/words it seems to have a pretty even distribution
         ubyte hashcode = 179
         ubyte ix
         sys.clear_carry()

docs/source/_static/symboldumps/skeletons-c128.txt

@@ -238,7 +238,7 @@ strings  {
     endswith  (str st, str suffix) -> bool 
     find  (uword string @AY, ubyte character @X) -> ubyte @A, bool @Pc 
     findstr  (str haystack, str needle) -> ubyte 
-    hash  (str string @R0) -> ubyte @A 
+    hash  (str string @AY) -> ubyte @A 
     isdigit  (ubyte petsciichar @A) -> bool @Pc 
     isletter  (ubyte petsciichar @A) -> bool @Pc 
     islower  (ubyte petsciichar @A) -> bool @Pc 

docs/source/_static/symboldumps/skeletons-c64.txt

@@ -365,7 +365,7 @@ strings  {
     endswith  (str st, str suffix) -> bool 
     find  (uword string @AY, ubyte character @X) -> ubyte @A, bool @Pc 
     findstr  (str haystack, str needle) -> ubyte 
-    hash  (str string @R0) -> ubyte @A 
+    hash  (str string @AY) -> ubyte @A 
     isdigit  (ubyte petsciichar @A) -> bool @Pc 
     isletter  (ubyte petsciichar @A) -> bool @Pc 
     islower  (ubyte petsciichar @A) -> bool @Pc 

docs/source/_static/symboldumps/skeletons-cx16.txt

@@ -673,7 +673,7 @@ strings  {
     endswith  (str st, str suffix) -> bool 
     find  (uword string @AY, ubyte character @X) -> ubyte @A, bool @Pc 
     findstr  (str haystack, str needle) -> ubyte 
-    hash  (str string @R0) -> ubyte @A 
+    hash  (str string @AY) -> ubyte @A 
     isdigit  (ubyte petsciichar @A) -> bool @Pc 
     isletter  (ubyte petsciichar @A) -> bool @Pc 
     islower  (ubyte petsciichar @A) -> bool @Pc 

docs/source/_static/symboldumps/skeletons-pet32.txt

@@ -189,7 +189,7 @@ strings  {
     endswith  (str st, str suffix) -> bool 
     find  (uword string @AY, ubyte character @X) -> ubyte @A, bool @Pc 
     findstr  (str haystack, str needle) -> ubyte 
-    hash  (str string @R0) -> ubyte @A 
+    hash  (str string @AY) -> ubyte @A 
     isdigit  (ubyte petsciichar @A) -> bool @Pc 
     isletter  (ubyte petsciichar @A) -> bool @Pc 
     islower  (ubyte petsciichar @A) -> bool @Pc 

docs/source/todo.rst

@@ -1,6 +1,7 @@
 TODO
 ====
 
+
 ...
 
 
@@ -56,6 +57,7 @@ IR/VM
 Libraries
 ---------
 - Add split-word array sorting routines to sorting module?
+- cx16: _irq_dispatcher  now only dispatches a single irq source, better to ROL/BCC to handle *all* possible (multiple) sources.
 - See if the raster interrupt handler on the C64 can be tweaked to be a more stable raster irq
 - pet32 target: make syslib more complete (missing kernal routines)?
 - need help with: PET disk routines (OPEN, SETLFS etc are not exposed as kernal calls)

examples/test.p8

@@ -1,57 +1,15 @@
 %zeropage basicsafe
 %import textio
+%import strings
+
 main {
     sub start() {
-        byte @shared a = -1
-        byte @shared b = -15
-        ubyte @shared ub = 2
-        const byte ca = -1
-        const byte cb = -15
-        const ubyte cub = 2
+        str name1 = sc:"irmen de jong 123456789 the quick brown fox"
+        str name2 = sc:"jumps over the lazy frog"
 
-        txt.print_ub( a & b )
-        txt.spc()
-        txt.print_ub( a | b )
-        txt.spc()
-        txt.print_ub( a ^ b )
-        txt.spc()
-        txt.print_b( a << ub )
-        txt.spc()
-        txt.print_b( a >> ub )
-        txt.nl()
-        txt.print_ub( ca & cb )
-        txt.spc()
-        txt.print_ub( ca | cb )
-        txt.spc()
-        txt.print_ub( ca ^ cb )
-        txt.spc()
-        txt.print_b( ca << cub )
-        txt.spc()
-        txt.print_b( ca >> cub )
-        txt.nl()
-
-        word @shared aw = -1
-        word @shared bw = -15
-        uword @shared uw = 2
-        const word caw = -1
-        const word cbw = -15
-        const uword cuw = 2
-
-        txt.print_uw( aw & bw )
-        txt.spc()
-        txt.print_uw( aw | bw )
-        txt.spc()
-        txt.print_uw( aw ^ bw )
-        txt.nl()
-        txt.print_uw( caw & cbw )
-        txt.spc()
-        txt.print_uw( caw | cbw )
-        txt.spc()
-        txt.print_uw( caw ^ cbw )
-        txt.nl()
-        txt.print_w( cbw << cuw )
+        txt.print_ub(strings.hash(name1))
         txt.spc()
-        txt.print_w( cbw >> cuw )
+        txt.print_ub(strings.hash(name2))
         txt.nl()
     }
 }