Fixed so we don't copy a page of vmap highbytes from config when we should copy 0 bytes.

Author: fredrikr

asm/ozmoo.asm

@@ -1203,7 +1203,7 @@ z_init
 	lda #TERPNO ; Interpreter number (8 = C64)
 	ldy #header_interpreter_number 
 	jsr write_header_byte
-	lda #71 ; "G" = release 7
+	lda #72 ; "H" = release 8
 	ldy #header_interpreter_version  ; Interpreter version. Usually ASCII code for a capital letter
 	jsr write_header_byte
 	lda #25
@@ -1954,23 +1954,29 @@ prepare_static_high_memory
 -	sta vmap_next_quick_index,x ; Sets next quick index AND all entries in quick index to 0
 	dex
 	bpl -
-	
+
+; Copy vmem info from config blocks to vmap	
 	lda #6
 	clc
 	adc config_load_address + 4
 	sta zp_temp
 	lda #>config_load_address
 ;	adc #0 ; Not needed, as disk info is always <= 249 bytes
 	sta zp_temp + 1
+!ifdef NOSECTORPRELOAD {
+	; With no sector preload, we only fill vmem map with the blocks that are in boot file
+	ldy #1
+	lda (zp_temp),y
+} else {
 	ldy #0
 	lda (zp_temp),y ; # of blocks in the list
+	iny
+}
 	tax
 	cpx vmap_max_entries
 	bcc +
-	beq +
 	ldx vmap_max_entries
 +	stx vmap_used_entries  ; Number of bytes to copy
-	iny
 	lda (zp_temp),y
 	sta vmap_blocks_preloaded ; # of blocks already loaded
 
@@ -1980,8 +1986,11 @@ prepare_static_high_memory
 	bpl .ignore_blocks
 }
 	sta vmap_used_entries
+	tax
 .ignore_blocks
 
+	cpx #0
+	beq .no_entries
 ; Copy to vmap_z_h
 -	iny
 	lda (zp_temp),y
@@ -1999,7 +2008,6 @@ prepare_static_high_memory
 	inc zp_temp + 1
 +	sta zp_temp
 	ldy vmap_used_entries
-	beq .no_entries
 	dey
 -	lda (zp_temp),y
 	sta vmap_z_l,y

asm/vmem.asm

@@ -270,12 +270,12 @@ print_vm_map
 +   jsr printy
 	jsr space
 	lda vmap_z_h,y ; zmachine mem offset ($0 - 
-	and #%11100000
+	and #$ff xor vmem_highbyte_mask
 	jsr print_byte_as_hex
 	jsr space
 	jsr dollar
 	lda vmap_z_h,y ; zmachine mem offset ($0 - 
-	and #%00011111
+	and #vmem_highbyte_mask
 	jsr printa
 	lda vmap_z_l,y ; zmachine mem offset ($0 - 
 	jsr print_byte_as_hex

make.rb

@@ -2269,7 +2269,7 @@ def print_usage
 File.write(File.join($SRCDIR, 'file_name.asm'), file_name)
 
 # Set $no_sector_preload if we can be almost certain it won't be needed anyway
-if $target != 'c128'
+if $target != 'c128' and limit_preload_vmem_blocks == false
 	loader_kb = $loader_pic_file ? 5 : 0
 	story_kb = ($story_size - $dynmem_blocks * $VMEM_BLOCKSIZE) / 1024
 	bootfile_kb = 46

version.txt

@@ -1 +1 @@
-7.12
+8.0