[WIP] IRQ experiments, revert Musashi speed hax for now

[pistorm] / m68kcpu.c

diff --git a/m68kcpu.c b/m68kcpu.c
index ecdf4dd7075aaed3d2632f792d9e9855148946da..dd79593b4e762f786f6928a436346c7f76257d97 100644 (file)
--- a/m68kcpu.c
+++ b/m68kcpu.c
@@ -976,7 +976,9 @@ int m68k_execute(int num_cycles)
                /* Main loop.  Keep going until we run out of clock cycles */
                do
                {
+#ifdef M68K_BUSERR_THING
                        int i;
+#endif
                        /* Set tracing accodring to T1. (T0 is done inside instruction) */
                        m68ki_trace_t1(); /* auto-disable (see m68kcpu.h) */
 
@@ -1173,11 +1175,28 @@ void m68k_set_context(void* src)
        if(src) m68ki_cpu = *(m68ki_cpu_core*)src;
 }
 
+#if M68K_SEPARATE_READS
 /* 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]);
+               }
+       }
+#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]);
+               }
+       }
+#endif
+
        return m68k_read_memory_32(address);
 }
 
@@ -1209,6 +1228,7 @@ inline unsigned int  m68k_read_pcrelative_32(unsigned int address) {
 
     return m68k_read_memory_32(address);
 }
+#endif
 
 void m68k_add_ram_range(uint32_t addr, uint32_t upper, unsigned char *ptr)
 {