}
void *cpu_task() {
- m68k_pulse_reset();
+ m68ki_cpu_core *state = &m68ki_cpu;
+ m68k_pulse_reset(state);
cpu_loop:
if (mouse_hook_enabled) {
printf("%.8X (%.8X)]] %s\n", m68k_get_reg(NULL, M68K_REG_PC), (m68k_get_reg(NULL, M68K_REG_PC) & 0xFFFFFF), disasm_buf);
if (do_disasm)
do_disasm--;
- m68k_execute(1);
+ m68k_execute(state, 1);
}
else {
- if (cpu_emulation_running)
- m68k_execute(loop_cycles);
+ if (cpu_emulation_running) {
+ if (irq)
+ m68k_execute(state, 5);
+ else
+ m68k_execute(state, loop_cycles);
+ }
}
if (irq) {
}
void cpu_pulse_reset(void) {
+ m68ki_cpu_core *state = &m68ki_cpu;
ps_pulse_reset();
if (cfg->platform->handle_reset)
cfg->platform->handle_reset(cfg);
//m68k_write_memory_8(0xbfe201, 0x0001); // AMIGA OVL
//m68k_write_memory_8(0xbfe001, 0x0001); // AMIGA OVL high (ROM@0x0)
- m68k_pulse_reset();
+ m68k_pulse_reset(state);
}
int cpu_irq_ack(int level) {
*(gpio + 1) = GPFSEL1_INPUT;
*(gpio + 2) = GPFSEL2_INPUT;
- while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS))
- ;
+ while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS)) {}
}
static inline void inline_write_8(unsigned int address, unsigned int data) {
*(gpio + 1) = GPFSEL1_INPUT;
*(gpio + 2) = GPFSEL2_INPUT;
- while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS))
- ;
+ while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS)) {}
}
static inline void inline_write_32(unsigned int address, unsigned int value) {
*(gpio + 7) = (REG_DATA << PIN_A0);
*(gpio + 7) = 1 << PIN_RD;
+ while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS)) {}
unsigned int value = *(gpio + 13);
- while ((value=*(gpio + 13)) & (1 << PIN_TXN_IN_PROGRESS))
- ;
*(gpio + 10) = 0xffffec;
*(gpio + 7) = (REG_DATA << PIN_A0);
*(gpio + 7) = 1 << PIN_RD;
+ while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS)) {}
unsigned int value = *(gpio + 13);
- while ((value=*(gpio + 13)) & (1 << PIN_TXN_IN_PROGRESS))
- ;
*(gpio + 10) = 0xffffec;