Mercurial > repos > blastem
diff blastcpm.c @ 1130:8f14767661fa
Remove memory map assumptions from Z80 core and move a little bit of logic to the generic backend.c so it can be shared between CPU cores
| author | Michael Pavone <pavone@retrodev.com> |
|---|---|
| date | Wed, 28 Dec 2016 20:39:27 -0800 |
| parents | fe8c79f82c22 |
| children | 2455662378ed ca2336469397 |
line wrap: on
line diff
--- a/blastcpm.c Wed Dec 28 12:28:52 2016 -0800 +++ b/blastcpm.c Wed Dec 28 20:39:27 2016 -0800 @@ -62,13 +62,13 @@ } const memmap_chunk z80_map[] = { - { 0x0000, 0x10000, 0xFFFF, 0, MMAP_READ | MMAP_WRITE | MMAP_CODE, ram, NULL, NULL, NULL, NULL}, + { 0x0000, 0x10000, 0xFFFF, 0, 0, MMAP_READ | MMAP_WRITE | MMAP_CODE, ram, NULL, NULL, NULL, NULL}, }; const memmap_chunk io_map[] = { - { 0x0, 0x1, 0xFFFF, 0, 0, NULL, NULL, NULL, console_read, console_write}, - { 0x1, 0x2, 0xFFFF, 0, 0, NULL, NULL, NULL, console_status_read, console_flush_write}, - { 0x2, 0x3, 0xFFFF, 0, 0, NULL, NULL, NULL, NULL, exit_write}, + { 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}, }; int main(int argc, char **argv) @@ -100,13 +100,13 @@ ram[7] = OS_START >> 8; z80_options opts; - z80_context context; + z80_context *context; init_z80_opts(&opts, z80_map, 1, io_map, 3, 1, 0xFF); - init_z80_context(&context, &opts); + context = init_z80_context(&opts); for(;;) { - z80_run(&context, 1000000); - context.current_cycle = 0; + z80_run(context, 1000000); + context->current_cycle = 0; } return 0; } \ No newline at end of file