github.com/captain-amygdala.pistorm
1
0
Fork 0
mirror of https://github.com/captain-amygdala/pistorm.git synced 2026-03-09 12:05:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #21 from beeanyew/wip-crap

Browse Source 
Fix Z3 Fast autoconf on Kickstart 2.0
This commit is contained in:
beeanyew
2021-04-22 04:30:11 +02:00
committed by GitHub
parent 3494518e3b e4313cfbd3
commit 76e11f4ffc
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
emulator.c
View File

@@ -434,11 +434,6 @@ int main(int argc, char *argv[]) {
int g;
//const struct sched_param priority = {99};
if (argc > 1) {
irq_delay = atoi(argv[1]);
printf("Setting IRQ delay to %d loops (%s).\n", irq_delay, argv[1]);
}
// Some command line switch stuffles
for (g = 1; g < argc; g++) {
if (strcmp(argv[g], "--cpu_type") == 0 || strcmp(argv[g], "--cpu") == 0) {

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;