Merge branch 'wip-crap' into main

diff --cc emulator.c
Simple merge

diff --cc m68kcpu.c
Simple merge

diff --cc m68kcpu.h
index 21d11adca464be302e7f5b8734413244c835f2ea,d087d6260c09ce93622c7eedd60522d8d64ec391..ef25ad1b156343911527f76d189f0f8e9c4a73f9
--- 1/m68kcpu.h
--- 2/m68kcpu.h
+++ b/m68kcpu.h
@@@ -1161,24 -1152,48 +1161,23 @@@ static inline uint32 m68ki_ic_readimm16
  /* Handles all immediate reads, does address error check, function code setting,
   * and prefetching if they are enabled in m68kconf.h
   */
 -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]);
 -              }
 -      }
 +uint m68ki_read_imm6_addr_slowpath(uint32_t pc, address_translation_cache *cache);
  
 -      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 */
 +static inline uint m68ki_read_imm_16(void)
 +{
 +      uint32_t pc = REG_PC;
 +
 +    address_translation_cache *cache = &code_translation_cache;
 +    if(pc >= cache->lower && pc < cache->upper)
 +    {
 +        REG_PC += 2;
 +        return be16toh(((unsigned short *)(cache->data + (pc - cache->lower)))[0]);
 +    }
 +    return m68ki_read_imm6_addr_slowpath(pc, cache);
  }
  
- 
  static inline uint m68ki_read_imm_8(void)
  {
        /* map read immediate 8 to read immediate 16 */