From 2608e1b153e62655a8441ca52b1e32379dcd0ea5 Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Thu, 3 Oct 2019 22:21:44 +0200
Subject: [PATCH] deduplicated some print character routines

---
 Makefile                                |  2 +-
 STATUS.md                               |  3 +--
 c64/basic/,imports.s                    |  2 ++
 c64/basic/basic_cold_start.s            |  4 +---
 c64/basic/basic_do_error.s              | 12 ++++-------
 c64/basic/basic_main_loop.s             |  7 +++----
 c64/basic/basic_warm_start.s            |  3 +--
 c64/basic/cmd_break.s                   |  4 ++--
 c64/basic/cmd_list.s                    | 10 ++++-----
 c64/basic/do_basic_error.s              | 14 +++++--------
 c64/basic/e422.initmsg.s                | 27 +++++++++++++++++++++++--
 c64/basic/print_packed_message.s        |  3 +--
 c64/basic/wedge_dos.s                   |  3 +--
 c64/kernal/lvs_helpers.s                |  3 +--
 c64/kernal/{ => print}/print_hex_byte.s |  0
 c64/kernal/print/print_return.s         |  8 ++++++++
 c64/kernal/print/print_space.s          |  8 ++++++++
 c64/kernal/{ => print}/printf.s         |  0
 18 files changed, 68 insertions(+), 45 deletions(-)
 rename c64/kernal/{ => print}/print_hex_byte.s (100%)
 create mode 100644 c64/kernal/print/print_return.s
 create mode 100644 c64/kernal/print/print_space.s
 rename c64/kernal/{ => print}/printf.s (100%)

diff --git a/Makefile b/Makefile
index afec2b7e..74ab4305 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 
 SRCDIR_COMMON            = c64/aliases
 SRCDIR_BASIC_COMMON      = $(SRCDIR_COMMON) c64/basic
-SRCDIR_KERNAL_COMMON     = $(SRCDIR_COMMON) c64/kernal c64/kernal/assets c64/kernal/jumptable c64/kernal/iec c64/kernal/interrupts
+SRCDIR_KERNAL_COMMON     = $(SRCDIR_COMMON) c64/kernal c64/kernal/assets c64/kernal/jumptable c64/kernal/iec c64/kernal/interrupts c64/kernal/print
 
 SRCDIR_BASIC_generic     = $(SRCDIR_BASIC_COMMON) c64/basic/,target_generic
 SRCDIR_BASIC_mega65      = $(SRCDIR_BASIC_COMMON) c64/basic/,target_mega65
diff --git a/STATUS.md b/STATUS.md
index 9c26e41b..2b7915dc 100644
--- a/STATUS.md
+++ b/STATUS.md
@@ -65,7 +65,6 @@ Note: vectors at `$0300` are not supported yet - for now only the locations belo
 | `($A000)` |            | cold start | PARTIAL  |                                                    |
 | `($A002)` |            | warm start | PARTIAL  |                                                    |
 
-
 <br />
 
 ### Unofficial BASIC routines/locations
@@ -82,7 +81,7 @@ Not all of them - only these we want to have implemented.
 | `$AB1E`   | STROUT       | DONE     |                                                    |
 | `$BDCD`   | LINPRT       | NOT DONE |                                                    |
 | `$E3BF`   | INIT         | NOT DONE |                                                    |
-| `$E422`   | INITMSG      | NOT DONE |                                                    |
+| `$E422`   | INITMSG      | PARTIAL  | banner printed outside                             |
 | `$E453`   | RVECT        | NOT DONE |                                                    |
 
 <br />
diff --git a/c64/basic/,imports.s b/c64/basic/,imports.s
index 0c14f4b0..b195dcac 100644
--- a/c64/basic/,imports.s
+++ b/c64/basic/,imports.s
@@ -9,3 +9,5 @@
 #endif
 
 .label print_hex_byte      = KERNAL.print_hex_byte
+.label print_return        = KERNAL.print_return
+.label print_space         = KERNAL.print_space
diff --git a/c64/basic/basic_cold_start.s b/c64/basic/basic_cold_start.s
index c77ad42a..9863ea5b 100644
--- a/c64/basic/basic_cold_start.s
+++ b/c64/basic/basic_cold_start.s
@@ -49,10 +49,8 @@ basic_cold_start:
 	sbc TXTTAB+1
 
 	jsr print_integer
+	jsr print_space
 
-	lda #$20
-	jsr JCHROUT
-	
 	// Print the rest of the start up message
 	ldx #34
 	jsr print_packed_message
diff --git a/c64/basic/basic_do_error.s b/c64/basic/basic_do_error.s
index ba31a966..6266b0ef 100644
--- a/c64/basic/basic_do_error.s
+++ b/c64/basic/basic_do_error.s
@@ -6,8 +6,7 @@ basic_do_error:
 	pha
 
 	// Print ? at start
-	lda #$0D
-	jsr JCHROUT
+	jsr print_return
 	lda #$3F
 	jsr JCHROUT
 
@@ -17,8 +16,7 @@ basic_do_error:
 	jsr print_packed_message
 
 	// Print ERROR at end
-	lda #$20
-	jsr JCHROUT
+	jsr print_space
 	ldx #33
 	jsr print_packed_message
 
@@ -26,10 +24,8 @@ basic_do_error:
 
 	// XXX print line number if not in direct mode
 
-	lda #$0D
-	jsr JCHROUT
-	lda #$0D // XXX do we need this?
-	jsr JCHROUT
+	jsr print_return
+	jsr print_return
 
 	// Reset stack, and go back to main loop
 	ldx #$FE
diff --git a/c64/basic/basic_main_loop.s b/c64/basic/basic_main_loop.s
index f29d5d37..4318aa78 100644
--- a/c64/basic/basic_main_loop.s
+++ b/c64/basic/basic_main_loop.s
@@ -34,7 +34,7 @@ got_line_of_input:
 	stx __tokenise_work1
 
 	// Strip leading spaces from the line
-remove_leading_spaces:	
+remove_leading_spaces:
 	lda $0200
 	cmp #$20
 	bne !+
@@ -51,15 +51,14 @@ rsl_l1:	lda $0200,x
 	bne remove_leading_spaces
 !:
 	// Do printing of the new line
-	lda #$0d
-	jsr JCHROUT
+	jsr print_return
 
 	// Ignore empty lines
 	lda __tokenise_work1
 	beq basic_read_next_line
 
 	// Else, tokenise the line
-	jsr tokenise_line	
+	jsr tokenise_line
 
 	// Has the user entered a line of BASIC beginning with a number?
 	lda $0200
diff --git a/c64/basic/basic_warm_start.s b/c64/basic/basic_warm_start.s
index eeabd60a..1416ec4e 100644
--- a/c64/basic/basic_warm_start.s
+++ b/c64/basic/basic_warm_start.s
@@ -19,8 +19,7 @@ basic_warm_start:
 	jsr print_hex_byte
 	lda CMP0+0
 	jsr print_hex_byte
-	lda #$0D
-	jsr JCHROUT
+	jsr print_return
 
 !:
 	jmp basic_main_loop
diff --git a/c64/basic/cmd_break.s b/c64/basic/cmd_break.s
index ffcab37f..d3aa3cd3 100644
--- a/c64/basic/cmd_break.s
+++ b/c64/basic/cmd_break.s
@@ -16,7 +16,7 @@ cmd_stop:
 	jsr print_integer
 
 !:
-	lda #$0D
-	jsr JCHROUT
+	jsr print_return
+
 cmd_end:
 	jmp basic_main_loop
diff --git a/c64/basic/cmd_list.s b/c64/basic/cmd_list.s
index 91078fc8..2aef7ccb 100644
--- a/c64/basic/cmd_list.s
+++ b/c64/basic/cmd_list.s
@@ -60,8 +60,7 @@ list_single_line: // entry point needed by DOS wedge
 	tax
 	pla
 	jsr print_integer
-	lda #$20
-	jsr JCHROUT
+	jsr print_space
 
 	// Iterate through printing out the line
 	// contents
@@ -69,7 +68,7 @@ list_single_line: // entry point needed by DOS wedge
 	sta QTSW
 	
 	ldy #4
-list_print_loop:	
+list_print_loop:
 
 #if CONFIG_MEMORY_MODEL_60K
 	ldx #<OLDTXT
@@ -145,7 +144,6 @@ list_end_of_line:
 	lda #$92
 	jsr JCHROUT
 	// Print end of line
-	lda #$0d
-	jsr JCHROUT
-	rts
+	jmp print_return
+
 
diff --git a/c64/basic/do_basic_error.s b/c64/basic/do_basic_error.s
index f598247a..31bd947f 100644
--- a/c64/basic/do_basic_error.s
+++ b/c64/basic/do_basic_error.s
@@ -125,12 +125,11 @@ do_TO_MANY_FILES_error:
 
 	// Error # in X
 
-do_basic_error:	
+do_basic_error:
 	// "?"
 	txa
 	pha
-	lda #$0d
-	jsr JCHROUT
+	jsr print_return
 	lda #$3f
 	jsr JCHROUT
 	pla
@@ -140,8 +139,7 @@ do_basic_error:
 	jsr print_packed_message
 
 	// A space between error name and word error
-	lda #$20
-	jsr $ffd2
+	jsr print_space
 
 	// "ERROR"
 	ldx #33
@@ -160,12 +158,10 @@ do_basic_error:
 	jsr print_integer
 !:
 	// New lines
-	lda #$0d
-	jsr $ffd2
+	jsr print_return
 	lda #$00
-	jsr $ffd2
+	jsr JCHROUT
 
 	// XXX - Restore stack depth first?
 
 	jmp basic_main_loop
-	
diff --git a/c64/basic/e422.initmsg.s b/c64/basic/e422.initmsg.s
index a3e07d4a..739de6ce 100644
--- a/c64/basic/e422.initmsg.s
+++ b/c64/basic/e422.initmsg.s
@@ -1,5 +1,28 @@
 
-// XXX provide documentation and implementation
+// XXX provide documentation and finish the implementation
 
 INITMSG:
-    STUB_IMPLEMENTATION()
+
+	// Print PAL/NTSC
+	ldx #30 // NTSC
+	lda TVSFLG
+	beq !+
+	ldx #31 // PAL
+!:
+	jsr print_packed_message
+
+	// Work out free bytes, display them
+	jsr basic_do_new
+	lda MEMSIZ+0
+	sec
+	sbc TXTTAB+0
+	tax
+	lda MEMSIZ+1
+	sbc TXTTAB+1
+
+	jsr print_integer
+	jsr print_space
+
+	// Print the rest of the start up message
+	ldx #34
+	jmp print_packed_message
diff --git a/c64/basic/print_packed_message.s b/c64/basic/print_packed_message.s
index 87523ec0..7012645b 100644
--- a/c64/basic/print_packed_message.s
+++ b/c64/basic/print_packed_message.s
@@ -38,8 +38,7 @@ found_message_in_token_stream:
 	cmp #$ff
 	beq !+
 	jsr print_packed_word
-	lda #$20
-	jsr JCHROUT
+	jsr print_space
 	pla
 	tay
 	iny
diff --git a/c64/basic/wedge_dos.s b/c64/basic/wedge_dos.s
index 57b3c821..47322a6a 100644
--- a/c64/basic/wedge_dos.s
+++ b/c64/basic/wedge_dos.s
@@ -209,8 +209,7 @@ wedge_dos_directory_display:
 wedge_dos_clean_exit:
 	jsr JCLALL
 	// Print new line
-	lda #$0D
-	jsr JCHROUT
+	jsr print_return
 	jmp basic_end_of_line
 
 wedge_dos_basic_error:
diff --git a/c64/kernal/lvs_helpers.s b/c64/kernal/lvs_helpers.s
index c662d65b..bde3f0b7 100644
--- a/c64/kernal/lvs_helpers.s
+++ b/c64/kernal/lvs_helpers.s
@@ -132,8 +132,7 @@ lvs_display_done:
 	jsr print_hex_byte
 	lda STAL+0
 	jsr print_hex_byte
-	lda #$0D
-	jmp JCHROUT
+	jmp print_return
 
 lvs_wrap_around_error:
 	// This error is probably not even detected by C64 Kernal;
diff --git a/c64/kernal/print_hex_byte.s b/c64/kernal/print/print_hex_byte.s
similarity index 100%
rename from c64/kernal/print_hex_byte.s
rename to c64/kernal/print/print_hex_byte.s
diff --git a/c64/kernal/print/print_return.s b/c64/kernal/print/print_return.s
new file mode 100644
index 00000000..b53e8d6c
--- /dev/null
+++ b/c64/kernal/print/print_return.s
@@ -0,0 +1,8 @@
+
+//
+// Print the carriage return
+//
+
+print_return:
+    lda #$0D // carriage return code
+    jmp JCHROUT
diff --git a/c64/kernal/print/print_space.s b/c64/kernal/print/print_space.s
new file mode 100644
index 00000000..48365891
--- /dev/null
+++ b/c64/kernal/print/print_space.s
@@ -0,0 +1,8 @@
+
+//
+// Print the space character
+//
+
+print_space:
+    lda #$20 // space code
+    jmp JCHROUT
diff --git a/c64/kernal/printf.s b/c64/kernal/print/printf.s
similarity index 100%
rename from c64/kernal/printf.s
rename to c64/kernal/print/printf.s