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

m68000: Ensure tas rmw cycle is actually uninterruptible enough

Browse Source
This commit is contained in:
Olivier Galibert 2023-02-23 19:58:14 +01:00
parent 7200cca83a
commit 84c7e2bde2
9 changed files with 249 additions and 401 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/devices/cpu/m68000/m68000-sdf.cpp
View File

@ -90675,12 +90675,9 @@ void m68000_device::tas_ais_df() // 4ad0 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
m_dcr = m_da[m_movems];
@ -90704,7 +90701,7 @@ void m68000_device::tas_ais_df() // 4ad0 fff8
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -90765,12 +90762,9 @@ void m68000_device::tas_aips_df() // 4ad8 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
m_da[ry] = m_au;
@ -90796,7 +90790,7 @@ void m68000_device::tas_aips_df() // 4ad8 fff8
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -90858,12 +90852,9 @@ void m68000_device::tas_pais_df() // 4ae0 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
m_at = m_au;
@ -90890,7 +90881,7 @@ void m68000_device::tas_pais_df() // 4ae0 fff8
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -90971,12 +90962,9 @@ void m68000_device::tas_das_df() // 4ae8 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
m_dcr = m_da[m_movems];
@ -91000,7 +90988,7 @@ void m68000_device::tas_das_df() // 4ae8 fff8
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -91121,12 +91109,9 @@ adsw2:
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
m_dcr = m_da[m_movems];
@ -91150,7 +91135,7 @@ adsw2:
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -91229,12 +91214,9 @@ void m68000_device::tas_adr16_df() // 4af8 ffff
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
m_au = m_pc + 2;
@ -91259,7 +91241,7 @@ void m68000_device::tas_adr16_df() // 4af8 ffff
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -91360,12 +91342,9 @@ void m68000_device::tas_adr32_df() // 4af9 ffff
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
} else
m_inst_substate = 6;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
return;
}
m_au = m_pc + 2;
@ -91390,7 +91369,7 @@ void m68000_device::tas_adr32_df() // 4af9 ffff
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 7;
m_inst_substate = 5;
} else
m_inst_substate = 8;
return;

77
src/devices/cpu/m68000/m68000-sdfm.cpp
View File

@ -90675,12 +90675,9 @@ void m68000_device::tas_ais_dfm() // 4ad0 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
m_dcr = m_da[m_movems];
@ -90704,7 +90701,7 @@ void m68000_device::tas_ais_dfm() // 4ad0 fff8
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -90765,12 +90762,9 @@ void m68000_device::tas_aips_dfm() // 4ad8 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
m_da[ry] = m_au;
@ -90796,7 +90790,7 @@ void m68000_device::tas_aips_dfm() // 4ad8 fff8
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -90858,12 +90852,9 @@ void m68000_device::tas_pais_dfm() // 4ae0 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
m_at = m_au;
@ -90890,7 +90881,7 @@ void m68000_device::tas_pais_dfm() // 4ae0 fff8
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -90971,12 +90962,9 @@ void m68000_device::tas_das_dfm() // 4ae8 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
m_dcr = m_da[m_movems];
@ -91000,7 +90988,7 @@ void m68000_device::tas_das_dfm() // 4ae8 fff8
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -91121,12 +91109,9 @@ adsw2:
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
m_dcr = m_da[m_movems];
@ -91150,7 +91135,7 @@ adsw2:
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -91229,12 +91214,9 @@ void m68000_device::tas_adr16_dfm() // 4af8 ffff
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
m_au = m_pc + 2;
@ -91259,7 +91241,7 @@ void m68000_device::tas_adr16_dfm() // 4af8 ffff
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -91360,12 +91342,9 @@ void m68000_device::tas_adr32_dfm() // 4af9 ffff
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
} else
m_inst_substate = 6;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
return;
}
m_au = m_pc + 2;
@ -91390,7 +91369,7 @@ void m68000_device::tas_adr32_dfm() // 4af9 ffff
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 7;
m_inst_substate = 5;
} else
m_inst_substate = 8;
return;

77
src/devices/cpu/m68000/m68000-sdp.cpp
View File

@ -103257,12 +103257,9 @@ void m68000_device::tas_ais_dp() // 4ad0 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
[[fallthrough]]; case 2:
@ -103288,7 +103285,7 @@ void m68000_device::tas_ais_dp() // 4ad0 fff8
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -103358,12 +103355,9 @@ void m68000_device::tas_aips_dp() // 4ad8 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
[[fallthrough]]; case 2:
@ -103391,7 +103385,7 @@ void m68000_device::tas_aips_dp() // 4ad8 fff8
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -103462,12 +103456,9 @@ void m68000_device::tas_pais_dp() // 4ae0 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
[[fallthrough]]; case 2:
@ -103496,7 +103487,7 @@ void m68000_device::tas_pais_dp() // 4ae0 fff8
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -103589,12 +103580,9 @@ void m68000_device::tas_das_dp() // 4ae8 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
[[fallthrough]]; case 4:
@ -103620,7 +103608,7 @@ void m68000_device::tas_das_dp() // 4ae8 fff8
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -103756,12 +103744,9 @@ adsw2:
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
[[fallthrough]]; case 4:
@ -103787,7 +103772,7 @@ adsw2:
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -103878,12 +103863,9 @@ void m68000_device::tas_adr16_dp() // 4af8 ffff
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
[[fallthrough]]; case 4:
@ -103910,7 +103892,7 @@ void m68000_device::tas_adr16_dp() // 4af8 ffff
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -104026,12 +104008,9 @@ void m68000_device::tas_adr32_dp() // 4af9 ffff
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
} else
m_inst_substate = 6;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
return;
}
[[fallthrough]]; case 6:
@ -104058,7 +104037,7 @@ void m68000_device::tas_adr32_dp() // 4af9 ffff
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 7;
m_inst_substate = 5;
} else
m_inst_substate = 8;
return;

77
src/devices/cpu/m68000/m68000-sdpm.cpp
View File

@ -103257,12 +103257,9 @@ void m68000_device::tas_ais_dpm() // 4ad0 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
[[fallthrough]]; case 2:
@ -103288,7 +103285,7 @@ void m68000_device::tas_ais_dpm() // 4ad0 fff8
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -103358,12 +103355,9 @@ void m68000_device::tas_aips_dpm() // 4ad8 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
[[fallthrough]]; case 2:
@ -103391,7 +103385,7 @@ void m68000_device::tas_aips_dpm() // 4ad8 fff8
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -103462,12 +103456,9 @@ void m68000_device::tas_pais_dpm() // 4ae0 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
[[fallthrough]]; case 2:
@ -103496,7 +103487,7 @@ void m68000_device::tas_pais_dpm() // 4ae0 fff8
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -103589,12 +103580,9 @@ void m68000_device::tas_das_dpm() // 4ae8 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
[[fallthrough]]; case 4:
@ -103620,7 +103608,7 @@ void m68000_device::tas_das_dpm() // 4ae8 fff8
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -103756,12 +103744,9 @@ adsw2:
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
[[fallthrough]]; case 4:
@ -103787,7 +103772,7 @@ adsw2:
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -103878,12 +103863,9 @@ void m68000_device::tas_adr16_dpm() // 4af8 ffff
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
[[fallthrough]]; case 4:
@ -103910,7 +103892,7 @@ void m68000_device::tas_adr16_dpm() // 4af8 ffff
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -104026,12 +104008,9 @@ void m68000_device::tas_adr32_dpm() // 4af9 ffff
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
} else
m_inst_substate = 6;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
return;
}
[[fallthrough]]; case 6:
@ -104058,7 +104037,7 @@ void m68000_device::tas_adr32_dpm() // 4af9 ffff
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 7;
m_inst_substate = 5;
} else
m_inst_substate = 8;
return;

77
src/devices/cpu/m68000/m68000-sif.cpp
View File

@ -90675,12 +90675,9 @@ void m68000_device::tas_ais_if() // 4ad0 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
m_dcr = m_da[m_movems];
@ -90704,7 +90701,7 @@ void m68000_device::tas_ais_if() // 4ad0 fff8
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -90765,12 +90762,9 @@ void m68000_device::tas_aips_if() // 4ad8 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
m_da[ry] = m_au;
@ -90796,7 +90790,7 @@ void m68000_device::tas_aips_if() // 4ad8 fff8
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -90858,12 +90852,9 @@ void m68000_device::tas_pais_if() // 4ae0 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
m_at = m_au;
@ -90890,7 +90881,7 @@ void m68000_device::tas_pais_if() // 4ae0 fff8
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -90971,12 +90962,9 @@ void m68000_device::tas_das_if() // 4ae8 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
m_dcr = m_da[m_movems];
@ -91000,7 +90988,7 @@ void m68000_device::tas_das_if() // 4ae8 fff8
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -91121,12 +91109,9 @@ adsw2:
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
m_dcr = m_da[m_movems];
@ -91150,7 +91135,7 @@ adsw2:
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -91229,12 +91214,9 @@ void m68000_device::tas_adr16_if() // 4af8 ffff
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
m_au = m_pc + 2;
@ -91259,7 +91241,7 @@ void m68000_device::tas_adr16_if() // 4af8 ffff
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -91360,12 +91342,9 @@ void m68000_device::tas_adr32_if() // 4af9 ffff
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
} else
m_inst_substate = 6;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
return;
}
m_au = m_pc + 2;
@ -91390,7 +91369,7 @@ void m68000_device::tas_adr32_if() // 4af9 ffff
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 7;
m_inst_substate = 5;
} else
m_inst_substate = 8;
return;

77
src/devices/cpu/m68000/m68000-sifm.cpp
View File

@ -90675,12 +90675,9 @@ void m68000_device::tas_ais_ifm() // 4ad0 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
m_dcr = m_da[m_movems];
@ -90704,7 +90701,7 @@ void m68000_device::tas_ais_ifm() // 4ad0 fff8
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -90765,12 +90762,9 @@ void m68000_device::tas_aips_ifm() // 4ad8 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
m_da[ry] = m_au;
@ -90796,7 +90790,7 @@ void m68000_device::tas_aips_ifm() // 4ad8 fff8
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -90858,12 +90852,9 @@ void m68000_device::tas_pais_ifm() // 4ae0 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
m_at = m_au;
@ -90890,7 +90881,7 @@ void m68000_device::tas_pais_ifm() // 4ae0 fff8
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -90971,12 +90962,9 @@ void m68000_device::tas_das_ifm() // 4ae8 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
m_dcr = m_da[m_movems];
@ -91000,7 +90988,7 @@ void m68000_device::tas_das_ifm() // 4ae8 fff8
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -91121,12 +91109,9 @@ adsw2:
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
m_dcr = m_da[m_movems];
@ -91150,7 +91135,7 @@ adsw2:
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -91229,12 +91214,9 @@ void m68000_device::tas_adr16_ifm() // 4af8 ffff
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
m_au = m_pc + 2;
@ -91259,7 +91241,7 @@ void m68000_device::tas_adr16_ifm() // 4af8 ffff
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -91360,12 +91342,9 @@ void m68000_device::tas_adr32_ifm() // 4af9 ffff
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
} else
m_inst_substate = 6;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
return;
}
m_au = m_pc + 2;
@ -91390,7 +91369,7 @@ void m68000_device::tas_adr32_ifm() // 4af9 ffff
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 7;
m_inst_substate = 5;
} else
m_inst_substate = 8;
return;

77
src/devices/cpu/m68000/m68000-sip.cpp
View File

@ -103257,12 +103257,9 @@ void m68000_device::tas_ais_ip() // 4ad0 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
[[fallthrough]]; case 2:
@ -103288,7 +103285,7 @@ void m68000_device::tas_ais_ip() // 4ad0 fff8
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -103358,12 +103355,9 @@ void m68000_device::tas_aips_ip() // 4ad8 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
[[fallthrough]]; case 2:
@ -103391,7 +103385,7 @@ void m68000_device::tas_aips_ip() // 4ad8 fff8
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -103462,12 +103456,9 @@ void m68000_device::tas_pais_ip() // 4ae0 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
[[fallthrough]]; case 2:
@ -103496,7 +103487,7 @@ void m68000_device::tas_pais_ip() // 4ae0 fff8
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -103589,12 +103580,9 @@ void m68000_device::tas_das_ip() // 4ae8 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
[[fallthrough]]; case 4:
@ -103620,7 +103608,7 @@ void m68000_device::tas_das_ip() // 4ae8 fff8
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -103756,12 +103744,9 @@ adsw2:
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
[[fallthrough]]; case 4:
@ -103787,7 +103772,7 @@ adsw2:
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -103878,12 +103863,9 @@ void m68000_device::tas_adr16_ip() // 4af8 ffff
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
[[fallthrough]]; case 4:
@ -103910,7 +103892,7 @@ void m68000_device::tas_adr16_ip() // 4af8 ffff
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -104026,12 +104008,9 @@ void m68000_device::tas_adr32_ip() // 4af9 ffff
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
} else
m_inst_substate = 6;
if(m_icount <= 0 && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
return;
}
[[fallthrough]]; case 6:
@ -104058,7 +104037,7 @@ void m68000_device::tas_adr32_ip() // 4af9 ffff
if(m_icount <= 0) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 7;
m_inst_substate = 5;
} else
m_inst_substate = 8;
return;

77
src/devices/cpu/m68000/m68000-sipm.cpp
View File

@ -103257,12 +103257,9 @@ void m68000_device::tas_ais_ipm() // 4ad0 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
[[fallthrough]]; case 2:
@ -103288,7 +103285,7 @@ void m68000_device::tas_ais_ipm() // 4ad0 fff8
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -103358,12 +103355,9 @@ void m68000_device::tas_aips_ipm() // 4ad8 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
[[fallthrough]]; case 2:
@ -103391,7 +103385,7 @@ void m68000_device::tas_aips_ipm() // 4ad8 fff8
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -103462,12 +103456,9 @@ void m68000_device::tas_pais_ipm() // 4ae0 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
} else
m_inst_substate = 2;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 1;
return;
}
[[fallthrough]]; case 2:
@ -103496,7 +103487,7 @@ void m68000_device::tas_pais_ipm() // 4ae0 fff8
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
m_inst_substate = 1;
} else
m_inst_substate = 4;
return;
@ -103589,12 +103580,9 @@ void m68000_device::tas_das_ipm() // 4ae8 fff8
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
[[fallthrough]]; case 4:
@ -103620,7 +103608,7 @@ void m68000_device::tas_das_ipm() // 4ae8 fff8
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -103756,12 +103744,9 @@ adsw2:
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
[[fallthrough]]; case 4:
@ -103787,7 +103772,7 @@ adsw2:
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -103878,12 +103863,9 @@ void m68000_device::tas_adr16_ipm() // 4af8 ffff
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
} else
m_inst_substate = 4;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 3;
return;
}
[[fallthrough]]; case 4:
@ -103910,7 +103892,7 @@ void m68000_device::tas_adr16_ipm() // 4af8 ffff
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
m_inst_substate = 3;
} else
m_inst_substate = 6;
return;
@ -104026,12 +104008,9 @@ void m68000_device::tas_adr32_ipm() // 4af9 ffff
if(!(m_aob & 1))
m_edb >>= 8;
m_icount -= 4;
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
} else
m_inst_substate = 6;
if(m_icount <= m_bcount && access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 5;
return;
}
[[fallthrough]]; case 6:
@ -104058,7 +104037,7 @@ void m68000_device::tas_adr32_ipm() // 4af9 ffff
if(m_icount <= m_bcount) {
if(access_to_be_redone()) {
m_icount += 4;
m_inst_substate = 7;
m_inst_substate = 5;
} else
m_inst_substate = 8;
return;

34
src/devices/cpu/m68000/m68000gen.py
View File

@ -2098,7 +2098,6 @@ def generate_source_from_code(code, gen_mode):
is_interrupt_vector_lookup = not ci[4] and ci[2] == 2
if is_interrupt_vector_lookup:
source.append("\tstart_interrupt_vector_lookup();")
if not (gen_mode & GEN.full):
source.append("\t[[fallthrough]]; case %d:" % (ci[1]))
if ci[4]:
@ -2140,14 +2139,31 @@ def generate_source_from_code(code, gen_mode):
else:
source.append("\tm_edb = m_mmu->read_%s(m_aob & ~1, 0xffff);" % (["program", "data"][ci[2]]))
source.append("\tm_icount -= 4;")
source.append("\tif(m_icount <= %s) {" % ("m_bcount" if gen_mode & GEN.mcu else "0"))
source.append("\t\tif(access_to_be_redone()) {")
source.append("\t\t\tm_icount += 4;")
source.append("\t\t\tm_inst_substate = %d;" % ci[1])
source.append("\t\t} else")
source.append("\t\t\tm_inst_substate = %d;" % (ci[1]+1))
source.append("\t\treturn;")
source.append("\t}")
if ci[8]:
if ci[4]:
source.append("\tif(m_icount <= %s) {" % ("m_bcount" if gen_mode & GEN.mcu else "0"))
source.append("\t\tif(access_to_be_redone()) {")
source.append("\t\t\tm_icount += 4;")
source.append("\t\t\tm_inst_substate = %d;" % (ci[1]-2))
source.append("\t\t} else")
source.append("\t\t\tm_inst_substate = %d;" % (ci[1]+1))
source.append("\t\treturn;")
source.append("\t}")
else:
source.append("\tif(m_icount <= %s && access_to_be_redone()) {" % ("m_bcount" if gen_mode & GEN.mcu else "0"))
source.append("\t\tm_icount += 4;")
source.append("\t\tm_inst_substate = %d;" % ci[1])
source.append("\t\treturn;")
source.append("\t}")
else:
source.append("\tif(m_icount <= %s) {" % ("m_bcount" if gen_mode & GEN.mcu else "0"))
source.append("\t\tif(access_to_be_redone()) {")
source.append("\t\t\tm_icount += 4;")
source.append("\t\t\tm_inst_substate = %d;" % ci[1])
source.append("\t\t} else")
source.append("\t\t\tm_inst_substate = %d;" % (ci[1]+1))
source.append("\t\treturn;")
source.append("\t}")
if not (gen_mode & GEN.full):
source.append("\t[[fallthrough]]; case %d:" % (ci[1]+1))
if is_interrupt_vector_lookup: