From c40ae4d774ef2a1e325e51524170a35eaad266c0 Mon Sep 17 00:00:00 2001
From: IrgendwerA8 <c.krueger.b@web.de>
Date: Mon, 21 May 2018 16:21:45 +0200
Subject: [PATCH 1/3] Saved 6 bytes by using popptr1.

---
 libsrc/cbm/read.s     | 10 +++++-----
 libsrc/cbm/rwcommon.s | 17 +++++++----------
 libsrc/cbm/write.s    | 10 +++++-----
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/libsrc/cbm/read.s b/libsrc/cbm/read.s
index 87a2c7037..9de4980ce 100644
--- a/libsrc/cbm/read.s
+++ b/libsrc/cbm/read.s
@@ -88,10 +88,10 @@
 
         ldy     #0
         lda     tmp1
-        sta     (ptr2),y
-        inc     ptr2
+        sta     (ptr1),y
+        inc     ptr1
         bne     @L1
-        inc     ptr2+1          ; *buf++ = A;
+        inc     ptr1+1          ; *buf++ = A;
 
 ; Increment the byte count
 
@@ -107,9 +107,9 @@
 
 ; Decrement the count
 
-@L3:    inc     ptr1
+@L3:    inc     ptr2
         bne     @L0
-        inc     ptr1+1
+        inc     ptr2+1
         bne     @L0
         beq     done            ; Branch always
 
diff --git a/libsrc/cbm/rwcommon.s b/libsrc/cbm/rwcommon.s
index c044b6c38..0168a78d0 100644
--- a/libsrc/cbm/rwcommon.s
+++ b/libsrc/cbm/rwcommon.s
@@ -6,7 +6,7 @@
 
         .export         rwcommon
 
-        .import         popax
+        .import         popax, popptr1
         .importzp       ptr1, ptr2, ptr3, tmp2
 
         .include        "errno.inc"
@@ -22,18 +22,15 @@
 .proc   rwcommon
 
         eor     #$FF
-        sta     ptr1
+        sta     ptr2
         txa
         eor     #$FF
-        sta     ptr1+1          ; Remember -count-1
+        sta     ptr2+1          ; Remember -count-1
 
-        jsr     popax           ; Get buf
-        sta     ptr2
-        stx     ptr2+1
-
-        lda     #$00
-        sta     ptr3
-        sta     ptr3+1          ; Clear ptr3
+        jsr     popptr1         ; Get buf
+                                ; Y=0 by popptr1
+        sty     ptr3
+        sty     ptr3+1          ; Clear ptr3
 
         jsr     popax           ; Get the handle
         cpx     #$01
diff --git a/libsrc/cbm/write.s b/libsrc/cbm/write.s
index 20999d2ac..dddec0792 100644
--- a/libsrc/cbm/write.s
+++ b/libsrc/cbm/write.s
@@ -61,10 +61,10 @@
 ; Output the next character from the buffer
 
 @L0:    ldy     #0
-        lda     (ptr2),y
-        inc     ptr2
+        lda     (ptr1),y
+        inc     ptr1
         bne     @L1
-        inc     ptr2+1          ; A = *buf++;
+        inc     ptr1+1          ; A = *buf++;
 @L1:    jsr     BSOUT
 
 ; Check the status
@@ -84,9 +84,9 @@
 
 ; Decrement count
 
-@L2:    inc     ptr1
+@L2:    inc     ptr2
         bne     @L0
-        inc     ptr1+1
+        inc     ptr2+1
         bne     @L0
 
 ; Wrote all chars or disk full. Close the output channel

From 99e13eeaa2671c56d4754ffe6760c85756dda261 Mon Sep 17 00:00:00 2001
From: IrgendwerA8 <c.krueger.b@web.de>
Date: Mon, 21 May 2018 18:19:39 +0200
Subject: [PATCH 2/3] Fix typo for import.

---
 libsrc/geos-common/drivers/fio_module.s | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsrc/geos-common/drivers/fio_module.s b/libsrc/geos-common/drivers/fio_module.s
index e655f0cec..0be5015a7 100644
--- a/libsrc/geos-common/drivers/fio_module.s
+++ b/libsrc/geos-common/drivers/fio_module.s
@@ -13,7 +13,7 @@
 FILEDES         = 3             ; first free to use file descriptor
 
             .importzp ptr1, ptr2, ptr3, tmp1
-            .import addysp, popax, poptr1
+            .import addysp, popax, popptr1
             .import __oserror
             .import _FindFile, _ReadByte
             .export _open, _close, _read

From 95b4a6f881d1ef7f57aac788cbd27344524eb157 Mon Sep 17 00:00:00 2001
From: IrgendwerA8 <c.krueger.b@web.de>
Date: Tue, 22 May 2018 11:25:26 +0200
Subject: [PATCH 3/3] Beautified comment.

---
 libsrc/cbm/rwcommon.s | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libsrc/cbm/rwcommon.s b/libsrc/cbm/rwcommon.s
index 0168a78d0..a1f92be8c 100644
--- a/libsrc/cbm/rwcommon.s
+++ b/libsrc/cbm/rwcommon.s
@@ -27,8 +27,8 @@
         eor     #$FF
         sta     ptr2+1          ; Remember -count-1
 
-        jsr     popptr1         ; Get buf
-                                ; Y=0 by popptr1
+        jsr     popptr1         ; Get buf to ptr1, Y=0 by call
+
         sty     ptr3
         sty     ptr3+1          ; Clear ptr3