Merge pull request #8364 from tlindner/coco3-forceram

coco3: adjust $FEXX constant RAM setting
This commit is contained in:
ajrhacker 2021-07-26 22:08:09 -04:00 committed by GitHub
commit 6ee768c205
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -529,19 +529,16 @@ void gime_device::update_memory(int bank)
// bank 8 is really $FE00-$FEFF; it is weird so adjust for it // bank 8 is really $FE00-$FEFF; it is weird so adjust for it
offs_t offset; offs_t offset;
bool force_ram;
bool enable_mmu = (m_gime_registers[0] & 0x40) ? true : false; bool enable_mmu = (m_gime_registers[0] & 0x40) ? true : false;
if (bank == 8) if (bank == 8)
{ {
bank = 7; bank = 7;
offset = 0x1E00; offset = 0x1E00;
force_ram = (m_gime_registers[0] & 0x08);
enable_mmu = enable_mmu && !(m_gime_registers[0] & 0x08); enable_mmu = enable_mmu && !(m_gime_registers[0] & 0x08);
} }
else else
{ {
offset = 0x0000; offset = 0x0000;
force_ram = false;
} }
// is the MMU enabled at $FF90? // is the MMU enabled at $FF90?
@ -566,7 +563,7 @@ void gime_device::update_memory(int bank)
// are we actually in ROM? // are we actually in ROM?
uint8_t *memory; uint8_t *memory;
bool is_read_only; bool is_read_only;
if (((block & 0x3F) >= 0x3C) && !(m_sam_state & SAM_STATE_TY) && !force_ram) if (((block & 0x3F) >= 0x3C) && !(m_sam_state & SAM_STATE_TY))
{ {
// we're in ROM // we're in ROM
const uint8_t rom_mode = m_gime_registers[0] & 3; const uint8_t rom_mode = m_gime_registers[0] & 3;