Mercurial > repos > blastem
comparison genesis.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 | 928a65750345 |
children | 9fc680b35dbb |
comparison
equal
deleted
inserted
replaced
1129:6b5c92b6205c | 1130:8f14767661fa |
---|---|
923 ym_init(gen->ym, render_sample_rate(), gen->master_clock, MCLKS_PER_YM, render_audio_buffer(), system_opts, lowpass_cutoff); | 923 ym_init(gen->ym, render_sample_rate(), gen->master_clock, MCLKS_PER_YM, render_audio_buffer(), system_opts, lowpass_cutoff); |
924 | 924 |
925 gen->psg = malloc(sizeof(psg_context)); | 925 gen->psg = malloc(sizeof(psg_context)); |
926 psg_init(gen->psg, render_sample_rate(), gen->master_clock, MCLKS_PER_PSG, render_audio_buffer(), lowpass_cutoff); | 926 psg_init(gen->psg, render_sample_rate(), gen->master_clock, MCLKS_PER_PSG, render_audio_buffer(), lowpass_cutoff); |
927 | 927 |
928 gen->z80 = calloc(1, sizeof(z80_context)); | |
929 gen->zram = calloc(1, Z80_RAM_BYTES); | 928 gen->zram = calloc(1, Z80_RAM_BYTES); |
930 z80_map[0].buffer = gen->zram = calloc(1, Z80_RAM_BYTES); | 929 z80_map[0].buffer = gen->zram = calloc(1, Z80_RAM_BYTES); |
931 #ifndef NO_Z80 | 930 #ifndef NO_Z80 |
932 z80_options *z_opts = malloc(sizeof(z80_options)); | 931 z80_options *z_opts = malloc(sizeof(z80_options)); |
933 init_z80_opts(z_opts, z80_map, 5, NULL, 0, MCLKS_PER_Z80, 0xFFFF); | 932 init_z80_opts(z_opts, z80_map, 5, NULL, 0, MCLKS_PER_Z80, 0xFFFF); |
934 init_z80_context(gen->z80, z_opts); | 933 gen->z80 = init_z80_context(z_opts); |
935 gen->z80->next_int_pulse = z80_next_int_pulse; | 934 gen->z80->next_int_pulse = z80_next_int_pulse; |
936 z80_assert_reset(gen->z80, 0); | 935 z80_assert_reset(gen->z80, 0); |
936 #else | |
937 gen->z80 = calloc(1, sizeof(z80_context)); | |
937 #endif | 938 #endif |
938 | 939 |
939 gen->z80->system = gen; | 940 gen->z80->system = gen; |
940 gen->z80->mem_pointers[0] = gen->zram; | 941 gen->z80->mem_pointers[0] = gen->zram; |
941 gen->z80->mem_pointers[1] = gen->z80->mem_pointers[2] = (uint8_t *)main_rom; | 942 gen->z80->mem_pointers[1] = gen->z80->mem_pointers[2] = (uint8_t *)main_rom; |