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

double traps

Browse source 
odd addressing trap
This commit is contained in:
folkert van heusden 2022-06-18 12:10:23 +02:00
parent 7427ddc226
commit 51670ef199
4 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bus.cpp
View file

@ -285,10 +285,7 @@ uint16_t bus::read(const uint16_t a, const bool word_mode, const bool use_prev,
int run_mode = (c->getPSW() >> (use_prev ? 12 : 14)) & 3; int run_mode = (c->getPSW() >> (use_prev ? 12 : 14)) & 3;
// if (run_mode == 1 && is_11_34) uint32_t m_offset = calculate_physical_address(run_mode, a, !peek_only, false, peek_only, word_mode);
// run_mode = 3;
uint32_t m_offset = calculate_physical_address(run_mode, a, !peek_only, false, peek_only);
if (word_mode) if (word_mode)
temp = m -> readByte(m_offset); temp = m -> readByte(m_offset);
@ -339,12 +336,13 @@ void bus::setMMR2(const uint16_t value)
MMR2 = value; MMR2 = value;
} }
uint32_t bus::calculate_physical_address(const int run_mode, const uint16_t a, const bool trap_on_failure, const bool is_write, const bool peek_only) uint32_t bus::calculate_physical_address(const int run_mode, const uint16_t a, const bool trap_on_failure, const bool is_write, const bool peek_only, const bool word_mode)
{ {
uint32_t m_offset = 0; uint32_t m_offset = 0;
const uint8_t apf = a >> 13; // active page field
if (MMR0 & 1) { if (MMR0 & 1) {
const uint8_t apf = a >> 13; // active page field
// TODO: D/I // TODO: D/I
m_offset = pages[run_mode][0][apf].par * 64; // memory offset TODO: handle 16b int-s m_offset = pages[run_mode][0][apf].par * 64; // memory offset TODO: handle 16b int-s
@ -466,6 +464,16 @@ uint32_t bus::calculate_physical_address(const int run_mode, const uint16_t a, c
m_offset = a; m_offset = a;
} }
if ((m_offset & 1) && word_mode == 0 && peek_only == false) {
DOLOG(debug, !peek_only, "bus::calculate_physical_address::m_offset %o", m_offset);
DOLOG(debug, true, "TRAP(004) (throw 5) on address %06o", a);
c->schedule_trap(004); // invalid access
pages[run_mode][0][apf].pdr |= 1 << 7; // TODO: D/I
throw 5;
}
return m_offset; return m_offset;
} }
@ -787,7 +795,7 @@ void bus::write(const uint16_t a, const bool word_mode, uint16_t value, const bo
return; return;
} }
uint32_t m_offset = calculate_physical_address(run_mode, a, true, true, false); uint32_t m_offset = calculate_physical_address(run_mode, a, true, true, false, word_mode);
DOLOG(debug, true, "WRITE to %06o/%07o: %o", a, m_offset, value); DOLOG(debug, true, "WRITE to %06o/%07o: %o", a, m_offset, value);

2
bus.h
View file

@ -90,5 +90,5 @@ public:
uint16_t get_switch_register() const { return switch_register; } uint16_t get_switch_register() const { return switch_register; }
uint32_t calculate_physical_address(const int run_mode, const uint16_t a, const bool trap_on_failure, const bool is_write, const bool peek_only); uint32_t calculate_physical_address(const int run_mode, const uint16_t a, const bool trap_on_failure, const bool is_write, const bool peek_only, const bool word_mode);
}; };

2
console_ncurses.cpp
View file

@ -139,7 +139,7 @@ void console_ncurses::panel_update_thread()
int run_mode = current_PSW >> 14; int run_mode = current_PSW >> 14;
uint16_t current_PC = c->getPC(); uint16_t current_PC = c->getPC();
uint32_t full_addr = b->calculate_physical_address(run_mode, current_PC, false, false, true); uint32_t full_addr = b->calculate_physical_address(run_mode, current_PC, false, false, true, true);
uint16_t current_instr = b->readWord(current_PC); uint16_t current_instr = b->readWord(current_PC);

9
cpu.cpp
View file

@ -1657,7 +1657,7 @@ void cpu::trap(const uint16_t vector, const int new_ipl, const bool is_interrupt
// make sure the trap vector is retrieved from kernel space // make sure the trap vector is retrieved from kernel space
psw &= 037777; // mask off 14/15 psw &= 037777; // mask off 14/15
if ((b->getMMR0() & 0160000) == 0) { if ((b->getMMR0() & 0160000) == 0 && vector != 4) {
b->setMMR2(vector); b->setMMR2(vector);
b->addToMMR1(-2, 6); b->addToMMR1(-2, 6);
b->addToMMR1(-2, 6); b->addToMMR1(-2, 6);
@ -2161,7 +2161,12 @@ void cpu::step_a()
b->clearMMR1(); b->clearMMR1();
if (scheduled_trap) { if (scheduled_trap) {
trap(scheduled_trap, 7, true); try {
trap(scheduled_trap, 7, true);
}
catch(const int exception) {
DOLOG(debug, true, "2nd-bus-trap during execution of command (%d)", exception);
}
scheduled_trap = 0; scheduled_trap = 0;