mirror of
https://github.com/captain-amygdala/pistorm.git
synced 2026-01-27 04:12:26 +00:00
Fix Musashi complation with various m68conf options
This commit is contained in:
16
m68kcpu.h
16
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 */
|
||||
|
||||
Reference in New Issue
Block a user