more sane directory name, updated binaries

src/basic/board_m65/4000.mega65_vectable_basic_1.s

@@ -0,0 +1,36 @@
+// #LAYOUT# M65 BASIC_0 #TAKE-FLOAT
+// #LAYOUT# M65 BASIC_1 #TAKE
+// #LAYOUT# *   *       #IGNORE
+
+//
+// Definitions for communication with Mega65 segment BASIC_1 from BASIC_0
+//
+
+
+#if SEGMENT_BASIC_0
+
+	// Label definitions
+
+	.label VB1__INITMSG                 = $4000 + 2 * 0
+	.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_error      = $4000 + 2 * 4
+	.label VB1__print_packed_misc_str   = $4000 + 2 * 5
+	.label VB1__basic_do_clr            = $4000 + 2 * 6
+	.label VB1__basic_do_new            = $4000 + 2 * 7
+
+#else
+
+	// Vector table (OpenROMs private!)
+
+	.word INITMSG
+	.word LINKPRG
+	.word tokenise_line
+	.word list_single_line
+	.word print_packed_error
+	.word print_packed_misc_str
+	.word basic_do_clr
+	.word basic_do_new
+
+#endif

src/basic/board_m65/mega65_imports.s

@@ -0,0 +1,24 @@
+// #LAYOUT# M65 BASIC_1 #TAKE
+// #LAYOUT# *   *       #IGNORE
+
+//
+// Definitions for calling Mega65 segments BASIC_0 and KERNAL_0 routines from BASIC_1
+//
+
+#import "BASIC_0_combined.sym"
+
+
+.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
+.label print_space                     = BASIC_0.proxy_B1_print_space
+#if CONFIG_SHOW_FEATURES
+.label print_features                  = BASIC_0.proxy_B1_print_features
+#endif
+.label do_STRING_TOO_LONG_error        = BASIC_0.do_STRING_TOO_LONG_error

src/basic/board_m65/mega65_map_helpers.s

@@ -0,0 +1,28 @@
+// #LAYOUT# M65 BASIC_0 #TAKE
+// #LAYOUT# *   *       #IGNORE
+
+//
+// ROM mapping routines for Mega65
+//
+
+// Available memory maps:
+// - NORMAL  - nothing mapped in (taken from Kernal)
+// - BASIC_1 - for calling KERNAL_1 segment code
+
+
+map_BASIC_1:
+
+	php
+	pha
+	phx
+	phy
+	phz
+
+	lda #$00
+	tay
+	taz
+
+	lda #$20
+	ldx #$42    // 0x4000 <- map 8KB from 0x22000
+
+	jmp map_end

src/basic/board_m65/mega65_proxies.s

@@ -0,0 +1,68 @@
+// #LAYOUT# M65 BASIC_0 #TAKE
+// #LAYOUT# *   *       #IGNORE
+
+//
+// Proxies for calling Mega65 segment BASIC_0 and KERNAL_0 routines from BASIC_1
+//
+
+
+proxy_B1_peek_via_OLDTXT:
+
+	jsr map_NORMAL
+#if CONFIG_MEMORY_MODEL_60K
+	.error "not implemented"
+#elif CONFIG_MEMORY_MODEL_46K || CONFIG_MEMORY_MODEL_50K
+	jsr peek_under_roms_via_OLDTXT
+	cmp #$00
+#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 || CONFIG_MEMORY_MODEL_46K || CONFIG_MEMORY_MODEL_50K
+	sta (OLDTXT),y
+#endif
+	jmp map_BASIC_1
+
+
+proxy_B1_JCHROUT:
+
+	jsr map_NORMAL
+	jsr JCHROUT
+	jmp map_BASIC_1
+
+
+proxy_B1_print_integer:
+
+	jsr map_NORMAL
+	jsr print_integer
+	jmp map_BASIC_1
+
+
+proxy_B1_print_return:
+
+	jsr map_NORMAL
+	jsr print_return
+	jmp map_BASIC_1
+
+
+proxy_B1_print_space:
+
+	jsr map_NORMAL
+	jsr print_space
+	jmp map_BASIC_1
+
+#if CONFIG_SHOW_FEATURES
+
+proxy_B1_print_features:
+
+	jsr map_NORMAL
+	jsr print_features
+	jmp map_BASIC_1
+
+#endif