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.
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++;
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) {
+ adjust_ranges_amiga(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 (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 (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;
if (rtg_enabled) {
if (cfg->custom_low == 0)
cfg->custom_low = PIGFX_RTG_BASE;