Added X16 reading of zcode into banked memory

johanberntsson · Feb 29, 2024 · 4ebde96 · 4ebde96
1 parent 3094007
commit 4ebde96
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -2,11 +2,13 @@ all: x16
 
 x16:
 	ruby make.rb -s examples/dejavu.z3 -t:x16 -v
+	tail --bytes=+8193 x16_dejavu/dump.bin > x16_dejavu/dump2.bin
+	cmp x16_dejavu/dump2.bin x16_dejavu/zcode
 	#acme --cpu 65c02 -o testx16.bin --format cbm -l temp/acme_labels.txt testx16.asm
 	# Need F12 to enter the debugger
 	#grep testscreen temp/acme_labels.txt
 	#grep s_printchar temp/acme_labels.txt
-	#x16-emulator/x16emu -prg testx16.bin -scale 2 -debug -run
+	#x16-emulator/x16emu -prg testx16.bin -scale 2 -dump B -zeroram -debug -run
 
 mega65:
 	ruby make.rb -t:mega65 ./games/infocom/sherlock.z5 -u -s -ch:100 -sb:0 -dm:0  -v

diff --git a/asm/ozmoo.asm b/asm/ozmoo.asm
@@ -20,9 +20,9 @@
 !ifdef TARGET_X16 {
 	TARGET_ASSIGNED = 1
 	COMPLEX_MEMORY = 1
-;	FAR_DYNMEM = 1 ; This will most likely be used for X16
+	;FAR_DYNMEM = 1 ; TODO: enable this
 	SUPPORT_REU = 1
-	SUPPORT_80COL = 1;
+	SUPPORT_80COL = 1
 	!ifndef SLOW {
 		SLOW = 1
 	}

diff --git a/asm/reu.asm b/asm/reu.asm
@@ -54,13 +54,13 @@ x16_load_file_to_reu
 	ldx #2      ; filenumber 2
 	jsr kernal_chkin ; call CHKIN (file 2 now used as input)
 
-    ldx #0
-    stx z_temp
-
-johan
+    ldx #1 ; start at bank 1 since bank 0 is reserved for kernal
 	
 .next_bank
-    stx $0000
+    stx $0000  ; switch bank
+
+    lda #$00   ; start from $a000
+    sta z_temp
     lda #$a0
     sta z_temp + 1
 	

diff --git a/documentation/techreport_13.pdf b/documentation/techreport_13.pdf
diff --git a/make.rb b/make.rb
@@ -1333,6 +1333,7 @@ def play(filename, storyname)
 		command = "cd #{filename} && ../#{$X16} -prg #{storyname} -run"
 		command += " -dump B" # Ctrl-S from the emulator to dump memory
 		command += " -debug"
+		command += " -zeroram"
 		#command += " -scale 2"
 	elsif $target == "mega65" then
 		if defined? $MEGA65 then