consolidate cbm textio routines

irmen · Mar 27, 2024 · b93fa75 · b93fa75
1 parent 681ce9c
commit b93fa75
Show file tree

Hide file tree

Showing 10 changed files with 324 additions and 952 deletions.
diff --git a/compiler/res/prog8lib/atari/textio.p8 b/compiler/res/prog8lib/atari/textio.p8
@@ -3,7 +3,6 @@
 
 %import syslib
 %import conv
-%import shared_textio_functions
 
 txt {
 
@@ -168,35 +167,35 @@ asmsub  print (str text @ AY) clobbers(A,Y)  {
 asmsub  print_ub0  (ubyte value @ A) clobbers(A,X,Y)  {
 	; ---- print the ubyte in A in decimal form, with left padding 0s (3 positions total)
 	%asm {{
-		jsr  conv.ubyte2decimal
+		jsr  conv.internal_ubyte2decimal
 		pha
 		tya
 		jsr  chrout
-		pla
-		jsr  chrout
 		txa
+		jsr  chrout
+		pla
 		jmp  chrout
 	}}
 }
 
 asmsub  print_ub  (ubyte value @ A) clobbers(A,X,Y)  {
 	; ---- print the ubyte in A in decimal form, without left padding 0s
 	%asm {{
-		jsr  conv.ubyte2decimal
+		jsr  conv.internal_ubyte2decimal
 _print_byte_digits
 		pha
 		cpy  #'0'
 		beq  +
 		tya
 		jsr  chrout
-		pla
+		txa
 		jsr  chrout
 		jmp  _ones
-+       pla
-        cmp  #'0'
++       cpx  #'0'
         beq  _ones
+        txa
         jsr  chrout
-_ones   txa
+_ones   pla
 		jmp  chrout
 	}}
 }
@@ -210,7 +209,7 @@ asmsub  print_b  (byte value @ A) clobbers(A,X,Y)  {
 		lda  #'-'
 		jsr  chrout
 +		pla
-		jsr  conv.byte2decimal
+		jsr  conv.internal_byte2decimal
 		jmp  print_ub._print_byte_digits
 	}}
 }
@@ -223,7 +222,7 @@ asmsub  print_ubhex  (ubyte value @ A, bool prefix @ Pc) clobbers(A,X,Y)  {
 		lda  #'$'
 		jsr  chrout
 		pla
-+		jsr  conv.ubyte2hex
++		jsr  conv.internal_ubyte2hex
 		jsr  chrout
 		tya
 		jmp  chrout
@@ -277,9 +276,9 @@ asmsub  print_uwhex  (uword value @ AY, bool prefix @ Pc) clobbers(A,X,Y)  {
 asmsub  print_uw0  (uword value @ AY) clobbers(A,X,Y)  {
 	; ---- print the uword in A/Y in decimal form, with left padding 0s (5 positions total)
 	%asm {{
-		jsr  conv.uword2decimal
+		jsr  conv.internal_uword2decimal
 		ldy  #0
--		lda  conv.uword2decimal.decTenThousands,y
+-		lda  conv.internal_uword2decimal.decTenThousands,y
         beq  +
 		jsr  chrout
 		iny
@@ -291,9 +290,9 @@ asmsub  print_uw0  (uword value @ AY) clobbers(A,X,Y)  {
 asmsub  print_uw  (uword value @ AY) clobbers(A,X,Y)  {
 	; ---- print the uword in A/Y in decimal form, without left padding 0s
 	%asm {{
-		jsr  conv.uword2decimal
+		jsr  conv.internal_uword2decimal
 		ldy  #0
--		lda  conv.uword2decimal.decTenThousands,y
+-		lda  conv.internal_uword2decimal.decTenThousands,y
 		beq  _allzero
 		cmp  #'0'
 		bne  _gotdigit
@@ -303,7 +302,7 @@ asmsub  print_uw  (uword value @ AY) clobbers(A,X,Y)  {
 _gotdigit
 		jsr  chrout
 		iny
-		lda  conv.uword2decimal.decTenThousands,y
+		lda  conv.internal_uword2decimal.decTenThousands,y
 		bne  _gotdigit
 		rts
 _allzero

diff --git a/compiler/res/prog8lib/c128/textio.p8 b/compiler/res/prog8lib/c128/textio.p8
@@ -4,7 +4,7 @@
 
 %import syslib
 %import conv
-%import shared_textio_functions
+%import shared_cbm_textio_functions
 
 
 txt {
@@ -13,6 +13,8 @@ txt {
 const ubyte DEFAULT_WIDTH = 40
 const ubyte DEFAULT_HEIGHT = 25
 
+romsub $FFD2 = chrout(ubyte character @ A)    ; for consistency. You can also use cbm.CHROUT directly ofcourse. Note: takes a PETSCII encoded character.
+
 
 sub  clear_screen() {
     chrout(147)
@@ -288,216 +290,6 @@ _scroll_screen  ; scroll only the screen memory
 	}}
 }
 
-romsub $FFD2 = chrout(ubyte char @ A)    ; for consistency. You can also use cbm.CHROUT directly ofcourse. Note: takes a PETSCII encoded character.
-
-asmsub  print (str text @ AY) clobbers(A,Y)  {
-	; ---- print null terminated string, in PETSCII encoding, from A/Y
-	; note: the compiler contains an optimization that will replace
-	;       a call to this subroutine with a string argument of just one char,
-	;       by just one call to cbm.CHROUT of that single char.
-	%asm {{
-		sta  P8ZP_SCRATCH_B1
-		sty  P8ZP_SCRATCH_REG
-		ldy  #0
--		lda  (P8ZP_SCRATCH_B1),y
-		beq  +
-		jsr  cbm.CHROUT
-		iny
-		bne  -
-+		rts
-	}}
-}
-
-asmsub  print_ub0  (ubyte value @ A) clobbers(A,X,Y)  {
-	; ---- print the ubyte in A in decimal form, with left padding 0s (3 positions total)
-	%asm {{
-		jsr  conv.ubyte2decimal
-		pha
-		tya
-		jsr  cbm.CHROUT
-		pla
-		jsr  cbm.CHROUT
-		txa
-		jmp  cbm.CHROUT
-	}}
-}
-
-asmsub  print_ub  (ubyte value @ A) clobbers(A,X,Y)  {
-	; ---- print the ubyte in A in decimal form, without left padding 0s
-	%asm {{
-		jsr  conv.ubyte2decimal
-_print_byte_digits
-		pha
-		cpy  #'0'
-		beq  +
-		tya
-		jsr  cbm.CHROUT
-		pla
-		jsr  cbm.CHROUT
-		jmp  _ones
-+       pla
-        cmp  #'0'
-        beq  _ones
-        jsr  cbm.CHROUT
-_ones   txa
-		jmp  cbm.CHROUT
-	}}
-}
-
-asmsub  print_b  (byte value @ A) clobbers(A,X,Y)  {
-	; ---- print the byte in A in decimal form, without left padding 0s
-	%asm {{
-		pha
-		cmp  #0
-		bpl  +
-		lda  #'-'
-		jsr  cbm.CHROUT
-+		pla
-		jsr  conv.byte2decimal
-		jmp  print_ub._print_byte_digits
-	}}
-}
-
-asmsub  print_ubhex  (ubyte value @ A, bool prefix @ Pc) clobbers(A,X,Y)  {
-	; ---- print the ubyte in A in hex form (if Carry is set, a radix prefix '$' is printed as well)
-	%asm {{
-		bcc  +
-		pha
-		lda  #'$'
-		jsr  cbm.CHROUT
-		pla
-+		jsr  conv.ubyte2hex
-		jsr  cbm.CHROUT
-		tya
-		jmp  cbm.CHROUT
-	}}
-}
-
-asmsub  print_ubbin  (ubyte value @ A, bool prefix @ Pc) clobbers(A,X,Y)  {
-	; ---- print the ubyte in A in binary form (if Carry is set, a radix prefix '%' is printed as well)
-	%asm {{
-		sta  P8ZP_SCRATCH_B1
-		bcc  +
-		lda  #'%'
-		jsr  cbm.CHROUT
-+		ldy  #8
--		lda  #'0'
-		asl  P8ZP_SCRATCH_B1
-		bcc  +
-		lda  #'1'
-+		jsr  cbm.CHROUT
-		dey
-		bne  -
-		rts
-	}}
-}
-
-asmsub  print_uwbin  (uword value @ AY, bool prefix @ Pc) clobbers(A,X,Y)  {
-	; ---- print the uword in A/Y in binary form (if Carry is set, a radix prefix '%' is printed as well)
-	%asm {{
-		pha
-		tya
-		jsr  print_ubbin
-		pla
-		clc
-		jmp  print_ubbin
-	}}
-}
-
-asmsub  print_uwhex  (uword value @ AY, bool prefix @ Pc) clobbers(A,X,Y)  {
-	; ---- print the uword in A/Y in hexadecimal form (4 digits)
-	;      (if Carry is set, a radix prefix '$' is printed as well)
-	%asm {{
-		pha
-		tya
-		jsr  print_ubhex
-		pla
-		clc
-		jmp  print_ubhex
-	}}
-}
-
-asmsub  print_uw0  (uword value @ AY) clobbers(A,X,Y)  {
-	; ---- print the uword in A/Y in decimal form, with left padding 0s (5 positions total)
-	%asm {{
-		jsr  conv.uword2decimal
-		ldy  #0
--		lda  conv.uword2decimal.decTenThousands,y
-        beq  +
-		jsr  cbm.CHROUT
-		iny
-		bne  -
-+		rts
-	}}
-}
-
-asmsub  print_uw  (uword value @ AY) clobbers(A,X,Y)  {
-	; ---- print the uword in A/Y in decimal form, without left padding 0s
-	%asm {{
-		jsr  conv.uword2decimal
-		ldy  #0
--		lda  conv.uword2decimal.decTenThousands,y
-		beq  _allzero
-		cmp  #'0'
-		bne  _gotdigit
-		iny
-		bne  -
-
-_gotdigit
-		jsr  cbm.CHROUT
-		iny
-		lda  conv.uword2decimal.decTenThousands,y
-		bne  _gotdigit
-		rts
-_allzero
-        lda  #'0'
-        jmp  cbm.CHROUT
-	}}
-}
-
-asmsub  print_w  (word value @ AY) clobbers(A,X,Y)  {
-	; ---- print the (signed) word in A/Y in decimal form, without left padding 0's
-	%asm {{
-		cpy  #0
-		bpl  +
-		pha
-		lda  #'-'
-		jsr  cbm.CHROUT
-		tya
-		eor  #255
-		tay
-		pla
-		eor  #255
-		clc
-		adc  #1
-		bcc  +
-		iny
-+		jmp  print_uw
-	}}
-}
-
-asmsub  input_chars  (uword buffer @ AY) clobbers(A) -> ubyte @ Y  {
-	; ---- Input a string (max. 80 chars) from the keyboard, in PETSCII encoding.
-	;      Returns length in Y. (string is terminated with a 0 byte as well)
-	;      It assumes the keyboard is selected as I/O channel!
-
-	%asm {{
-		sta  P8ZP_SCRATCH_W1
-		sty  P8ZP_SCRATCH_W1+1
-		ldy  #0				; char counter = 0
--		jsr  cbm.CHRIN
-		cmp  #$0d			; return (ascii 13) pressed?
-		beq  +				; yes, end.
-		sta  (P8ZP_SCRATCH_W1),y	; else store char in buffer
-		iny
-		bne  -
-+		lda  #0
-		sta  (P8ZP_SCRATCH_W1),y	; finish string with 0 byte
-		rts
-
-	}}
-}
-
 asmsub  setchr  (ubyte col @X, ubyte row @Y, ubyte character @A) clobbers(A, Y)  {
 	; ---- sets the character in the screen matrix at the given position
 	%asm {{