folkert/KEK
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ACF logic clean-up

Browse source
This commit is contained in:
folkert van heusden 2023-03-21 10:59:53 +01:00
parent ff40cdc82c
commit 49d16a72e6
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1
1 changed files with 18 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
bus.cpp
View file

@ -418,7 +418,17 @@ uint32_t bus::calculate_physical_address(const int run_mode, const uint16_t a, c
if (MMR0 & (1 << 9)) { 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;
if (is_write && access_control != 6) { // write bool do_trap = false;
if (access_control == 0)
do_trap = true;
else if (is_write && access_control != 6) // write
do_trap = true;
else if (!is_write && (access_control == 0 || access_control == 1 || access_control == 3 || access_control == 4 || access_control == 7)) {
do_trap = true;
}
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 c->schedule_trap(0250); // invalid address
@ -427,47 +437,23 @@ uint32_t bus::calculate_physical_address(const int run_mode, const uint16_t a, c
pages[run_mode][d][apf].pdr |= 1 << 7; pages[run_mode][d][apf].pdr |= 1 << 7;
if ((MMR0 & 0160000) == 0) { if ((MMR0 & 0160000) == 0) {
MMR0 &= 017777; MMR0 &= ~((1 << 15) | (1 << 14) | (1 << 13) | (3 << 5) | (7 << 1));
MMR0 |= 1 << 13; // read-only MMR0 |= 1 << 13; // read-only
//
if (access_control == 0 || access_control == 4)
MMR0 |= 1 << 15; // not resident
else
MMR0 |= 1 << 13; // read-only
MMR0 &= ~(3 << 5);
MMR0 |= run_mode << 5; // TODO: kernel-mode or user-mode when a trap occurs in user-mode? MMR0 |= run_mode << 5; // TODO: kernel-mode or user-mode when a trap occurs in user-mode?
MMR0 &= ~14; // add current page MMR0 |= apf << 1; // add current page
MMR0 |= apf << 1;
} }
DOLOG(debug, true, "MMR0: %06o", MMR0); DOLOG(debug, true, "MMR0: %06o", MMR0);
throw 1; throw 1;
} }
else if (!is_write) { // read
if (access_control == 0 || access_control == 1 || access_control == 3 || access_control == 4 || access_control == 7) {
DOLOG(debug, true, "TRAP(4) (throw 2) for access_control %d on address %06o", access_control, a);
c->schedule_trap(0250); // invalid address
if (is_write)
pages[run_mode][d][apf].pdr |= 1 << 7;
if ((MMR0 & 0160000) == 0) {
MMR0 &= 017777;
if (access_control == 0 || access_control == 4)
MMR0 |= 1 << 15; // not resident
else
MMR0 |= 1 << 13; // read-only
MMR0 &= ~(3 << 5);
MMR0 |= run_mode << 5;
MMR0 &= ~14; // add current page
MMR0 |= apf << 1;
}
throw 2;
}
}
} }
if (m_offset >= n_pages * 8192) { if (m_offset >= n_pages * 8192) {