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

trap number correction for mmu

Browse source
This commit is contained in:
folkert van heusden 2022-06-17 18:15:41 +02:00
parent a9090e0acd
commit 82fe466cdd
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
bus.cpp
View file

@ -265,7 +265,7 @@ uint16_t bus::read(const uint16_t a, const bool word_mode, const bool use_prev,
} }
// LO size register field must be all 1s, so subtract 1 // LO size register field must be all 1s, so subtract 1
const uint32_t system_size = n_pages * 8192 / 64 - 1; constexpr uint32_t system_size = n_pages * 8192 / 64 - 1;
if (a == 0177762) // system size HI if (a == 0177762) // system size HI
return system_size >> 16; return system_size >> 16;
@ -316,10 +316,12 @@ uint32_t bus::calculate_physical_address(const int run_mode, const uint16_t a, c
if (trap_on_failure) { if (trap_on_failure) {
if ((MMR0 & (1 << 9)) || c->get_34()) { if ((MMR0 & (1 << 9)) || c->get_34()) {
int access_control = pages[run_mode][0][apf].pdr & 7; const int access_control = pages[run_mode][0][apf].pdr & 7;
if (is_write && access_control != 6) { // write if (is_write && access_control != 6) { // write
c->schedule_trap(04); // invalid address DOLOG(info, true, "TRAP(0250) (throw 1) for access_control %d on address %06o", access_control, a);
c->schedule_trap(0250); // invalid address
pages[run_mode][0][apf].pdr |= 1 << 7; // TODO: D/I pages[run_mode][0][apf].pdr |= 1 << 7; // TODO: D/I
@ -334,7 +336,9 @@ uint32_t bus::calculate_physical_address(const int run_mode, const uint16_t a, c
} }
else if (!is_write) { // read else if (!is_write) { // read
if (access_control == 0 || access_control == 1 || access_control == 3 || access_control == 4 || access_control == 7) { if (access_control == 0 || access_control == 1 || access_control == 3 || access_control == 4 || access_control == 7) {
c->schedule_trap(04); // invalid address DOLOG(info, true, "TRAP(4) (throw 2) for access_control %d on address %06o", access_control, a);
c->schedule_trap(0250); // invalid address
pages[run_mode][0][apf].pdr |= 1 << 7; // TODO: D/I pages[run_mode][0][apf].pdr |= 1 << 7; // TODO: D/I
@ -356,6 +360,7 @@ uint32_t bus::calculate_physical_address(const int run_mode, const uint16_t a, c
if (m_offset >= n_pages * 8192) { if (m_offset >= n_pages * 8192) {
DOLOG(debug, !peek_only, "bus::calculate_physical_address %o >= %o", m_offset, n_pages * 8192); DOLOG(debug, !peek_only, "bus::calculate_physical_address %o >= %o", m_offset, n_pages * 8192);
DOLOG(info, true, "TRAP(04) (throw 3) on address %06o", a);
MMR0 |= 1 << 15; // non-resident MMR0 |= 1 << 15; // non-resident
@ -364,13 +369,14 @@ uint32_t bus::calculate_physical_address(const int run_mode, const uint16_t a, c
pages[run_mode][0][apf].pdr |= 1 << 7; // TODO: D/I pages[run_mode][0][apf].pdr |= 1 << 7; // TODO: D/I
// //
c->schedule_trap(04); // invalid address c->schedule_trap(04);
throw 3; throw 3;
} }
if ((p_offset > pdr_len && direction == false) || (p_offset < pdr_len && direction == true)) { if ((p_offset > pdr_len && direction == false) || (p_offset < pdr_len && direction == true)) {
DOLOG(debug, !peek_only, "bus::calculate_physical_address::p_offset %o >= %o", p_offset, pdr_len); DOLOG(debug, !peek_only, "bus::calculate_physical_address::p_offset %o >= %o", p_offset, pdr_len);
DOLOG(info, true, "TRAP(0250) (throw 4) on address %06o", a);
c->schedule_trap(0250); // invalid access c->schedule_trap(0250); // invalid access
MMR0 |= 1 << 14; // length MMR0 |= 1 << 14; // length