Bug fixes from Maciej and Dirk

git-svn-id: svn://svn.cc65.org/cc65/trunk@235 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/libsrc/geos/memory/cmpfstring.s b/libsrc/geos/memory/cmpfstring.s
index 5af38050d52abf02a955494f9ad08ab1fa2cadb6..e924febff06e7e94380344ab77f6d986005dc6b5 100644 (file)
--- a/libsrc/geos/memory/cmpfstring.s
+++ b/libsrc/geos/memory/cmpfstring.s
@@ -1,12 +1,12 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 22.12.99
+; 22.12.99, 29.07.2000
 
 ; void CmpFString (char length, char *dest, char* source);
 
-           .import DoubleSPop
+           .import DoubleSPop, SetPtrXY
            .import popa
            .export _CmpFString
 
@@ -15,4 +15,5 @@
 _CmpFString:
            jsr DoubleSPop
            jsr popa
+           jsr SetPtrXY
            jmp CmpFString

diff --git a/libsrc/geos/memory/copyfstring.s b/libsrc/geos/memory/copyfstring.s
index 50789f5d1b9c809e1abff17c473258d582c5711e..545553ecc99eec7ef2783288e4ec1ea729a297bd 100644 (file)
--- a/libsrc/geos/memory/copyfstring.s
+++ b/libsrc/geos/memory/copyfstring.s
@@ -1,12 +1,12 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 22.12.99
+; 22.12.99, 29.07.2000
 
 ; void CopyFString (char length, char *dest, char* source);
 
-           .import DoubleSPop
+           .import DoubleSPop, SetPtrXY
            .import popa
            .export _CopyFString
 
@@ -15,4 +15,5 @@
 _CopyFString:
            jsr DoubleSPop
            jsr popa
+           jsr SetPtrXY
            jmp CopyFString

diff --git a/libsrc/geos/memory/doublespop.s b/libsrc/geos/memory/doublespop.s
index 4fd6849f53e8d139d2598e35d340d7f66b82a654..1202bf655964a0c22747b7b7af93261c18212d91 100644 (file)
--- a/libsrc/geos/memory/doublespop.s
+++ b/libsrc/geos/memory/doublespop.s
@@ -1,12 +1,13 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 22.12.99
+; 22.12.99, 29.07.2000
 
            .import popax
            .importzp ptr3, ptr4
            .export DoubleSPop
+           .export SetPtrXY
 
            .include "../inc/geossym.inc"
 
@@ -16,6 +17,12 @@ DoubleSPop:
            jsr popax
            sta ptr3
            stx ptr3+1
-           lda #ptr4
-           ldx #ptr3
+;          rts
+;
+; SetPtrXY can be sometimes executed twice, but even this way it is few cycles
+; faster...
+
+SetPtrXY:
+           ldx #ptr4
+           ldy #ptr3
            rts