From 4b381db9f764195da50276e98e5bb109f4ec577d Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Thu, 27 Feb 2020 21:53:36 +0100
Subject: [PATCH] LINKPRG moved to Mega65 extra ROM

---
 c64/basic/a533.linkprg.s                      | 38 ++++++++++++++-----
 .../board_m65/4000.mega65_vectable_basic_1.s  | 12 +++---
 c64/basic/board_m65/mega65_imports.s          |  4 +-
 c64/basic/board_m65/mega65_proxies.s          | 14 ++++++-
 c64/basic/print/list_single_line.s            | 13 +++++--
 5 files changed, 61 insertions(+), 20 deletions(-)

diff --git a/c64/basic/a533.linkprg.s b/c64/basic/a533.linkprg.s
index f272bd30..57d6bdda 100644
--- a/c64/basic/a533.linkprg.s
+++ b/c64/basic/a533.linkprg.s
@@ -1,6 +1,7 @@
 // #LAYOUT# STD *       #TAKE
+// #LAYOUT# M65 BASIC_0 #TAKE
+// #LAYOUT# M65 BASIC_1 #TAKE-FLOAT
 // #LAYOUT# X16 BASIC_0 #TAKE-OFFSET 2000
-// #LAYOUT# *   BASIC_0 #TAKE
 // #LAYOUT# *   *       #IGNORE
 
 //
@@ -12,6 +13,14 @@
 
 LINKPRG:
 
+#if (ROM_LAYOUT_M65 && SEGMENT_BASIC_0)
+
+	jsr     map_BASIC_1
+	jsr_ind VB1__LINKPRG
+	jmp     map_NORMAL
+
+#else
+
 	// Start by getting pointer to the first line
 	jsr init_oldtxt
 
@@ -19,11 +28,13 @@ linkprg_loop:
 	// Is the pointer to the end of the program
 	ldy #1
 
-#if CONFIG_MEMORY_MODEL_60K
+#if ROM_LAYOUT_M65
+	jsr peek_via_OLDTXT
+#elif CONFIG_MEMORY_MODEL_60K
 	ldx #<OLDTXT+0
 	jsr peek_under_roms
 	cmp #$00
-#else // CONFIG_MEMORY_MODEL_38K
+#else
 	lda (OLDTXT),y
 #endif
 
@@ -38,10 +49,12 @@ linkprg_loop:
 
 linkprg_end_of_line_search:
 
-#if CONFIG_MEMORY_MODEL_60K
+#if ROM_LAYOUT_M65
+	jsr peek_via_OLDTXT
+#elif CONFIG_MEMORY_MODEL_60K
 	ldx #<OLDTXT+0
 	jsr peek_under_roms
-#else // CONFIG_MEMORY_MODEL_38K
+#else
 	lda (OLDTXT),y
 #endif
 
@@ -70,10 +83,12 @@ linkprg_end_of_line_search:
 	php
 	ldy #0
 
-#if CONFIG_MEMORY_MODEL_60K
+#if ROM_LAYOUT_M65
+	jsr poke_via_OLDTXT
+#elif CONFIG_MEMORY_MODEL_60K
 	ldx #<OLDTXT+0
 	jsr poke_under_roms
-#else // CONFIG_MEMORY_MODEL_38K
+#else
 	sta (OLDTXT),y
 #endif
 
@@ -82,9 +97,11 @@ linkprg_end_of_line_search:
 	adc #0
 	ldy #1
 
-#if CONFIG_MEMORY_MODEL_60K
+#if ROM_LAYOUT_M65
+	jsr poke_via_OLDTXT
+#elif CONFIG_MEMORY_MODEL_60K
 	jsr poke_under_roms
-#else // CONFIG_MEMORY_MODEL_38K
+#else
 	sta (OLDTXT),y
 #endif
 
@@ -93,3 +110,6 @@ linkprg_end_of_line_search:
 	sta OLDTXT+0
 
 	jmp linkprg_loop
+
+
+#endif // ROM layout
diff --git a/c64/basic/board_m65/4000.mega65_vectable_basic_1.s b/c64/basic/board_m65/4000.mega65_vectable_basic_1.s
index 992f8e7c..e69e0332 100644
--- a/c64/basic/board_m65/4000.mega65_vectable_basic_1.s
+++ b/c64/basic/board_m65/4000.mega65_vectable_basic_1.s
@@ -12,17 +12,19 @@
 	// Label definitions
 
 	.label VB1__INITMSG                = $4000 + 2 * 0
-	.label VB1__tokenise_line          = $4000 + 2 * 1
-	.label VB1__list_single_line       = $4000 + 2 * 2
-	.label VB1__print_packed_message   = $4000 + 2 * 3
-	.label VB1__basic_do_clr           = $4000 + 2 * 4
-	.label VB1__basic_do_new           = $4000 + 2 * 5
+	.label VB1__LINKPRG                = $4000 + 2 * 1
+	.label VB1__tokenise_line          = $4000 + 2 * 2
+	.label VB1__list_single_line       = $4000 + 2 * 3
+	.label VB1__print_packed_message   = $4000 + 2 * 4
+	.label VB1__basic_do_clr           = $4000 + 2 * 5
+	.label VB1__basic_do_new           = $4000 + 2 * 6
 
 #else
 
 	// Vector table (OpenROMs private!)
 
 	.word INITMSG
+	.word LINKPRG
 	.word tokenise_line
 	.word list_single_line
 	.word print_packed_message
diff --git a/c64/basic/board_m65/mega65_imports.s b/c64/basic/board_m65/mega65_imports.s
index fb4e5161..de496d3b 100644
--- a/c64/basic/board_m65/mega65_imports.s
+++ b/c64/basic/board_m65/mega65_imports.s
@@ -8,10 +8,12 @@
 #import "BASIC_0_combined.sym"
 
 
-.label peek_under_roms                 = BASIC_0.proxy_B1_peek_under_roms
+.label peek_via_OLDTXT                 = BASIC_0.proxy_B1_peek_via_OLDTXT
+.label poke_via_OLDTXT                 = BASIC_0.proxy_B1_poke_via_OLDTXT
 .label JCHROUT                         = BASIC_0.proxy_B1_JCHROUT
 .label JMEMTOP                         = KERNAL_0.JMEMTOP
 .label plot_set                        = KERNAL_0.plot_set
+.label init_oldtxt                     = BASIC_0.init_oldtxt
 .label rom_revision_basic_string       = BASIC_0.rom_revision_basic_string
 .label print_integer                   = BASIC_0.proxy_B1_print_integer
 .label print_return                    = BASIC_0.proxy_B1_print_return
diff --git a/c64/basic/board_m65/mega65_proxies.s b/c64/basic/board_m65/mega65_proxies.s
index 6da2f738..91808310 100644
--- a/c64/basic/board_m65/mega65_proxies.s
+++ b/c64/basic/board_m65/mega65_proxies.s
@@ -6,16 +6,26 @@
 //
 
 
-proxy_B1_peek_under_roms:
+proxy_B1_peek_via_OLDTXT:
 
 	jsr map_NORMAL
 #if CONFIG_MEMORY_MODEL_60K
-	jsr peek_under_roms
+	.error "not implemented"
 #else // CONFIG_MEMORY_MODEL_38K
 	lda (OLDTXT),y
 #endif
 	jmp map_BASIC_1
 
+proxy_B1_poke_via_OLDTXT:
+
+	jsr map_NORMAL
+#if CONFIG_MEMORY_MODEL_60K
+	.error "not implemented"
+#else // CONFIG_MEMORY_MODEL_38K
+	sta (OLDTXT),y
+#endif
+	jmp map_BASIC_1
+
 
 proxy_B1_JCHROUT:
 
diff --git a/c64/basic/print/list_single_line.s b/c64/basic/print/list_single_line.s
index e3936d88..64e6b2b4 100644
--- a/c64/basic/print/list_single_line.s
+++ b/c64/basic/print/list_single_line.s
@@ -16,7 +16,9 @@ list_single_line:
 	// Print line number
 	ldy #3
 
-#if ROM_LAYOUT_M65 || CONFIG_MEMORY_MODEL_60K
+#if ROM_LAYOUT_M65
+	jsr peek_via_OLDTXT
+#elif CONFIG_MEMORY_MODEL_60K
 	jsr peek_under_roms
 #else
 	lda (OLDTXT),y
@@ -25,7 +27,9 @@ list_single_line:
 	pha
 	dey
 
-#if ROM_LAYOUT_M65 || CONFIG_MEMORY_MODEL_60K
+#if ROM_LAYOUT_M65
+	jsr peek_via_OLDTXT
+#elif CONFIG_MEMORY_MODEL_60K
 	jsr peek_under_roms
 #else
 	lda (OLDTXT),y
@@ -42,9 +46,12 @@ list_single_line:
 	sta QTSW
 	
 	ldy #4
+
 list_print_loop:
 
-#if ROM_LAYOUT_M65 || CONFIG_MEMORY_MODEL_60K
+#if ROM_LAYOUT_M65
+	jsr peek_via_OLDTXT
+#elif CONFIG_MEMORY_MODEL_60K
 	ldx #<OLDTXT
 	jsr peek_under_roms
 	cmp #$00