Skipping dynmem loading if already supplied by exomizer (optional)

johanberntsson · johanberntsson · commit 0a84236f4d3e · 2018-06-14T13:18:05.000+10:00
diff --git a/Makefile b/Makefile
@@ -59,10 +59,10 @@ d64.strictz5:
 	$(C1541) -attach strictz5.d64 -write ozmoo ozmoo
 
 d64.minform: 
-	acme -DTRACE=1 -DZ5=1 $(DEBUGFLAGS) $(VMFLAGS) --cpu 6510 --format cbm -l acme_labels.txt --outfile ozmoo ozmoo.asm
-	#exomizer/src/exomizer sfx basic oz -o ozmoo
+	acme -DDYNMEM_ALREADY_LOADED=1 -DZ5=1 $(DEBUGFLAGS) $(VMFLAGS) --cpu 6510 --format cbm -l acme_labels.txt --outfile ozmoo ozmoo.asm
+	exomizer/src/exomizer sfx basic ozmoo minform/minform.dynmem,14336 -o ozmoo_zip
 	cp minform/minform.d64 minform.d64
-	$(C1541) -attach minform.d64 -write ozmoo ozmoo
+	$(C1541) -attach minform.d64 -write ozmoo_zip ozmoo
 
 d64.minizork: 
 	acme -DZ3=1 $(DEBUGFLAGS) $(VMFLAGS) --cpu 6510 --format cbm -l acme_labels.txt --outfile ozmoo ozmoo.asm
diff --git a/create_d64.rb b/create_d64.rb
@@ -163,19 +163,22 @@ def create_d64(story_filename, d64_filename, dynmem_filename)
     # check header.high_mem_start (size of dynmem + statmem)
     # minform: $1768 = 5992 (23, 104)
     story_file.read(4) # skip version and flags1
-    high_mem_start = story_file.read(2).unpack("n")
+    high_mem_start = story_file.read(2).unpack("n")[0]
     
     # check header.static_mem_start (size of dynmem)
     story_file.read(8) # skip until this entry
     static_mem_start = story_file.read(2).unpack("n")[0]
 
     # get dynmem size (in 1kb blocks)
-    dynmem_size = 1024 * ((static_mem_start + 512)/1024)
+    #dynmem_size = 1024 * ((static_mem_start + 512)/1024)
+    dynmem_size = 1024 * ((high_mem_start + 512)/1024)
 
     # save dynmem as separate file
     story_file.rewind
     dynmem = story_file.read(dynmem_size)
     if !dynmem_filename.nil? then
+        # Assume memory starts at $3800
+        dynmem_file.write([0x00,0x38].pack("CC"))
         dynmem_file.write(dynmem)
         dynmem_file.close
     end
diff --git a/minform/minform.dynmem b/minform/minform.dynmem
diff --git a/ozmoo.asm b/ozmoo.asm
@@ -91,8 +91,11 @@ w1  cmp $d012
 	; Default banks during execution: Like standard except Basic ROM is replaced by RAM.
 	+set_memory_no_basic
 
-
+!ifdef DYNMEM_ALREADY_LOADED {
+	jsr parse_header
+} else {
 	jsr load_dynamic_memory
+}
 	jsr prepare_static_high_memory
     jsr parse_dictionary
     jsr parse_object_table
@@ -116,7 +119,9 @@ load_header
     sty readblocks_numblocks
     sta readblocks_mempos + 1
     jsr readblocks
+    ;jmp parse_header
 
+parse_header ; must follow load_header
     ; check z machine version
     lda story_start + header_version
 !ifdef Z3 {
diff --git a/vmem.asm b/vmem.asm
@@ -2,9 +2,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)
