#define KEY_POLL_INTERVAL_MSEC 5000
-unsigned char read_ranges;
-unsigned int read_addr[8];
-unsigned int read_upper[8];
-unsigned char *read_data[8];
-unsigned char write_ranges;
-unsigned int write_addr[8];
-unsigned int write_upper[8];
-unsigned char *write_data[8];
-address_translation_cache code_translation_cache = {0};
-
int kb_hook_enabled = 0;
int mouse_hook_enabled = 0;
int cpu_emulation_running = 1;
}
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) {
- while (irq) {
last_irq = ((read_reg() & 0xe000) >> 13);
if (last_irq != last_last_irq) {
last_last_irq = last_irq;
M68K_SET_IRQ(last_irq);
}
- m68k_execute(5);
- }
- if (gayleirq && int2_enabled) {
- write16(0xdff09c, 0x8000 | (1 << 3) && last_irq != 2);
- last_last_irq = last_irq;
- last_irq = 2;
- M68K_SET_IRQ(2);
- }
+ } else if (!irq && last_last_irq != 0) {
M68K_SET_IRQ(0);
last_last_irq = 0;
- m68k_execute(5);
}
- /*else {
- if (last_irq != 0) {
- M68K_SET_IRQ(0);
- last_last_irq = last_irq;
- last_irq = 0;
- }
- }*/
+
if (do_reset) {
cpu_pulse_reset();
do_reset=0;
}
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;
static inline int32_t platform_write_check(uint8_t type, uint32_t addr, uint32_t val) {
switch (cfg->platform->id) {
+ case PLATFORM_MAC:
+ switch (addr) {
+ case 0xEFFFFE: // VIA1?
+ if (val & 0x10 && !ovl) {
+ ovl = 1;
+ printf("[MAC] OVL on.\n");
+ } else if (ovl) {
+ ovl = 0;
+ printf("[MAC] OVL off.\n");
+ }
+ break;
+ }
+ break;
case PLATFORM_AMIGA:
switch (addr) {
case CIAAPRA: