Merge pull request #32 from LinuxJedi/fix-fonts

[pistorm] / m68kcpu.h

diff --git a/m68kcpu.h b/m68kcpu.h
index 680aa714b3678b3c5c02a6b5576488b9a2971fa9..d087d6260c09ce93622c7eedd60522d8d64ec391 100644 (file)
--- a/m68kcpu.h
+++ b/m68kcpu.h
@@ -1154,6 +1154,14 @@ static inline uint32 m68ki_ic_readimm16(uint32 address)
  */
 static inline uint m68ki_read_imm_16(void)
 {
+       uint32_t address = ADDRESS_68K(REG_PC);
+       for (int i = 0; i < read_ranges; i++) {
+               if(address >= read_addr[i] && address < read_upper[i]) {
+                       REG_PC += 2;
+                       return be16toh(((unsigned short *)(read_data[i] + (address - 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;
@@ -1180,16 +1188,8 @@ static inline uint m68ki_read_imm_16(void)
        return result;
 }
 #else
-
-       uint32_t address = ADDRESS_68K(REG_PC);
        REG_PC += 2;
 
-       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]);
-               }
-       }
-
        return m68k_read_immediate_16(address);
 #endif /* M68K_EMULATE_PREFETCH */
 }
@@ -1208,6 +1208,13 @@ static inline uint m68ki_read_imm_32(void)
 //         address = pmmu_translate_addr(address,1);
 #endif
 #endif
+       uint32_t address = ADDRESS_68K(REG_PC);
+       for (int i = 0; i < read_ranges; i++) {
+               if(address >= read_addr[i] && address < read_upper[i]) {
+                       REG_PC += 4;
+                       return be32toh(((unsigned int *)(read_data[i] + (address - read_addr[i])))[0]);
+               }
+       }
 
 #if M68K_EMULATE_PREFETCH
        uint temp_val;
@@ -1235,15 +1242,7 @@ static inline uint m68ki_read_imm_32(void)
 
        return temp_val;
 #else
-       m68ki_set_fc(FLAG_S | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
-       m68ki_check_address_error(REG_PC, MODE_READ, FLAG_S | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
-       uint32_t address = ADDRESS_68K(REG_PC);
        REG_PC += 4;
-       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]);
-               }
-       }
 
        return m68k_read_immediate_32(address);
 #endif /* M68K_EMULATE_PREFETCH */