Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 08:49:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

m68kmmu: fix compare of SUPERVISOR_ONLY bit in 8 byte descriptors (nw)

Browse Source 
in the check fc wasn't actually checked, so as soon as an OS (like
the MAC II CI) set the SUPERVISOR_ONLY but the MMU caused a bus
error exception.
This commit is contained in:
Sven Schnelle 2018-11-03 21:42:17 +01:00
parent 48f04b664c
commit 9f1c7e41e6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/devices/cpu/m68000/m68kmmu.h
View File

@ -309,7 +309,7 @@ void update_descriptor(const uint32_t tptr, const int type, const uint32_t entry
}
template<bool _long>
void update_sr(const int type, const uint32_t tbl_entry)
void update_sr(const int type, const uint32_t tbl_entry, const int fc)
{
switch(type)
{
@ -334,7 +334,7 @@ void update_sr(const int type, const uint32_t tbl_entry)
m_mmu_tmp_sr |= M68K_MMU_SR_WRITE_PROTECT;
}
if (_long && (tbl_entry & M68K_MMU_DF_SUPERVISOR))
if (_long && !(fc & 4) && (tbl_entry & M68K_MMU_DF_SUPERVISOR))
{
m_mmu_tmp_sr |= M68K_MMU_SR_SUPERVISOR_ONLY;
}
@ -410,7 +410,7 @@ bool pmmu_walk_tables(uint32_t addr_in, int type, uint32_t table, const int fc,
MMULOG("SHORT DESC: %08x\n", tbl_entry);
table = tbl_entry & M68K_MMU_DF_ADDR_MASK;
update_sr<0>(type, tbl_entry);
update_sr<0>(type, tbl_entry, fc);
if (!ptest)
{
update_descriptor(addr_out, type, tbl_entry, rw);
@ -436,7 +436,7 @@ bool pmmu_walk_tables(uint32_t addr_in, int type, uint32_t table, const int fc,
MMULOG("LONG DESC: %08x %08x\n", tbl_entry, tbl_entry2);
table = tbl_entry2 & M68K_MMU_DF_ADDR_MASK;
update_sr<1>(type, tbl_entry);
update_sr<1>(type, tbl_entry, fc);
if (!ptest)
{
update_descriptor(addr_out, type, tbl_entry, rw);