From 73dee0acba4fa412063f3520524bd7c1be6c1fb7 Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Mon, 14 Dec 2020 17:39:34 +0100
Subject: [PATCH] fixed monitor memory mapping

---
 Makefile                                  | 2 +-
 src/,,config_mega65.s                     | 3 ---
 src/kernal/board_m65/mega65_map_helpers.s | 2 +-
 src/kernal/board_m65/mega65_monitor.s     | 2 +-
 src/mon_m65/4000.mon_vectable.s           | 1 +
 src/mon_m65/bsmon.s                       | 3 ---
 6 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 02dc7764..d86dc743 100644
--- a/Makefile
+++ b/Makefile
@@ -718,7 +718,7 @@ $(TARGET_U64CRT_X): $(SEG_LIST_U64CRT) $(CRT_BIN_LIST) build/padding_8_KB
 # $0:$A000 -  8 KB - BASIC  segment 0
 # $0:$C000 -  4 KB - KERNAL segment C
 # $0:$D000 -  4 KB - legacy mode chargen
-# $0:$E000 -  9 KB - KERNAL segment 0
+# $0:$E000 -  8 KB - KERNAL segment 0
 # $1:$0000 -  8 KB - Machine Language MONITOR
 # $1:$2000 - 56 KB - unused for now, padding
 
diff --git a/src/,,config_mega65.s b/src/,,config_mega65.s
index c2a2b642..8c5ea1f7 100644
--- a/src/,,config_mega65.s
+++ b/src/,,config_mega65.s
@@ -106,6 +106,3 @@
 ; --- Other
 
 ;; #CONFIG# COMPRESSION_LVL_2          NO
-
-
-;; #CONFIG# DEV_BSMON                  NO       ; do not change, BSMON is not integrated yet
diff --git a/src/kernal/board_m65/mega65_map_helpers.s b/src/kernal/board_m65/mega65_map_helpers.s
index 0aa629bf..d5bb88cc 100644
--- a/src/kernal/board_m65/mega65_map_helpers.s
+++ b/src/kernal/board_m65/mega65_map_helpers.s
@@ -112,7 +112,7 @@ map_MON_1:
 	tay
 	taz
 
-	lda #$E0
+	lda #$C0
 	ldx #$42                 ; $4000 <- map 8KB from $30000
 
 	map
diff --git a/src/kernal/board_m65/mega65_monitor.s b/src/kernal/board_m65/mega65_monitor.s
index 6e2133aa..ddfb7600 100644
--- a/src/kernal/board_m65/mega65_monitor.s
+++ b/src/kernal/board_m65/mega65_monitor.s
@@ -5,5 +5,5 @@
 MONITOR:
 
 	jsr map_MON_1
-	; XXX call the monitor here
+	jsr ($4000)
 	jmp map_NORMAL
diff --git a/src/mon_m65/4000.mon_vectable.s b/src/mon_m65/4000.mon_vectable.s
index 0b07704f..97c2796d 100644
--- a/src/mon_m65/4000.mon_vectable.s
+++ b/src/mon_m65/4000.mon_vectable.s
@@ -3,6 +3,7 @@
 
 !ifdef CONFIG_DEV_BSMON {
 
+!word xtest
 !word Mon_Call
 !word Mon_Break
 !word Mon_Switch
diff --git a/src/mon_m65/bsmon.s b/src/mon_m65/bsmon.s
index dcdc7b36..8d54a106 100644
--- a/src/mon_m65/bsmon.s
+++ b/src/mon_m65/bsmon.s
@@ -4,7 +4,6 @@
 ; * (adaped for the Open ROMs)  *
 ; *******************************
 
-!ifdef CONFIG_DEV_BSMON {
 
 ; XXX adapt all the addresses/constants!
 
@@ -2941,5 +2940,3 @@ Mon_Help
    !pet KEY_LT_RED,"?",KEY_WHITE,"help        - ?",KEY_RETURN
    !pet 0
    JMP Main
-
-}