/* ======================================================================== */
/* ================================ INCLUDES ============================== */
/* ======================================================================== */
-
-extern void m68040_fpu_op0(void);
-extern void m68040_fpu_op1(void);
-extern void m68851_mmu_ops();
+struct m68ki_cpu_core;
+extern void m68040_fpu_op0(struct m68ki_cpu_core *state);
+extern void m68040_fpu_op1(struct m68ki_cpu_core *state);
+extern void m68851_mmu_ops(struct m68ki_cpu_core *state);
extern unsigned char m68ki_cycles[][0x10000];
-extern void (*m68ki_instruction_jump_table[0x10000])(void); /* opcode handler jump table */
extern void m68ki_build_opcode_table(void);
#include "m68kops.h"
/* Execute some instructions until we use up num_cycles clock cycles */
/* ASG: removed per-instruction interrupt checks */
-int m68k_execute(int num_cycles)
+int m68k_execute(m68ki_cpu_core *state, int num_cycles)
{
/* eat up any reset cycles */
if (RESET_CYCLES) {
m68ki_initial_cycles = num_cycles;
/* See if interrupts came in */
- m68ki_check_interrupts();
+ m68ki_check_interrupts(state);
/* Make sure we're not stopped */
if(!CPU_STOPPED)
/* Main loop. Keep going until we run out of clock cycles */
do
{
- /* Set tracing accodring to T1. (T0 is done inside instruction) */
+ /* Set tracing according to T1. (T0 is done inside instruction) */
m68ki_trace_t1(); /* auto-disable (see m68kcpu.h) */
/* Set the address space for reads */
#endif
/* Read an instruction and call its handler */
- REG_IR = m68ki_read_imm_16();
- m68ki_instruction_jump_table[REG_IR]();
+ REG_IR = m68ki_read_imm_16(state);
+ m68ki_instruction_jump_table[REG_IR](state);
USE_CYCLES(CYC_INSTRUCTION[REG_IR]);
/* Trace m68k_exception, if necessary */
}
/* Pulse the RESET line on the CPU */
-void m68k_pulse_reset(void)
+void m68k_pulse_reset(m68ki_cpu_core *state)
{
/* Disable the PMMU/HMMU on reset, if any */
m68ki_cpu.pmmu_enabled = 0;
/* Read the initial stack pointer and program counter */
m68ki_jump(0);
+ REG_SP = m68ki_read_imm_32(state);
+ REG_PC = m68ki_read_imm_32(state);
+ m68ki_jump(REG_PC);
CPU_RUN_MODE = RUN_MODE_NORMAL;
RESET_CYCLES = CYC_EXCEPTION[EXCEPTION_RESET];
/* flush the MMU's cache */
- pmmu_atc_flush();
+ pmmu_atc_flush(state);
if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
{
// clear instruction cache
- m68ki_ic_clear();
+ m68ki_ic_clear(state);
}
}
/* Read data immediately following the PC */
inline unsigned int m68k_read_immediate_16(unsigned int address) {
#if M68K_EMULATE_PREFETCH == OPT_ON
- for (int i = 0; i < read_ranges; i++) {
- if(address >= read_addr[i] && address < read_upper[i]) {
- return be16toh(((unsigned short *)(read_data[i] + (address - read_addr[i])))[0]);
+ for (int i = 0; i < m68ki_cpu.read_ranges; i++) {
+ if(address >= m68ki_cpu.read_addr[i] && address < m68ki_cpu.read_upper[i]) {
+ return be16toh(((unsigned short *)(m68ki_cpu.read_data[i] + (address - m68ki_cpu.read_addr[i])))[0]);
}
}
#endif
-
+
return m68k_read_memory_16(address);
}
inline unsigned int m68k_read_immediate_32(unsigned int address) {
#if M68K_EMULATE_PREFETCH == OPT_ON
- for (int i = 0; i < read_ranges; i++) {
- if(address >= read_addr[i] && address < read_upper[i]) {
- return be32toh(((unsigned int *)(read_data[i] + (address - read_addr[i])))[0]);
+ for (int i = 0; i < m68ki_cpu.read_ranges; i++) {
+ if(address >= m68ki_cpu.read_addr[i] && address < m68ki_cpu.read_upper[i]) {
+ return be32toh(((unsigned int *)(m68ki_cpu.read_data[i] + (address - m68ki_cpu.read_addr[i])))[0]);
}
}
#endif
/* Read data relative to the PC */
inline unsigned int m68k_read_pcrelative_8(unsigned int address) {
- for (int i = 0; i < read_ranges; i++) {
- if(address >= read_addr[i] && address < read_upper[i]) {
- return read_data[i][address - read_addr[i]];
+ for (int i = 0; i < m68ki_cpu.read_ranges; i++) {
+ if(address >= m68ki_cpu.read_addr[i] && address < m68ki_cpu.read_upper[i]) {
+ return m68ki_cpu.read_data[i][address - m68ki_cpu.read_addr[i]];
}
}
-
+
return m68k_read_memory_8(address);
}
inline unsigned int m68k_read_pcrelative_16(unsigned int address) {
- for (int i = 0; i < read_ranges; i++) {
- if(address >= read_addr[i] && address < read_upper[i]) {
- return be16toh(((unsigned short *)(read_data[i] + (address - read_addr[i])))[0]);
+ for (int i = 0; i < m68ki_cpu.read_ranges; i++) {
+ if(address >= m68ki_cpu.read_addr[i] && address < m68ki_cpu.read_upper[i]) {
+ return be16toh(((unsigned short *)(m68ki_cpu.read_data[i] + (address - m68ki_cpu.read_addr[i])))[0]);
}
}
return m68k_read_memory_16(address);
}
inline unsigned int m68k_read_pcrelative_32(unsigned int address) {
- for (int i = 0; i < read_ranges; i++) {
- if(address >= read_addr[i] && address < read_upper[i]) {
- return be32toh(((unsigned int *)(read_data[i] + (address - read_addr[i])))[0]);
+ for (int i = 0; i < m68ki_cpu.read_ranges; i++) {
+ if(address >= m68ki_cpu.read_addr[i] && address < m68ki_cpu.read_upper[i]) {
+ return be32toh(((unsigned int *)(m68ki_cpu.read_data[i] + (address - m68ki_cpu.read_addr[i])))[0]);
}
}
}
#endif
+
+uint m68ki_read_imm6_addr_slowpath(uint32_t pc, address_translation_cache *cache)
+{
+ uint32_t address = ADDRESS_68K(pc);
+ uint32_t pc_address_diff = pc - address;
+ for (int i = 0; i < m68ki_cpu.read_ranges; i++) {
+ if(address >= m68ki_cpu.read_addr[i] && address < m68ki_cpu.read_upper[i]) {
+ cache->lower = m68ki_cpu.read_addr[i] + pc_address_diff;
+ cache->upper = m68ki_cpu.read_upper[i] + pc_address_diff;
+ cache->offset = m68ki_cpu.read_data[i] - cache->lower;
+ REG_PC += 2;
+ return be16toh(((unsigned short *)(m68ki_cpu.read_data[i] + (address - m68ki_cpu.read_addr[i])))[0]);
+ }
+ }
+
+ m68ki_set_fc(FLAG_S | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
+ m68ki_cpu.mmu_tmp_fc = FLAG_S | FUNCTION_CODE_USER_PROGRAM;
+ m68ki_cpu.mmu_tmp_rw = 1;
+ m68ki_cpu.mmu_tmp_sz = M68K_SZ_WORD;
+ m68ki_check_address_error(REG_PC, MODE_READ, FLAG_S | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
+
+#if M68K_EMULATE_PREFETCH
+{
+ uint result;
+ if(REG_PC != CPU_PREF_ADDR)
+ {
+ CPU_PREF_DATA = m68ki_ic_readimm16(REG_PC);
+ CPU_PREF_ADDR = m68ki_cpu.mmu_tmp_buserror_occurred ? ((uint32)~0) : REG_PC;
+ }
+ result = MASK_OUT_ABOVE_16(CPU_PREF_DATA);
+ REG_PC += 2;
+ if (!m68ki_cpu.mmu_tmp_buserror_occurred) {
+ // prefetch only if no bus error occurred in opcode fetch
+ CPU_PREF_DATA = m68ki_ic_readimm16(REG_PC);
+ CPU_PREF_ADDR = m68ki_cpu.mmu_tmp_buserror_occurred ? ((uint32)~0) : REG_PC;
+ // ignore bus error on prefetch
+ m68ki_cpu.mmu_tmp_buserror_occurred = 0;
+ }
+ return result;
+}
+#else
+ REG_PC += 2;
+
+ return m68k_read_immediate_16(address);
+#endif /* M68K_EMULATE_PREFETCH */
+}
+
+
+
void m68k_add_ram_range(uint32_t addr, uint32_t upper, unsigned char *ptr)
{
+ m68ki_cpu.code_translation_cache.lower = 0;
+ m68ki_cpu.code_translation_cache.upper = 0;
if ((addr == 0 && upper == 0) || upper < addr)
return;
- for (int i = 0; i < write_ranges; i++) {
- if (write_addr[i] == addr) {
+ for (int i = 0; i < m68ki_cpu.write_ranges; i++) {
+ if (m68ki_cpu.write_addr[i] == addr) {
uint8_t changed = 0;
- if (write_upper[i] != upper) {
- write_upper[i] = upper;
+ if (m68ki_cpu.write_upper[i] != upper) {
+ m68ki_cpu.write_upper[i] = upper;
changed = 1;
}
- if (write_data[i] != ptr) {
- write_data[i] = ptr;
+ if (m68ki_cpu.write_data[i] != ptr) {
+ m68ki_cpu.write_data[i] = ptr;
changed = 1;
}
if (changed) {
- printf("[MUSASHI] Adjusted mapped write range %d: %.8X-%.8X (%p)\n", write_ranges, addr, upper, ptr);
+ printf("[MUSASHI] Adjusted mapped write range %d: %.8X-%.8X (%p)\n", m68ki_cpu.write_ranges, addr, upper, ptr);
}
return;
}
}
- if (read_ranges + 1 < 8) {
- read_addr[read_ranges] = addr;
- read_upper[read_ranges] = upper;
- read_data[read_ranges] = ptr;
- read_ranges++;
- printf("[MUSASHI] Mapped read range %d: %.8X-%.8X (%p)\n", read_ranges, addr, upper, ptr);
+ if (m68ki_cpu.read_ranges + 1 < 8) {
+ m68ki_cpu.read_addr[m68ki_cpu.read_ranges] = addr;
+ m68ki_cpu.read_upper[m68ki_cpu.read_ranges] = upper;
+ m68ki_cpu.read_data[m68ki_cpu.read_ranges] = ptr;
+ m68ki_cpu.read_ranges++;
+ printf("[MUSASHI] Mapped read range %d: %.8X-%.8X (%p)\n", m68ki_cpu.read_ranges, addr, upper, ptr);
}
else {
printf("Can't Musashi map more than eight RAM/ROM read ranges.\n");
}
- if (write_ranges + 1 < 8) {
- write_addr[write_ranges] = addr;
- write_upper[write_ranges] = upper;
- write_data[write_ranges] = ptr;
- write_ranges++;
- printf("[MUSASHI] Mapped write range %d: %.8X-%.8X (%p)\n", write_ranges, addr, upper, ptr);
+ if (m68ki_cpu.write_ranges + 1 < 8) {
+ m68ki_cpu.write_addr[m68ki_cpu.write_ranges] = addr;
+ m68ki_cpu.write_upper[m68ki_cpu.write_ranges] = upper;
+ m68ki_cpu.write_data[m68ki_cpu.write_ranges] = ptr;
+ m68ki_cpu.write_ranges++;
+ printf("[MUSASHI] Mapped write range %d: %.8X-%.8X (%p)\n", m68ki_cpu.write_ranges, addr, upper, ptr);
}
else {
printf("Can't Musashi map more than eight RAM write ranges.\n");
void m68k_add_rom_range(uint32_t addr, uint32_t upper, unsigned char *ptr)
{
+ m68ki_cpu.code_translation_cache.lower = 0;
+ m68ki_cpu.code_translation_cache.upper = 0;
if ((addr == 0 && upper == 0) || upper < addr)
return;
- for (int i = 0; i < read_ranges; i++) {
- if (read_addr[i] == addr) {
+ for (int i = 0; i < m68ki_cpu.read_ranges; i++) {
+ if (m68ki_cpu.read_addr[i] == addr) {
uint8_t changed = 0;
- if (read_upper[i] != upper) {
- read_upper[i] = upper;
+ if (m68ki_cpu.read_upper[i] != upper) {
+ m68ki_cpu.read_upper[i] = upper;
changed = 1;
}
- if (read_data[i] != ptr) {
- read_data[i] = ptr;
+ if (m68ki_cpu.read_data[i] != ptr) {
+ m68ki_cpu.read_data[i] = ptr;
changed = 1;
}
if (changed) {
- printf("[MUSASHI] Adjusted mapped read range %d: %.8X-%.8X (%p)\n", read_ranges, addr, upper, ptr);
+ printf("[MUSASHI] Adjusted mapped read range %d: %.8X-%.8X (%p)\n", m68ki_cpu.read_ranges, addr, upper, ptr);
}
return;
}
}
- if (read_ranges + 1 < 8) {
- read_addr[read_ranges] = addr;
- read_upper[read_ranges] = upper;
- read_data[read_ranges] = ptr;
- read_ranges++;
- printf("[MUSASHI] Mapped read range %d: %.8X-%.8X (%p)\n", read_ranges, addr, upper, ptr);
+ if (m68ki_cpu.read_ranges + 1 < 8) {
+ m68ki_cpu.read_addr[m68ki_cpu.read_ranges] = addr;
+ m68ki_cpu.read_upper[m68ki_cpu.read_ranges] = upper;
+ m68ki_cpu.read_data[m68ki_cpu.read_ranges] = ptr;
+ m68ki_cpu.read_ranges++;
+ printf("[MUSASHI] Mapped read range %d: %.8X-%.8X (%p)\n", m68ki_cpu.read_ranges, addr, upper, ptr);
}
else {
printf("Can't Musashi map more than eight RAM/ROM read ranges.\n");
}
}
+void m68k_clear_ranges()
+{
+ printf("[MUSASHI] Clearing all reads/write memory ranges.\n");
+ for (int i = 0; i < 8; i++) {
+ m68ki_cpu.read_upper[i] = 0;
+ m68ki_cpu.read_addr[i] = 0;
+ m68ki_cpu.read_data[i] = NULL;
+ m68ki_cpu.write_upper[i] = 0;
+ m68ki_cpu.write_addr[i] = 0;
+ m68ki_cpu.write_data[i] = NULL;
+ }
+ m68ki_cpu.write_ranges = 0;
+ m68ki_cpu.read_ranges = 0;
+ m68ki_cpu.code_translation_cache.lower = 0;
+ m68ki_cpu.code_translation_cache.upper = 0;
+}
+
/* ======================================================================== */
/* ============================== MAME STUFF ============================== */
/* ======================================================================== */
projects / pistorm / blobdiff