From: beeanyew Date: Thu, 6 May 2021 22:46:19 +0000 (+0200) Subject: Fix Musashi complation with various m68conf options X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=d882c8da7412f5b078a9a28a0fb683e4fca84d95;p=pistorm Fix Musashi complation with various m68conf options --- diff --git a/m68kcpu.h b/m68kcpu.h index 0be9551..d087d62 100644 --- a/m68kcpu.h +++ b/m68kcpu.h @@ -1188,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 */ } @@ -1250,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 */