From dcb557517ed641c512ba60b8e1f54fbb5a3179ad Mon Sep 17 00:00:00 2001
From: cuz <cuz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Sun, 30 Jul 2000 09:28:54 +0000
Subject: [PATCH] Bug fixes from Maciej and Dirk

git-svn-id: svn://svn.cc65.org/cc65/trunk@235 b7a2c559-68d2-44c3-8de9-860c34a00d81
---
 libsrc/geos/memory/cmpfstring.s  |  7 ++++---
 libsrc/geos/memory/copyfstring.s |  7 ++++---
 libsrc/geos/memory/doublespop.s  | 15 +++++++++++----
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/libsrc/geos/memory/cmpfstring.s b/libsrc/geos/memory/cmpfstring.s
index 5af38050d..e924febff 100644
--- 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 50789f5d1..545553ecc 100644
--- 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 4fd6849f5..1202bf655 100644
--- 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