From 4a8ee6815a67beae124cb7c85bb5edbf25e7f68e Mon Sep 17 00:00:00 2001
From: Irmen de Jong <irmen@razorvine.net>
Date: Fri, 28 Jul 2023 03:34:58 +0200
Subject: [PATCH] merge

---
 compiler/res/prog8lib/cx16/gfx2.p8 | 4 ----
 docs/source/todo.rst               | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/compiler/res/prog8lib/cx16/gfx2.p8 b/compiler/res/prog8lib/cx16/gfx2.p8
index 550a25b1f..9896c0150 100644
--- a/compiler/res/prog8lib/cx16/gfx2.p8
+++ b/compiler/res/prog8lib/cx16/gfx2.p8
@@ -20,8 +20,6 @@
 ;   mode 6 = bitmap 640 x 480 x 4c
 ;   higher color dephts in highres are not supported due to lack of VRAM
 
-; TODO remove the phx/plx pairs in non-stack compiler version
-
 gfx2 {
 
     %option no_symbol_prefixing
@@ -990,7 +988,6 @@ skip:
                     cx16.vaddr_autoincr(charset_bank, chardataptr, 0, 1)
                     %asm {{
                         ; pre-shift the bits
-                        phx ; TODO remove in non-stack version
                         lda  text.x
                         and  #7
                         sta  P8ZP_SCRATCH_B1
@@ -1010,7 +1007,6 @@ skip:
                         iny
                         cpy  #8
                         bne  --
-                        plx     ; TODO remove in non-stack version
                     }}
                     ; left part of shifted char
                     position2(x, y, true)
diff --git a/docs/source/todo.rst b/docs/source/todo.rst
index 8fd4a6dba..657588a06 100644
--- a/docs/source/todo.rst
+++ b/docs/source/todo.rst
@@ -1,6 +1,8 @@
 TODO
 ====
 
+- stackless: describe the changes in the manual.
+
 - IR: reduce the number of branch instructions such as BEQ, BEQR, etc (gradually), replace with CMP(I) + status branch instruction
 - IR: reduce amount of CMP/CMPI after instructions that set the status bits correctly (LOADs? INC? etc), but only after setting the status bits is verified!