X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=emulator.c;h=eb8f8f570e420b87ff0c796281701c641744bb63;hb=HEAD;hp=d70ad21191ba605e20eae143798ced7a98e879a2;hpb=ae4e0ae9f15aa9f66d74518149687dde39f84c2d;p=pistorm diff --git a/emulator.c b/emulator.c index d70ad21..eb8f8f5 100644 --- a/emulator.c +++ b/emulator.c @@ -38,16 +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]; -address_translation_cache code_translation_cache = {0}; - int kb_hook_enabled = 0; int mouse_hook_enabled = 0; int cpu_emulation_running = 1; @@ -89,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 @@ -114,28 +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))) { old_irq = irq_delay; - //NOP if (!irq) { - M68K_END_TIMESLICE; - NOP irq = 1; + MEMORY_BARRIER(); + M68K_END_TIMESLICE; } - //usleep(0); } else { if (irq) { @@ -145,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) @@ -159,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 @@ -178,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 @@ -190,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) { @@ -207,42 +220,39 @@ 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(); - do_reset=0; + do_reset.value=0; usleep(1000000); // 1sec rtg_on=0; // while(amiga_reset==0); @@ -272,7 +282,7 @@ cpu_loop: } if (end_signal) - goto stop_cpu_emulation; + goto stop_cpu_emulation; goto cpu_loop; @@ -364,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') { @@ -440,8 +450,6 @@ void sigint_handler(int sig_num) { usleep(0); } - printf("IRQs triggered: %lld\n", trig_irq); - printf("IRQs serviced: %lld\n", serv_irq); exit(0); } @@ -587,7 +595,7 @@ switch_config: 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 = 0, cpu_tid, kbd_tid; @@ -647,16 +655,14 @@ switch_config: } 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_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) { @@ -673,6 +679,8 @@ 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); +unsigned int garbage = 0; + static inline void inline_write_16(unsigned int address, unsigned int data) { *(gpio + 0) = GPFSEL0_OUTPUT; *(gpio + 1) = GPFSEL1_OUTPUT; @@ -697,8 +705,8 @@ static inline void inline_write_16(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)) {} + NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP } static inline void inline_write_8(unsigned int address, unsigned int data) { @@ -730,8 +738,8 @@ 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)) {} + NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP } static inline void inline_write_32(unsigned int address, unsigned int value) { @@ -761,9 +769,8 @@ static inline unsigned int inline_read_16(unsigned int address) { *(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; @@ -792,9 +799,8 @@ static inline unsigned int inline_read_8(unsigned int address) { *(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; @@ -825,6 +831,22 @@ static inline uint32_t ps_read(uint8_t type, uint32_t addr) { return 0; } +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: @@ -977,9 +999,11 @@ static inline int32_t platform_write_check(uint8_t type, uint32_t addr, uint32_t 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; }