From b23a7ec40746d68c90582dc4ec78ea822dd5d1b6 Mon Sep 17 00:00:00 2001
From: Colin Leroy-Mira <colin@colino.net>
Date: Fri, 19 Jan 2024 21:14:47 +0100
Subject: [PATCH] Save two bytes in pushax and popptr1

It's not because Y must equal zero on rts that we should'nt spare one byte
and one cycle.
---
 libsrc/runtime/popptr1.s | 8 +++++++-
 libsrc/runtime/pushax.s  | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/libsrc/runtime/popptr1.s b/libsrc/runtime/popptr1.s
index 1d04330ab..b54bb9eb3 100644
--- a/libsrc/runtime/popptr1.s
+++ b/libsrc/runtime/popptr1.s
@@ -8,12 +8,18 @@
         .import         incsp2
         .importzp       sp, ptr1
 
+        .macpack        cpu
+
 .proc   popptr1                 ; 14 bytes (four usages = at least 2 bytes saved)
         ldy     #1
         lda     (sp),y          ; get hi byte
         sta     ptr1+1          ; into ptr hi
-        dey                     ; no optimization for 65C02 here to have Y=0 at exit!
+        dey                     ; dey even for for 65C02 here to have Y=0 at exit!
+.if (.cpu .bitand ::CPU_ISET_65SC02)
+        lda     (sp)            ; get lo byte
+.else
         lda     (sp),y          ; get lo byte
+.endif
         sta     ptr1            ; to ptr lo
         jmp     incsp2
 .endproc
diff --git a/libsrc/runtime/pushax.s b/libsrc/runtime/pushax.s
index ac181b994..27ddf641d 100644
--- a/libsrc/runtime/pushax.s
+++ b/libsrc/runtime/pushax.s
@@ -7,6 +7,8 @@
         .export         push0, pusha0, pushax
         .importzp       sp
 
+        .macpack        cpu
+
 push0:  lda     #0
 pusha0: ldx     #0
 
@@ -29,7 +31,11 @@ pusha0: ldx     #0
         sta     (sp),y          ; (27)
         pla                     ; (31)
         dey                     ; (33)
+.if (.cpu .bitand ::CPU_ISET_65SC02)
+        sta     (sp)            ; (37)
+.else
         sta     (sp),y          ; (38)
-        rts                     ; (44)
+.endif
+        rts                     ; (44/43)
 
 .endproc