# HG changeset patch
# User Michael Pavone <pavone@retrodev.com>
# Date 1707695041 28800
# Node ID a66916828c9b20b73fbcacd317155190754434c6
# Parent  bed4d3db8a3fbb9499313153ea5c32afcd160f02
Fix blastcpm target

diff -r bed4d3db8a3f -r a66916828c9b blastcpm.c
--- a/blastcpm.c	Sun Feb 11 11:04:39 2024 -0800
+++ b/blastcpm.c	Sun Feb 11 15:44:01 2024 -0800
@@ -71,7 +71,7 @@
 #ifdef NEW_CORE
 	total_cycles += z80->cycles;
 #else
-	total_cycles += context->current_cycle;
+	total_cycles += z80->current_cycle;
 #endif
 	printf("Effective clock speed: %f MHz\n", ((double)total_cycles) / (1000000.0 * duration));
 	exit(0);
@@ -79,13 +79,13 @@
 }
 
 const memmap_chunk z80_map[] = {
-	{ 0x0000, 0x10000,  0xFFFF, 0, 0, MMAP_READ | MMAP_WRITE | MMAP_CODE, ram, NULL, NULL, NULL, NULL},
+	{ 0x0000, 0x10000,  0xFFFF, .flags = MMAP_READ | MMAP_WRITE | MMAP_CODE, .buffer = ram},
 };
 
 memmap_chunk io_map[] = {
-	{ 0x0, 0x1, 0xFFFF, 0, 0, 0, NULL, NULL, NULL, console_read, console_write},
-	{ 0x1, 0x2, 0xFFFF, 0, 0, 0, NULL, NULL, NULL, console_status_read, console_flush_write},
-	{ 0x2, 0x3, 0xFFFF, 0, 0, 0, NULL, NULL, NULL, NULL, exit_write},
+	{ 0x0, 0x1, 0xFFFF, .read_8 = console_read, .write_8 = console_write},
+	{ 0x1, 0x2, 0xFFFF, .read_8 = console_status_read, .write_8 = console_flush_write},
+	{ 0x2, 0x3, 0xFFFF, .write_8 = exit_write},
 };
 
 int main(int argc, char **argv)