introducing CPU state parameter 3

[pistorm] / m68kcpu.c

diff --git a/m68kcpu.c b/m68kcpu.c
index b91be0a0b37ebf196d1c2726584f45b5206b9d5c..49c65a0c5ed0dd0e48f05c0755741cff700bf204 100644 (file)
--- a/m68kcpu.c
+++ b/m68kcpu.c
@@ -37,12 +37,11 @@
 /* ======================================================================== */
 /* ================================ 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"
@@ -959,7 +958,7 @@ uint m68k_get_address_mask() {
 
 /* 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) {
@@ -975,7 +974,7 @@ int m68k_execute(int num_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)
@@ -990,7 +989,7 @@ int m68k_execute(int num_cycles)
                /* 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 */
@@ -1011,8 +1010,8 @@ int m68k_execute(int num_cycles)
 #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 */
@@ -1116,13 +1115,13 @@ void m68k_init(void)
 }
 
 /* Trigger a Bus Error exception */
-void m68k_pulse_bus_error(void)
+void m68k_pulse_bus_error(m68ki_cpu_core *state)
 {
-       m68ki_exception_bus_error();
+       m68ki_exception_bus_error(state);
 }
 
 /* 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;
@@ -1159,8 +1158,8 @@ void m68k_pulse_reset(void)
 
        /* Read the initial stack pointer and program counter */
        m68ki_jump(0);
-       REG_SP = m68ki_read_imm_32();
-       REG_PC = m68ki_read_imm_32();
+       REG_SP = m68ki_read_imm_32(state);
+       REG_PC = m68ki_read_imm_32(state);
        m68ki_jump(REG_PC);
 
        CPU_RUN_MODE = RUN_MODE_NORMAL;
@@ -1168,12 +1167,12 @@ void m68k_pulse_reset(void)
        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);
        }
 }
 
@@ -1203,7 +1202,7 @@ void m68k_set_context(void* src)
 
 #if M68K_SEPARATE_READS
 /* Read data immediately following the PC */
-inline unsigned int  m68k_read_immediate_16(unsigned int address) {
+inline unsigned int m68k_read_immediate_16(m68ki_cpu_core *state, unsigned int address) {
 #if M68K_EMULATE_PREFETCH == OPT_ON
        for (int i = 0; i < m68ki_cpu.read_ranges; i++) {
                if(address >= m68ki_cpu.read_addr[i] && address < m68ki_cpu.read_upper[i]) {
@@ -1214,7 +1213,7 @@ inline unsigned int  m68k_read_immediate_16(unsigned int address) {
 
        return m68k_read_memory_16(address);
 }
-inline unsigned int  m68k_read_immediate_32(unsigned int address) {
+inline unsigned int m68k_read_immediate_32(m68ki_cpu_core *state, unsigned int address) {
 #if M68K_EMULATE_PREFETCH == OPT_ON
        for (int i = 0; i < m68ki_cpu.read_ranges; i++) {
                if(address >= m68ki_cpu.read_addr[i] && address < m68ki_cpu.read_upper[i]) {
@@ -1227,7 +1226,7 @@ inline unsigned int  m68k_read_immediate_32(unsigned int address) {
 }
 
 /* Read data relative to the PC */
-inline unsigned int  m68k_read_pcrelative_8(unsigned int address) {
+inline unsigned int m68k_read_pcrelative_8(m68ki_cpu_core *state, unsigned int address) {
        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]];
@@ -1236,7 +1235,7 @@ inline unsigned int  m68k_read_pcrelative_8(unsigned int address) {
 
        return m68k_read_memory_8(address);
 }
-inline unsigned int  m68k_read_pcrelative_16(unsigned int address) {
+inline unsigned int  m68k_read_pcrelative_16(m68ki_cpu_core *state, unsigned int address) {
        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]);
@@ -1245,7 +1244,7 @@ inline unsigned int  m68k_read_pcrelative_16(unsigned int address) {
 
        return m68k_read_memory_16(address);
 }
-inline unsigned int  m68k_read_pcrelative_32(unsigned int address) {
+inline unsigned int  m68k_read_pcrelative_32(m68ki_cpu_core *state, unsigned int address) {
        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]);
@@ -1257,7 +1256,7 @@ inline unsigned int  m68k_read_pcrelative_32(unsigned int address) {
 #endif
 
 
-uint m68ki_read_imm6_addr_slowpath(uint32_t pc, address_translation_cache *cache)
+uint m68ki_read_imm16_addr_slowpath(m68ki_cpu_core *state, uint32_t pc, address_translation_cache *cache)
 {
     uint32_t address = ADDRESS_68K(pc);
     uint32_t pc_address_diff = pc - address;
@@ -1282,14 +1281,14 @@ uint m68ki_read_imm6_addr_slowpath(uint32_t pc, address_translation_cache *cache
        uint result;
        if(REG_PC != CPU_PREF_ADDR)
        {
-               CPU_PREF_DATA = m68ki_ic_readimm16(REG_PC);
+               CPU_PREF_DATA = m68ki_ic_readimm16(state, 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_DATA = m68ki_ic_readimm16(state, 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;