github.com/captain-amygdala.pistorm
1
0
Fork 0
mirror of https://github.com/captain-amygdala/pistorm.git synced 2026-01-27 20:27:31 +00:00
Code Issues Projects Releases Wiki Activity

Fix Z3 Fast autoconf on Kickstart 2.0

Browse Source 
Managed to forget to stage one line of code for the last commit...
Also fixes the Z3 Autoconf memory range staying active after being configured, prevents some rare memory wraparounds.
This commit is contained in:
beeanyew
2021-04-22 02:22:42 +02:00
parent 513e2291ea
commit eaf95017a8
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platforms/amiga/amiga-autoconf.c
View File

@@ -238,8 +238,10 @@ void autoconfig_write_memory_z3_16(struct emulator_config *cfg, unsigned int add
cfg->map_high[index] = cfg->map_offset[index] + cfg->map_size[index];
m68k_add_ram_range(cfg->map_offset[index], cfg->map_high[index], cfg->map_data[index]);
ac_z3_current_pic++;
if (ac_z3_current_pic == ac_z3_pic_count)
if (ac_z3_current_pic == ac_z3_pic_count) {
ac_z3_done = 1;
adjust_ranges_amiga(cfg);
}
}
return;

6
platforms/amiga/amiga-platform.c
View File

@@ -187,20 +187,20 @@ void adjust_ranges_amiga(struct emulator_config *cfg) {
}
}
if (ac_z2_pic_count && (!ac_z2_done || !ac_z3_done)) {
if ((ac_z2_pic_count || ac_z3_pic_count) && (!ac_z2_done || !ac_z3_done)) {
if (cfg->custom_low == 0)
cfg->custom_low = AC_Z2_BASE;
else
cfg->custom_low = min(cfg->custom_low, AC_Z2_BASE);
cfg->custom_high = max(cfg->custom_high, AC_Z2_BASE + AC_SIZE);
}
if (ac_z3_pic_count && !ac_z3_done) {
/*if (ac_z3_pic_count && !ac_z3_done) {
if (cfg->custom_low == 0)
cfg->custom_low = AC_Z3_BASE;
else
cfg->custom_low = min(cfg->custom_low, AC_Z3_BASE);
cfg->custom_high = max(cfg->custom_high, AC_Z3_BASE + AC_SIZE);
}
}*/
if (rtg_enabled) {
if (cfg->custom_low == 0)
cfg->custom_low = PIGFX_RTG_BASE;