80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Reverted the ROM read cycles back to the old (and evidently, more correct) ones.

Browse Source
This commit is contained in:
OBattler
2021-06-03 05:02:22 +02:00
parent a41adb884d
commit 736eb46847
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/cpu/cpu.c
View File

@@ -142,8 +142,7 @@ void (*cpu_exec)(int cycs);
static uint8_t ccr0, ccr1, ccr2, ccr3, ccr4, ccr5, ccr6; static uint8_t ccr0, ccr1, ccr2, ccr3, ccr4, ccr5, ccr6;
static int cyrix_addr, cpu_rom_read_cycles = 4; static int cyrix_addr;
static uint64_t rom_read_timing_ns = 150;
static void cpu_write(uint16_t addr, uint8_t val, void *priv); static void cpu_write(uint16_t addr, uint8_t val, void *priv);
@@ -407,7 +406,10 @@ cpu_set(void)
isa_cycles = cpu_s->atclk_div; isa_cycles = cpu_s->atclk_div;
cpu_rom_prefetch_cycles = (cpu_rom_read_cycles * cpu_s->rspeed * rom_read_timing_ns + 999999999ULL) / 1000000000ULL; if (cpu_s->rspeed <= 8000000)
cpu_rom_prefetch_cycles = cpu_mem_prefetch_cycles;
else
cpu_rom_prefetch_cycles = cpu_s->rspeed / 1000000;
cpu_set_isa_pci_div(0); cpu_set_isa_pci_div(0);
cpu_set_pci_speed(0); cpu_set_pci_speed(0);
@@ -1377,8 +1379,10 @@ cpu_set_isa_speed(int speed)
if (speed) { if (speed) {
cpu_isa_speed = speed; cpu_isa_speed = speed;
pc_speed_changed(); pc_speed_changed();
} else } else if (cpu_busspeed >= 8000000)
cpu_isa_speed = 8000000; cpu_isa_speed = 8000000;
else
cpu_isa_speed = cpu_busspeed;
cpu_log("cpu_set_isa_speed(%d) = %d\n", speed, cpu_isa_speed); cpu_log("cpu_set_isa_speed(%d) = %d\n", speed, cpu_isa_speed);
} }
@@ -3069,5 +3073,6 @@ cpu_update_waitstates(void)
cpu_mem_prefetch_cycles = cpu_prefetch_cycles; cpu_mem_prefetch_cycles = cpu_prefetch_cycles;
cpu_rom_prefetch_cycles = (cpu_rom_read_cycles * cpu_s->rspeed * rom_read_timing_ns + 999999999ULL) / 1000000000ULL; if (cpu_s->rspeed <= 8000000)
cpu_rom_prefetch_cycles = cpu_mem_prefetch_cycles;
} }