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

Do not update W-bit when MMR0 is touched

Browse source 
Include exception number in logging
This commit is contained in:
folkert van heusden 2022-06-16 20:10:55 +02:00
parent 0f78c37d84
commit c033268ee6
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bus.cpp
View file

@ -345,7 +345,7 @@ uint32_t bus::calculate_physical_address(const int run_mode, const uint16_t a, c
MMR0 &= ~(3 << 5);
MMR0 |= run_mode << 5;
throw 1;
throw 2;
}
}
}
@ -366,7 +366,7 @@ uint32_t bus::calculate_physical_address(const int run_mode, const uint16_t a, c
//
c->schedule_trap(04); // invalid address
throw 1;
throw 3;
}
if ((p_offset > pdr_len && direction == false) || (p_offset < pdr_len && direction == true)) {
@ -380,7 +380,7 @@ 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
throw 1;
throw 4;
}
}
@ -410,14 +410,11 @@ uint16_t bus::write(const uint16_t a, const bool word_mode, uint16_t value, cons
{
int run_mode = (c->getPSW() >> (use_prev ? 12 : 14)) & 3;
// if (run_mode == 1 && is_11_34)
// run_mode = 3;
if ((MMR0 & 1) == 1 && (a & 1) == 0) {
if ((MMR0 & 1) == 1 && (a & 1) == 0 && a != 0177572) {
const uint8_t apf = a >> 13; // active page field
// TODO: D/I
pages[run_mode][0][apf].pdr |= 64;
pages[run_mode][0][apf].pdr |= 64; // set 'W' (written to) bit
}
if (a >= 0160000) {

2
cpu.cpp
View file

@ -2195,6 +2195,6 @@ void cpu::step_b()
trap(010);
}
catch(const int exception) {
DOLOG(debug, true, "bus-trap during execution of command");
DOLOG(debug, true, "bus-trap during execution of command (%d)", exception);
}
}