BIOS now attached to BOOTCPM command, fixed another screen editor bug

src/kernal/board_m65/mega65_bootcpm.s

@@ -4,6 +4,13 @@
 
 BOOTCPM:
 
-	; jsr map_MON_1
-	; XXX implement system startupo
-	jmp BOOTCPM
+	jsr CLALL
+	clc
+	jsr M65_MODESET
+
+	jsr viciv_init           ; do it now, later it will not be safe anymore
+	lda #$01
+	jsr M65_SCRMODESET
+
+	jsr map_ZVM_1
+	jmp ($2000)

src/kernal/board_m65/mega65_imports_C.s

@@ -15,3 +15,11 @@
 ;; #ALIAS# __kb_matrix_alwaysrepeat_end    = KERNAL_0.__kb_matrix_alwaysrepeat_end
 ;; #ALIAS# kb_matrix_joy_status            = KERNAL_0.kb_matrix_joy_status
 ;; #ALIAS# kb_matrix_joy_keytab_idx        = KERNAL_0.kb_matrix_joy_status
+
+;
+; Definitions needed to perform proxy functionality for Z80 Virtual Machione
+;
+
+;; #ALIAS# CHROUT                          = KERNAL_0.CHROUT
+
+;; #ALIAS# map_ZVM_1                       = KERNAL_0.map_ZVM_1

src/kernal/board_m65/mega65_map_helpers.s

@@ -10,6 +10,8 @@
 ; - KERNAL_1          - for calling KERNAL_1 segment code
 ; - DOS_1             - for swiching to DOS context
 ; - NORMAL_from_DOS_1 - for switching bact from DOS context
+; - MON_1             - for the monitor
+; - ZVM_1             - for Z80 virtual machine
 
 
 map_NORMAL:
@@ -117,3 +119,20 @@ map_MON_1:
 
 	map
 	bra map_end
+
+map_ZVM_1:
+
+	php
+	pha
+	phx
+	phy
+	phz
+
+	lda #$00
+	tay
+	taz
+
+	ldx #$E3                 ; $2000 <- map 24KB from $32000
+
+	map
+	bra map_end

src/kernal/board_m65/mega65_proxies_zvm.s

@@ -0,0 +1,17 @@
+;; #LAYOUT# M65 KERNAL_C #TAKE
+;; #LAYOUT# *   *        #IGNORE
+
+;
+; Proxies for calling MEGA65 segment KERNAL_0 routines from ZVM_1
+;
+
+
+proxy_Z1_CHROUT:
+
+	jsr CHROUT
+
+	; FALLTROUGH
+
+proxy_Z1_end:
+
+	jmp map_ZVM_1

src/kernal/screen_m65/mega65_chrout_screen_control_2.s

@@ -72,23 +72,23 @@ m65_chrout_screen_HOME:
 
 ; Character set switching
 
-m65_chrout_screen_GFX:
+m65_chrout_screen_TXT:
 	
 	lda VIC_CHARPTR+1
 	ora #%00001000
 
 	; FALLTROUGH
 
-m65_chrout_screen_GFX_cont:
+m65_chrout_screen_GFXTXT_cont:
 
 	sta VIC_CHARPTR+1
 	bra m65_chrout_screen_ctrl2_end
 
-m65_chrout_screen_TXT:
+m65_chrout_screen_GFX:
 
 	lda VIC_CHARPTR+1
 	and #%11110111
-	bra m65_chrout_screen_GFX_cont
+	bra m65_chrout_screen_GFXTXT_cont
 
 ; INS key