X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=emulator.c;h=eb8f8f570e420b87ff0c796281701c641744bb63;hb=HEAD;hp=3fd6ff880c0d0a35dad4471cab90e36c12ad625a;hpb=a0589749d4a725a4008eb17803a72d19ba970360;p=pistorm diff --git a/emulator.c b/emulator.c index 3fd6ff8..eb8f8f5 100644 --- a/emulator.c +++ b/emulator.c @@ -1,7 +1,10 @@ +// SPDX-License-Identifier: MIT + #include "m68k.h" #include "emulator.h" #include "platforms/platforms.h" #include "input/input.h" +#include "m68kcpu.h" #include "platforms/amiga/Gayle.h" #include "platforms/amiga/amiga-registers.h" @@ -11,6 +14,8 @@ #include "platforms/amiga/piscsi/piscsi-enums.h" #include "platforms/amiga/net/pi-net.h" #include "platforms/amiga/net/pi-net-enums.h" +#include "platforms/amiga/pistorm-dev/pistorm-dev.h" +#include "platforms/amiga/pistorm-dev/pistorm-dev-enums.h" #include "gpio/ps_protocol.h" #include @@ -33,15 +38,6 @@ #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]; - int kb_hook_enabled = 0; int mouse_hook_enabled = 0; int cpu_emulation_running = 1; @@ -56,12 +52,13 @@ extern uint8_t gayle_emulation_enabled; extern uint8_t gayle_a4k_int; extern volatile unsigned int *gpio; extern volatile uint16_t srdata; -extern uint8_t realtime_graphics_debug; +extern uint8_t realtime_graphics_debug, emulator_exiting; +extern uint8_t rtg_on; uint8_t realtime_disassembly, int2_enabled = 0; uint32_t do_disasm = 0, old_level; uint32_t last_irq = 8, last_last_irq = 8; -uint8_t end_signal = 0; +uint8_t end_signal = 0, load_new_config = 0; char disasm_buf[4096]; @@ -82,17 +79,18 @@ extern int m68ki_initial_cycles; extern int m68ki_remaining_cycles; #define M68K_SET_IRQ(i) old_level = CPU_INT_LEVEL; \ - CPU_INT_LEVEL = (i << 8); \ - if(old_level != 0x0700 && CPU_INT_LEVEL == 0x0700) \ - m68ki_cpu.nmi_pending = TRUE; -#define M68K_END_TIMESLICE m68ki_initial_cycles = GET_CYCLES(); \ - SET_CYCLES(0); + CPU_INT_LEVEL = (i << 8); \ + if(old_level != 0x0700 && CPU_INT_LEVEL == 0x0700) \ + m68ki_cpu.nmi_pending = TRUE; +#define M68K_END_TIMESLICE m68ki_initial_cycles = GET_CYCLES(); \ + SET_CYCLES(0); #else #define M68K_SET_IRQ m68k_set_irq #define M68K_END_TIMESLICE m68k_end_timeslice() #endif #define NOP asm("nop"); asm("nop"); asm("nop"); asm("nop"); +#define MEMORY_BARRIER() __sync_synchronize() #define DEBUG_EMULATOR #ifdef DEBUG_EMULATOR @@ -107,26 +105,35 @@ unsigned int loop_cycles = 300, irq_status = 0; struct emulator_config *cfg = NULL; char keyboard_file[256] = "/dev/input/event1"; -uint64_t trig_irq = 0, serv_irq = 0; -uint16_t irq_delay = 0; -unsigned int amiga_reset=0, amiga_reset_last=0; -unsigned int do_reset=0; +const uint16_t irq_delay = 0; + +struct DoReset +{ + char pad0[64]; + unsigned int value; + char pad1[64]; +}; + +volatile struct DoReset do_reset = {0}; void *ipl_task(void *args) { printf("IPL thread running\n"); uint16_t old_irq = 0; uint32_t value; + unsigned int amiga_reset=0, amiga_reset_last=0; while (1) { value = *(gpio + 13); + if (value & (1 << PIN_TXN_IN_PROGRESS)) + goto noppers; if (!(value & (1 << PIN_IPL_ZERO))) { - irq = 1; old_irq = irq_delay; - //NOP - M68K_END_TIMESLICE; - NOP - //usleep(0); + if (!irq) { + irq = 1; + MEMORY_BARRIER(); + M68K_END_TIMESLICE; + } } else { if (irq) { @@ -136,12 +143,11 @@ void *ipl_task(void *args) { else { irq = 0; } + MEMORY_BARRIER(); M68K_END_TIMESLICE; - NOP - //usleep(0); } } - if(do_reset==0) + if(do_reset.value==0) { amiga_reset=(value & (1 << PIN_RESET)); if(amiga_reset!=amiga_reset_last) @@ -150,7 +156,8 @@ void *ipl_task(void *args) { if(amiga_reset==0) { printf("Amiga Reset is down...\n"); - do_reset=1; + do_reset.value=1; + MEMORY_BARRIER(); M68K_END_TIMESLICE; } else @@ -169,8 +176,8 @@ void *ipl_task(void *args) { else gayleirq = 0; }*/ - //usleep(0); - //NOP NOP + +noppers: NOP NOP NOP NOP NOP NOP NOP NOP //NOP NOP NOP NOP NOP NOP NOP NOP //NOP NOP NOP NOP NOP NOP NOP NOP @@ -181,8 +188,23 @@ void *ipl_task(void *args) { return args; } +static inline unsigned int inline_read_status_reg() { + *(gpio + 7) = (REG_STATUS << PIN_A0); + *(gpio + 7) = 1 << PIN_RD; + *(gpio + 7) = 1 << PIN_RD; + *(gpio + 7) = 1 << PIN_RD; + *(gpio + 7) = 1 << PIN_RD; + + unsigned int value = *(gpio + 13); + + *(gpio + 10) = 0xffffec; + + return (value >> 8) & 0xffff; +} + void *cpu_task() { - m68k_pulse_reset(); + m68ki_cpu_core *state = &m68ki_cpu; + m68k_pulse_reset(state); cpu_loop: if (mouse_hook_enabled) { @@ -198,49 +220,45 @@ cpu_loop: 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) { + MEMORY_BARRIER(); + 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) { + MEMORY_BARRIER(); + while (irq) { + last_irq = ((inline_read_status_reg() & 0xe000) >> 13); + if (last_irq != 0 && 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); - } - M68K_SET_IRQ(0); + m68k_execute(state, 50); + MEMORY_BARRIER(); + } + + MEMORY_BARRIER(); + 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) { + + MEMORY_BARRIER(); + if (do_reset.value) { cpu_pulse_reset(); - m68k_pulse_reset(); - do_reset=0; + do_reset.value=0; usleep(1000000); // 1sec + rtg_on=0; // while(amiga_reset==0); // printf("CPU emulation reset.\n"); } - if (mouse_hook_enabled && (mouse_extra != 0x00)) { // mouse wheel events have occurred; unlike l/m/r buttons, these are queued as keypresses, so add to end of buffer switch (mouse_extra) { @@ -258,13 +276,19 @@ cpu_loop: mouse_extra = 0x00; } + if (load_new_config) { + printf("[CPU] Loading new config file.\n"); + goto stop_cpu_emulation; + } + if (end_signal) - goto stop_cpu_emulation; + goto stop_cpu_emulation; goto cpu_loop; stop_cpu_emulation: printf("[CPU] End of CPU thread\n"); + return (void *)NULL; } void *keyboard_task() { @@ -350,7 +374,7 @@ key_loop: } if (c == 'q') { printf("Quitting and exiting emulator.\n"); - end_signal = 1; + end_signal = 1; goto key_end; } if (c == 'd') { @@ -421,20 +445,21 @@ void sigint_handler(int sig_num) { cfg->platform->shutdown(cfg); } - printf("IRQs triggered: %lld\n", trig_irq); - printf("IRQs serviced: %lld\n", serv_irq); + while (!emulator_exiting) { + emulator_exiting = 1; + usleep(0); + } + exit(0); } 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]); - } + ps_setup_protocol(); + + //const struct sched_param priority = {99}; // Some command line switch stuffles for (g = 1; g < argc; g++) { @@ -451,7 +476,14 @@ int main(int argc, char *argv[]) { printf("%s switch found, but no config filename specified.\n", argv[g]); } else { g++; - cfg = load_config_file(argv[g]); + FILE *chk = fopen(argv[g], "rb"); + if (chk == NULL) { + printf("Config file %s does not exist, please check that you've specified the path correctly.\n", argv[g]); + } else { + fclose(chk); + load_new_config = 1; + set_pistorm_devcfg_filename(argv[g]); + } } } else if (strcmp(argv[g], "--keyboard-file") == 0 || strcmp(argv[g], "--kbfile") == 0) { @@ -464,6 +496,33 @@ int main(int argc, char *argv[]) { } } +switch_config: + srand(clock()); + + ps_reset_state_machine(); + ps_pulse_reset(); + usleep(1500); + + if (load_new_config != 0) { + uint8_t config_action = load_new_config - 1; + load_new_config = 0; + if (cfg) { + free_config_file(cfg); + free(cfg); + cfg = NULL; + } + + switch(config_action) { + case PICFG_LOAD: + case PICFG_RELOAD: + cfg = load_config_file(get_pistorm_devcfg_filename()); + break; + case PICFG_DEFAULT: + cfg = load_config_file("default.cfg"); + break; + } + } + if (!cfg) { printf("No config file specified. Trying to load default.cfg...\n"); cfg = load_config_file("default.cfg"); @@ -520,59 +579,35 @@ int main(int argc, char *argv[]) { printf("Failed to open keyboard event source.\n"); } - InitGayle(); + if (cfg->mouse_autoconnect) + mouse_hook_enabled = 1; - signal(SIGINT, sigint_handler); - /*setup_io(); + if (cfg->keyboard_autoconnect) + kb_hook_enabled = 1; - //goto skip_everything; - - // Enable 200MHz CLK output on GPIO4, adjust divider and pll source depending - // on pi model - printf("Enable 200MHz GPCLK0 on GPIO4\n"); - gpio_enable_200mhz(); - - // reset cpld statemachine first - - write_reg(0x01); - usleep(100); - usleep(1500); - write_reg(0x00); - usleep(100); - - // reset amiga and statemachine - skip_everything:; - - usleep(1500); + InitGayle(); - m68k_init(); - printf("Setting CPU type to %d.\n", cpu_type); - m68k_set_cpu_type(cpu_type); - cpu_pulse_reset(); + signal(SIGINT, sigint_handler); - if (maprom == 1) { - m68k_set_reg(M68K_REG_PC, 0xF80002); - } else { - m68k_set_reg(M68K_REG_PC, 0x0); - }*/ - ps_setup_protocol(); ps_reset_state_machine(); ps_pulse_reset(); - usleep(1500); + m68k_init(); printf("Setting CPU type to %d.\n", cpu_type); - m68k_set_cpu_type(cpu_type); + m68k_set_cpu_type(&m68ki_cpu, cpu_type); cpu_pulse_reset(); - pthread_t ipl_tid, cpu_tid, kbd_tid; + pthread_t ipl_tid = 0, cpu_tid, kbd_tid; int err; - err = pthread_create(&ipl_tid, NULL, &ipl_task, NULL); - if (err != 0) - printf("[ERROR] Cannot create IPL thread: [%s]", strerror(err)); - else { - pthread_setname_np(ipl_tid, "pistorm: ipl"); - printf("IPL thread created successfully\n"); + if (ipl_tid == 0) { + err = pthread_create(&ipl_tid, NULL, &ipl_task, NULL); + if (err != 0) + printf("[ERROR] Cannot create IPL thread: [%s]", strerror(err)); + else { + pthread_setname_np(ipl_tid, "pistorm: ipl"); + printf("IPL thread created successfully\n"); + } } // create keyboard task @@ -595,32 +630,39 @@ int main(int argc, char *argv[]) { // wait for cpu task to end before closing up and finishing pthread_join(cpu_tid, NULL); - printf("[MAIN] All threads appear to have concluded; ending process\n"); + + while (!emulator_exiting) { + emulator_exiting = 1; + usleep(0); + } + + if (load_new_config == 0) + printf("[MAIN] All threads appear to have concluded; ending process\n"); if (mouse_fd != -1) close(mouse_fd); if (mem_fd) close(mem_fd); + if (load_new_config != 0) + goto switch_config; + + if (cfg->platform->shutdown) { + cfg->platform->shutdown(cfg); + } + return 0; } void cpu_pulse_reset(void) { + m68ki_cpu_core *state = &m68ki_cpu; ps_pulse_reset(); - //write_reg(0x00); - // printf("Status Reg%x\n",read_reg()); - //usleep(100000); - //write_reg(0x02); - // printf("Status Reg%x\n",read_reg()); - if (cfg->platform->handle_reset) - cfg->platform->handle_reset(cfg); - //m68k_write_memory_16(INTENA, 0x7FFF); ovl = 1; - m68k_write_memory_8(0xbfe201, 0x0001); // AMIGA OVL - m68k_write_memory_8(0xbfe001, 0x0001); // AMIGA OVL high (ROM@0x0) + if (cfg->platform->handle_reset) + cfg->platform->handle_reset(cfg); - m68k_pulse_reset(); + m68k_pulse_reset(state); } int cpu_irq_ack(int level) { @@ -630,291 +672,449 @@ int cpu_irq_ack(int level) { static unsigned int target = 0; static uint8_t send_keypress = 0; +static uint32_t platform_res, rres; uint8_t cdtv_dmac_reg_idx_read(); void cdtv_dmac_reg_idx_write(uint8_t value); uint32_t cdtv_dmac_read(uint32_t address, uint8_t type); void cdtv_dmac_write(uint32_t address, uint32_t value, uint8_t type); -#define PLATFORM_CHECK_READ(a) \ - if (address >= cfg->custom_low && address < cfg->custom_high) { \ - unsigned int target = 0; \ - switch(cfg->platform->id) { \ - case PLATFORM_AMIGA: { \ - if (address >= PISCSI_OFFSET && address < PISCSI_UPPER) { \ - return handle_piscsi_read(address, a); \ - } \ - if (address >= PINET_OFFSET && address < PINET_UPPER) { \ - return handle_pinet_read(address, a); \ - } \ - if (address >= PIGFX_RTG_BASE && address < PIGFX_UPPER) { \ - return rtg_read((address & 0x0FFFFFFF), a); \ - } \ - if (custom_read_amiga(cfg, address, &target, a) != -1) { \ - return target; \ - } \ - break; \ - } \ - default: \ - break; \ - } \ - } \ - if (ovl || (address >= cfg->mapped_low && address < cfg->mapped_high)) { \ - if (handle_mapped_read(cfg, address, &target, a) != -1) \ - return target; \ - } +unsigned int garbage = 0; -unsigned int m68k_read_memory_8(unsigned int address) { - PLATFORM_CHECK_READ(OP_TYPE_BYTE); +static inline void inline_write_16(unsigned int address, unsigned int data) { + *(gpio + 0) = GPFSEL0_OUTPUT; + *(gpio + 1) = GPFSEL1_OUTPUT; + *(gpio + 2) = GPFSEL2_OUTPUT; - /*if (address >= 0xE90000 && address < 0xF00000) { - printf("BYTE read from DMAC @%.8X:", address); - uint32_t v = cdtv_dmac_read(address & 0xFFFF, OP_TYPE_BYTE); - printf("%.2X\n", v); - M68K_END_TIMESLICE; - cpu_emulation_running = 0; - return v; - }*/ + *(gpio + 7) = ((data & 0xffff) << 8) | (REG_DATA << PIN_A0); + *(gpio + 7) = 1 << PIN_WR; + *(gpio + 10) = 1 << PIN_WR; + *(gpio + 10) = 0xffffec; - /*if (m68k_get_reg(NULL, M68K_REG_PC) >= 0x080032F0 && m68k_get_reg(NULL, M68K_REG_PC) <= 0x080032F0 + 0x4000) { - stop_cpu_emulation(1); - }*/ + *(gpio + 7) = ((address & 0xffff) << 8) | (REG_ADDR_LO << PIN_A0); + *(gpio + 7) = 1 << PIN_WR; + *(gpio + 10) = 1 << PIN_WR; + *(gpio + 10) = 0xffffec; + *(gpio + 7) = ((0x0000 | (address >> 16)) << 8) | (REG_ADDR_HI << PIN_A0); + *(gpio + 7) = 1 << PIN_WR; + *(gpio + 10) = 1 << PIN_WR; + *(gpio + 10) = 0xffffec; - if (address & 0xFF000000) - return 0; + *(gpio + 0) = GPFSEL0_INPUT; + *(gpio + 1) = GPFSEL1_INPUT; + *(gpio + 2) = GPFSEL2_INPUT; - unsigned char result = (unsigned int)read8((uint32_t)address); + while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS)) {} + NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP +} - if (mouse_hook_enabled) { - if (address == CIAAPRA) { - if (mouse_buttons & 0x01) { - //mouse_buttons -= 1; - return (unsigned int)(result ^ 0x40); - } +static inline void inline_write_8(unsigned int address, unsigned int data) { + if ((address & 1) == 0) + data = data + (data << 8); // EVEN, A0=0,UDS + else + data = data & 0xff; // ODD , A0=1,LDS - return (unsigned int)result; - } + *(gpio + 0) = GPFSEL0_OUTPUT; + *(gpio + 1) = GPFSEL1_OUTPUT; + *(gpio + 2) = GPFSEL2_OUTPUT; + + *(gpio + 7) = ((data & 0xffff) << 8) | (REG_DATA << PIN_A0); + *(gpio + 7) = 1 << PIN_WR; + *(gpio + 10) = 1 << PIN_WR; + *(gpio + 10) = 0xffffec; + + *(gpio + 7) = ((address & 0xffff) << 8) | (REG_ADDR_LO << PIN_A0); + *(gpio + 7) = 1 << PIN_WR; + *(gpio + 10) = 1 << PIN_WR; + *(gpio + 10) = 0xffffec; + + *(gpio + 7) = ((0x0100 | (address >> 16)) << 8) | (REG_ADDR_HI << PIN_A0); + *(gpio + 7) = 1 << PIN_WR; + *(gpio + 10) = 1 << PIN_WR; + *(gpio + 10) = 0xffffec; + + *(gpio + 0) = GPFSEL0_INPUT; + *(gpio + 1) = GPFSEL1_INPUT; + *(gpio + 2) = GPFSEL2_INPUT; + + while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS)) {} + NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP +} + +static inline void inline_write_32(unsigned int address, unsigned int value) { + inline_write_16(address, value >> 16); + inline_write_16(address + 2, value); +} + +static inline unsigned int inline_read_16(unsigned int address) { + *(gpio + 0) = GPFSEL0_OUTPUT; + *(gpio + 1) = GPFSEL1_OUTPUT; + *(gpio + 2) = GPFSEL2_OUTPUT; + + *(gpio + 7) = ((address & 0xffff) << 8) | (REG_ADDR_LO << PIN_A0); + *(gpio + 7) = 1 << PIN_WR; + *(gpio + 10) = 1 << PIN_WR; + *(gpio + 10) = 0xffffec; + + *(gpio + 7) = ((0x0200 | (address >> 16)) << 8) | (REG_ADDR_HI << PIN_A0); + *(gpio + 7) = 1 << PIN_WR; + *(gpio + 10) = 1 << PIN_WR; + *(gpio + 10) = 0xffffec; + + *(gpio + 0) = GPFSEL0_INPUT; + *(gpio + 1) = GPFSEL1_INPUT; + *(gpio + 2) = GPFSEL2_INPUT; + + *(gpio + 7) = (REG_DATA << PIN_A0); + *(gpio + 7) = 1 << PIN_RD; + + while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS)) {} + unsigned int value = *(gpio + 13); + + *(gpio + 10) = 0xffffec; + + return (value >> 8) & 0xffff; +} + +static inline unsigned int inline_read_8(unsigned int address) { + *(gpio + 0) = GPFSEL0_OUTPUT; + *(gpio + 1) = GPFSEL1_OUTPUT; + *(gpio + 2) = GPFSEL2_OUTPUT; + + *(gpio + 7) = ((address & 0xffff) << 8) | (REG_ADDR_LO << PIN_A0); + *(gpio + 7) = 1 << PIN_WR; + *(gpio + 10) = 1 << PIN_WR; + *(gpio + 10) = 0xffffec; + + *(gpio + 7) = ((0x0300 | (address >> 16)) << 8) | (REG_ADDR_HI << PIN_A0); + *(gpio + 7) = 1 << PIN_WR; + *(gpio + 10) = 1 << PIN_WR; + *(gpio + 10) = 0xffffec; + + *(gpio + 0) = GPFSEL0_INPUT; + *(gpio + 1) = GPFSEL1_INPUT; + *(gpio + 2) = GPFSEL2_INPUT; + + *(gpio + 7) = (REG_DATA << PIN_A0); + *(gpio + 7) = 1 << PIN_RD; + + while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS)) {} + unsigned int value = *(gpio + 13); + + *(gpio + 10) = 0xffffec; + + value = (value >> 8) & 0xffff; + + if ((address & 1) == 0) + return (value >> 8) & 0xff; // EVEN, A0=0,UDS + else + return value & 0xff; // ODD , A0=1,LDS +} + +static inline unsigned int inline_read_32(unsigned int address) { + unsigned int a = inline_read_16(address); + unsigned int b = inline_read_16(address + 2); + return (a << 16) | b; +} + +static inline uint32_t ps_read(uint8_t type, uint32_t addr) { + switch (type) { + case OP_TYPE_BYTE: + return inline_read_8(addr); + case OP_TYPE_WORD: + return inline_read_16(addr); + case OP_TYPE_LONGWORD: + return inline_read_32(addr); } + // This shouldn't actually happen. + return 0; +} - if (kb_hook_enabled) { - if (address == CIAAICR) { - if (get_num_kb_queued() && (!send_keypress || send_keypress == 1)) { - result |= 0x08; - if (!send_keypress) - send_keypress = 1; +static inline void ps_write(uint8_t type, uint32_t addr, uint32_t val) { + switch (type) { + case OP_TYPE_BYTE: + inline_write_8(addr, val); + return; + case OP_TYPE_WORD: + inline_write_16(addr, val); + return; + case OP_TYPE_LONGWORD: + inline_write_32(addr, val); + return; + } + // This shouldn't actually happen. + return; +} + +static inline int32_t platform_read_check(uint8_t type, uint32_t addr, uint32_t *res) { + switch (cfg->platform->id) { + case PLATFORM_AMIGA: + switch (addr) { + case CIAAPRA: + if (mouse_hook_enabled && (mouse_buttons & 0x01)) { + rres = (uint32_t)ps_read(type, addr); + *res = (rres ^ 0x40); + return 1; + } + return 0; + break; + case CIAAICR: + if (kb_hook_enabled) { + rres = (uint32_t)ps_read(type, addr); + if (get_num_kb_queued() && (!send_keypress || send_keypress == 1)) { + rres |= 0x08; + if (!send_keypress) + send_keypress = 1; + } + if (send_keypress == 2) { + send_keypress = 0; + } + *res = rres; + return 1; + } + return 0; + break; + case CIAADAT: + if (kb_hook_enabled) { + rres = (uint32_t)ps_read(type, addr); + uint8_t c = 0, t = 0; + pop_queued_key(&c, &t); + t ^= 0x01; + rres = ((c << 1) | t) ^ 0xFF; + send_keypress = 2; + *res = rres; + return 1; + } + return 0; + break; + case JOY0DAT: + if (mouse_hook_enabled) { + unsigned short result = (mouse_dy << 8) | (mouse_dx); + *res = (unsigned int)result; + return 1; + } + return 0; + break; + case POTGOR: + if (mouse_hook_enabled) { + unsigned short result = (unsigned short)ps_read(type, addr); + // bit 1 rmb, bit 2 mmb + if (mouse_buttons & 0x06) { + *res = (unsigned int)((result ^ ((mouse_buttons & 0x02) << 9)) // move rmb to bit 10 + & (result ^ ((mouse_buttons & 0x04) << 6))); // move mmb to bit 8 + return 1; + } + *res = (unsigned int)(result & 0xfffd); + return 1; + } + return 0; + break; + default: + break; } - if (send_keypress == 2) { - //result |= 0x02; - send_keypress = 0; + + if (addr >= cfg->custom_low && addr < cfg->custom_high) { + if (addr >= PISCSI_OFFSET && addr < PISCSI_UPPER) { + *res = handle_piscsi_read(addr, type); + return 1; + } + if (addr >= PINET_OFFSET && addr < PINET_UPPER) { + *res = handle_pinet_read(addr, type); + return 1; + } + if (addr >= PIGFX_RTG_BASE && addr < PIGFX_UPPER) { + *res = rtg_read((addr & 0x0FFFFFFF), type); + return 1; + } + if (custom_read_amiga(cfg, addr, &target, type) != -1) { + *res = target; + return 1; + } } - return result; - } - if (address == CIAADAT) { - //if (send_keypress) { - uint8_t c = 0, t = 0; - pop_queued_key(&c, &t); - t ^= 0x01; - result = ((c << 1) | t) ^ 0xFF; - send_keypress = 2; - //M68K_SET_IRQ(0); - //} - return result; + break; + default: + break; + } + + if (ovl || (addr >= cfg->mapped_low && addr < cfg->mapped_high)) { + if (handle_mapped_read(cfg, addr, &target, type) != -1) { + *res = target; + return 1; } } - return result; + return 0; } -unsigned int m68k_read_memory_16(unsigned int address) { - PLATFORM_CHECK_READ(OP_TYPE_WORD); +unsigned int m68k_read_memory_8(unsigned int address) { + if (platform_read_check(OP_TYPE_BYTE, address, &platform_res)) { + return platform_res; + } - /*if (m68k_get_reg(NULL, M68K_REG_PC) >= 0x080032F0 && m68k_get_reg(NULL, M68K_REG_PC) <= 0x080032F0 + 0x4000) { - stop_cpu_emulation(1); - }*/ + if (address & 0xFF000000) + return 0; - /*if (address >= 0xE90000 && address < 0xF00000) { - printf("WORD read from DMAC @%.8X:", address); - uint32_t v = cdtv_dmac_read(address & 0xFFFF, OP_TYPE_WORD); - printf("%.2X\n", v); - M68K_END_TIMESLICE; - cpu_emulation_running = 0; - return v; - }*/ + return (unsigned int)inline_read_8((uint32_t)address); +} - if (mouse_hook_enabled) { - if (address == JOY0DAT) { - // Forward mouse valueses to Amyga. - unsigned short result = (mouse_dy << 8) | (mouse_dx); - return (unsigned int)result; - } - /*if (address == CIAAPRA) { - unsigned short result = (unsigned int)read16((uint32_t)address); - if (mouse_buttons & 0x01) { - return (unsigned int)(result | 0x40); - } - else - return (unsigned int)result; - }*/ - if (address == POTGOR) { - unsigned short result = (unsigned int)read16((uint32_t)address); - // bit 1 rmb, bit 2 mmb - if (mouse_buttons & 0x06) { - return (unsigned int)((result ^ ((mouse_buttons & 0x02) << 9)) // move rmb to bit 10 - & (result ^ ((mouse_buttons & 0x04) << 6))); // move mmb to bit 8 - } - return (unsigned int)(result & 0xfffd); - } +unsigned int m68k_read_memory_16(unsigned int address) { + if (platform_read_check(OP_TYPE_WORD, address, &platform_res)) { + return platform_res; } if (address & 0xFF000000) return 0; if (address & 0x01) { - return ((read8(address) << 8) | read8(address + 1)); + return ((inline_read_8(address) << 8) | inline_read_8(address + 1)); } - return (unsigned int)read16((uint32_t)address); + return (unsigned int)inline_read_16((uint32_t)address); } unsigned int m68k_read_memory_32(unsigned int address) { - PLATFORM_CHECK_READ(OP_TYPE_LONGWORD); - - /*if (m68k_get_reg(NULL, M68K_REG_PC) >= 0x080032F0 && m68k_get_reg(NULL, M68K_REG_PC) <= 0x080032F0 + 0x4000) { - stop_cpu_emulation(1); - }*/ - - /*if (address >= 0xE90000 && address < 0xF00000) { - printf("LONGWORD read from DMAC @%.8X:", address); - uint32_t v = cdtv_dmac_read(address & 0xFFFF, OP_TYPE_LONGWORD); - printf("%.2X\n", v); - M68K_END_TIMESLICE; - cpu_emulation_running = 0; - return v; - }*/ + if (platform_read_check(OP_TYPE_LONGWORD, address, &platform_res)) { + return platform_res; + } if (address & 0xFF000000) return 0; if (address & 0x01) { - uint32_t c = read8(address); - c |= (be16toh(read16(address+1)) << 8); - c |= (read8(address + 3) << 24); + uint32_t c = inline_read_8(address); + c |= (be16toh(inline_read_16(address+1)) << 8); + c |= (inline_read_8(address + 3) << 24); return htobe32(c); } - uint16_t a = read16(address); - uint16_t b = read16(address + 2); + uint16_t a = inline_read_16(address); + uint16_t b = inline_read_16(address + 2); return (a << 16) | b; } -#define PLATFORM_CHECK_WRITE(a) \ - if (address >= cfg->custom_low && address < cfg->custom_high) { \ - switch(cfg->platform->id) { \ - case PLATFORM_AMIGA: { \ - if (address >= PISCSI_OFFSET && address < PISCSI_UPPER) { \ - handle_piscsi_write(address, value, a); \ - } \ - if (address >= PINET_OFFSET && address < PINET_UPPER) { \ - handle_pinet_write(address, value, a); \ - } \ - if (address >= PIGFX_RTG_BASE && address < PIGFX_UPPER) { \ - rtg_write((address & 0x0FFFFFFF), value, a); \ - return; \ - } \ - if (custom_write_amiga(cfg, address, value, a) != -1) { \ - return; \ - } \ - break; \ - } \ - default: \ - break; \ - } \ - } \ - if (address >= cfg->mapped_low && address < cfg->mapped_high) { \ - if (handle_mapped_write(cfg, address, value, a) != -1) \ - return; \ - } - -void m68k_write_memory_8(unsigned int address, unsigned int value) { - PLATFORM_CHECK_WRITE(OP_TYPE_BYTE); +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"); + handle_ovl_mappings_mac68k(cfg); + } else if (ovl) { + ovl = 0; + printf("[MAC] OVL off.\n"); + handle_ovl_mappings_mac68k(cfg); + } + break; + } + break; + case PLATFORM_AMIGA: + switch (addr) { + case CIAAPRA: + if (ovl != (val & (1 << 0))) { + ovl = (val & (1 << 0)); + printf("OVL:%x\n", ovl); + } + return 0; + break; + case SERDAT: { + char *serdat = (char *)&val; + // SERDAT word. see amiga dev docs appendix a; upper byte is control codes, and bit 0 is always 1. + // ignore this upper byte as it's not viewable data, only display lower byte. + printf("%c", serdat[0]); + return 0; + break; + } + case INTENA: + // This code is kind of strange and should probably be reworked/revoked. + if (!(val & 0x8000)) { + if (val & 0x04) { + int2_enabled = 0; + } + } + else if (val & 0x04) { + int2_enabled = 1; + } + return 0; + break; + default: + break; + } - /*if (address >= 0xE90000 && address < 0xF00000) { - printf("BYTE write to DMAC @%.8X: %.2X\n", address, value); - cdtv_dmac_write(address & 0xFFFF, value, OP_TYPE_BYTE); - M68K_END_TIMESLICE; - cpu_emulation_running = 0; - return; - }*/ + if (addr >= cfg->custom_low && addr < cfg->custom_high) { + if (addr >= PISCSI_OFFSET && addr < PISCSI_UPPER) { + handle_piscsi_write(addr, val, type); + return 1; + } + if (addr >= PINET_OFFSET && addr < PINET_UPPER) { + handle_pinet_write(addr, val, type); + return 1; + } + if (addr >= PIGFX_RTG_BASE && addr < PIGFX_UPPER) { + rtg_write((addr & 0x0FFFFFFF), val, type); + return 1; + } + if (custom_write_amiga(cfg, addr, val, type) != -1) { + return 1; + } + } + break; + default: + break; + } - if (address == 0xbfe001) { - if (ovl != (value & (1 << 0))) { - ovl = (value & (1 << 0)); - printf("OVL:%x\n", ovl); + if (ovl || (addr >= cfg->mapped_low && addr < cfg->mapped_high)) { + if (handle_mapped_write(cfg, addr, val, type) != -1) { + return 1; } } + return 0; +} + +void m68k_write_memory_8(unsigned int address, unsigned int value) { + if (platform_write_check(OP_TYPE_BYTE, address, value)) + return; + if (address & 0xFF000000) return; - write8((uint32_t)address, value); + inline_write_8((uint32_t)address, value); return; } void m68k_write_memory_16(unsigned int address, unsigned int value) { - PLATFORM_CHECK_WRITE(OP_TYPE_WORD); - - /*if (address >= 0xE90000 && address < 0xF00000) { - printf("WORD write to DMAC @%.8X: %.4X\n", address, value); - cdtv_dmac_write(address & 0xFFFF, value, OP_TYPE_WORD); - M68K_END_TIMESLICE; - cpu_emulation_running = 0; + if (platform_write_check(OP_TYPE_WORD, address, value)) return; - }*/ - - if (address == 0xDFF030) { - char *serdat = (char *)&value; - // SERDAT word. see amiga dev docs appendix a; upper byte is control codes, and bit 0 is always 1. - // ignore this upper byte as it's not viewable data, only display lower byte. - printf("%c", serdat[0]); - } - if (address == 0xDFF09A) { - if (!(value & 0x8000)) { - if (value & 0x04) { - int2_enabled = 0; - } - } - else if (value & 0x04) { - int2_enabled = 1; - } - } if (address & 0xFF000000) return; - if (address & 0x01) - printf("Unaligned WORD write!\n"); + if (address & 0x01) { + inline_write_8(value & 0xFF, address); + inline_write_8((value >> 8) & 0xFF, address + 1); + return; + } - write16((uint32_t)address, value); + inline_write_16((uint32_t)address, value); return; } void m68k_write_memory_32(unsigned int address, unsigned int value) { - PLATFORM_CHECK_WRITE(OP_TYPE_LONGWORD); - - /*if (address >= 0xE90000 && address < 0xF00000) { - printf("LONGWORD write to DMAC @%.8X: %.8X\n", address, value); - cdtv_dmac_write(address & 0xFFFF, value, OP_TYPE_LONGWORD); - M68K_END_TIMESLICE; - cpu_emulation_running = 0; + if (platform_write_check(OP_TYPE_LONGWORD, address, value)) return; - }*/ if (address & 0xFF000000) return; - if (address & 0x01) - printf("Unaligned LONGWORD write!\n"); + if (address & 0x01) { + inline_write_8(value & 0xFF, address); + inline_write_16(htobe16(((value >> 8) & 0xFFFF)), address + 1); + inline_write_8((value >> 24), address + 3); + return; + } - write16(address, value >> 16); - write16(address + 2, value); + inline_write_16(address, value >> 16); + inline_write_16(address + 2, value); return; }