If bit 9 of MMR0 is not set, abort an instruction but do not trap
This commit is contained in:
parent
49d16a72e6
commit
470919e85d
1 changed files with 3 additions and 2 deletions
5
bus.cpp
5
bus.cpp
|
@ -415,7 +415,7 @@ uint32_t bus::calculate_physical_address(const int run_mode, const uint16_t a, c
|
||||||
m_offset &= 0x3ffff;
|
m_offset &= 0x3ffff;
|
||||||
|
|
||||||
if (trap_on_failure) {
|
if (trap_on_failure) {
|
||||||
if (MMR0 & (1 << 9)) {
|
{
|
||||||
const int access_control = pages[run_mode][d][apf].pdr & 7;
|
const int access_control = pages[run_mode][d][apf].pdr & 7;
|
||||||
|
|
||||||
bool do_trap = false;
|
bool do_trap = false;
|
||||||
|
@ -431,7 +431,8 @@ uint32_t bus::calculate_physical_address(const int run_mode, const uint16_t a, c
|
||||||
if (do_trap) {
|
if (do_trap) {
|
||||||
DOLOG(debug, true, "TRAP(0250) (throw 1) for access_control %d on address %06o", access_control, a);
|
DOLOG(debug, true, "TRAP(0250) (throw 1) for access_control %d on address %06o", access_control, a);
|
||||||
|
|
||||||
c->schedule_trap(0250); // invalid address
|
if (MMR0 & (1 << 9))
|
||||||
|
c->schedule_trap(0250); // invalid address
|
||||||
|
|
||||||
if (is_write)
|
if (is_write)
|
||||||
pages[run_mode][d][apf].pdr |= 1 << 7;
|
pages[run_mode][d][apf].pdr |= 1 << 7;
|
||||||
|
|
Loading…
Add table
Reference in a new issue