Mercurial > repos > blastem

comparison genesis.c @ 1105:27ea21b10361

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix Z80 RAM mapping after refactor
author Michael Pavone <pavone@retrodev.com>
date Sun, 11 Dec 2016 22:00:41 -0800
parents 4224980a5f84
children 87114df913ec
comparison
equal deleted inserted replaced
1104:4224980a5f84 1105:27ea21b10361
801 801
802 gen->psg = malloc(sizeof(psg_context)); 802 gen->psg = malloc(sizeof(psg_context));
803 psg_init(gen->psg, render_sample_rate(), gen->master_clock, MCLKS_PER_PSG, render_audio_buffer(), lowpass_cutoff); 803 psg_init(gen->psg, render_sample_rate(), gen->master_clock, MCLKS_PER_PSG, render_audio_buffer(), lowpass_cutoff);
804 804
805 gen->z80 = calloc(1, sizeof(z80_context)); 805 gen->z80 = calloc(1, sizeof(z80_context));
806 gen->zram = calloc(1, Z80_RAM_BYTES);
806 z80_map[0].buffer = gen->zram = calloc(1, Z80_RAM_BYTES); 807 z80_map[0].buffer = gen->zram = calloc(1, Z80_RAM_BYTES);
807 #ifndef NO_Z80 808 #ifndef NO_Z80
808 z80_options *z_opts = malloc(sizeof(z80_options)); 809 z80_options *z_opts = malloc(sizeof(z80_options));
809 init_z80_opts(z_opts, z80_map, 5, NULL, 0, MCLKS_PER_Z80); 810 init_z80_opts(z_opts, z80_map, 5, NULL, 0, MCLKS_PER_Z80);
810 init_z80_context(gen->z80, z_opts); 811 init_z80_context(gen->z80, z_opts);
816 gen->z80->mem_pointers[1] = gen->z80->mem_pointers[2] = (uint8_t *)main_rom; 817 gen->z80->mem_pointers[1] = gen->z80->mem_pointers[2] = (uint8_t *)main_rom;
817 818
818 gen->cart = main_rom; 819 gen->cart = main_rom;
819 gen->lock_on = lock_on; 820 gen->lock_on = lock_on;
820 gen->work_ram = calloc(2, RAM_WORDS); 821 gen->work_ram = calloc(2, RAM_WORDS);
821 gen->zram = calloc(1, Z80_RAM_BYTES);
822 setup_io_devices(config, rom, gen); 822 setup_io_devices(config, rom, gen);
823 823
824 gen->save_type = rom->save_type; 824 gen->save_type = rom->save_type;
825 gen->save_type = rom->save_type; 825 gen->save_type = rom->save_type;
826 if (gen->save_type != SAVE_NONE) { 826 if (gen->save_type != SAVE_NONE) {