vmem now work with only dynmem preloaded. Changed to default mode

johanberntsson · Jun 4, 2018 · 4b99726 · 4b99726
1 parent aaa93c3
commit 4b99726
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-DEBUGFLAGS = -DDEBUG=1
+#DEBUGFLAGS = -DDEBUG=1
 VMFLAGS = -DUSEVM=1
 C1541 := /usr/bin/c1541
 #X64 := /usr/bin/x64 -autostart-delay-random

diff --git a/vmem.asm b/vmem.asm
@@ -1,9 +1,9 @@
 ; virtual memory
 TRACE_VM = 1
 ;TRACE_VM_PC = 1
-;PRELOAD_UNTIL = header_static_mem ; dynmem only
+PRELOAD_UNTIL = header_static_mem ; dynmem only
 ;PRELOAD_UNTIL = header_dictionary ; dynmen + grammar tables
-PRELOAD_UNTIL = header_high_mem   ; dynmem + statmem
+;PRELOAD_UNTIL = header_high_mem   ; dynmem + statmem
 
 ; virtual memory address space
 ; Z1-Z3: 128 kB (0 - $1ffff)
@@ -67,9 +67,10 @@ vmap_z_l = vmap_z_h + vmap_max_length
 vmap_c64 = vmap_z_l + vmap_max_length
 
 !ifdef USEVM {
+
+!ifdef DEBUG {
 !ifdef TRACE_VM {
 print_vm_map
-!ifdef DEBUG {
     ldy #0
 -   cpy #10
     bcs +
@@ -99,9 +100,9 @@ print_vm_map
     iny 
     cpy #vmap_max_length
     bne -
-}
     rts
 }
+}
 
 load_blocks_from_index
     ; x = index to load
@@ -180,7 +181,7 @@ prepare_static_high_memory
     cpy #vmap_max_length
     bne -
 !ifdef TRACE_VM {
-    jsr print_vm_map
+    ;jsr print_vm_map
 }
     rts