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

the check if odd-address access is performed is done by the mmu

Browse source
This commit is contained in:
folkert van heusden 2024-05-03 19:32:08 +02:00
parent c44675311a
commit 8860b04045
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1
5 changed files with 24 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
bus.cpp
View file

@ -212,18 +212,6 @@ void bus::init()
mmu_->setMMR3(0);
}
void bus::trap_odd(const uint16_t a)
{
uint16_t temp = mmu_->getMMR0();
temp &= ~(7 << 1);
temp |= (a >> 13) << 1;
mmu_->setMMR0(temp);
c->trap(004); // invalid access
}
uint16_t bus::read(const uint16_t addr_in, const word_mode_t word_mode, const rm_selection_t mode_selection, const bool peek_only, const d_i_space_t space)
{
int run_mode = mode_selection == rm_cur ? c->getPSW_runmode() : c->getPSW_prev_runmode();
@ -270,9 +258,9 @@ uint16_t bus::read(const uint16_t addr_in, const word_mode_t word_mode, const rm
///^ registers ^///
if (!peek_only) {
if ((a & 1) && word_mode == wm_word) {
if ((a & 1) && word_mode == wm_word) [[unlikely]] {
DOLOG(debug, false, "READ-I/O odd address %06o UNHANDLED", a);
trap_odd(a);
mmu_->trap_if_odd(addr_in, run_mode, space, false);
throw 0;
return 0;
}
@ -507,8 +495,8 @@ uint16_t bus::read(const uint16_t addr_in, const word_mode_t word_mode, const rm
}
if (peek_only == false && word_mode == wm_word && (addr_in & 1)) {
if (!peek_only) DOLOG(debug, false, "READ from %06o - odd address!", addr_in);
trap_odd(addr_in);
DOLOG(debug, false, "READ from %06o - odd address!", addr_in);
mmu_->trap_if_odd(addr_in, run_mode, space, false);
throw 2;
return 0;
}
@ -534,18 +522,6 @@ uint16_t bus::read(const uint16_t addr_in, const word_mode_t word_mode, const rm
return temp;
}
void bus::check_odd_addressing(const uint16_t a, const int run_mode, const d_i_space_t space, const bool is_write)
{
if (a & 1) {
if (is_write)
mmu_->set_page_trapped(run_mode, space == d_space, a >> 13);
trap_odd(a);
throw 4;
}
}
memory_addresses_t bus::calculate_physical_address(const int run_mode, const uint16_t a) const
{
const uint8_t apf = a >> 13; // active page field
@ -1011,10 +987,11 @@ write_rc_t bus::write(const uint16_t addr_in, const word_mode_t word_mode, uint1
DOLOG(debug, false, "WRITE-I/O UNHANDLED %08o(%c): %06o (base: %o)", m_offset, word_mode == wm_byte ? 'B' : 'W', value, get_io_base());
if (word_mode == wm_word && (a & 1)) {
if (word_mode == wm_word && (a & 1)) [[unlikely]] {
DOLOG(debug, false, "WRITE-I/O to %08o (value: %06o) - odd address!", m_offset, value);
trap_odd(a);
mmu_->trap_if_odd(a, run_mode, space, true);
throw 8;
}
@ -1023,10 +1000,11 @@ write_rc_t bus::write(const uint16_t addr_in, const word_mode_t word_mode, uint1
throw 9;
}
if (word_mode == wm_word && (addr_in & 1)) {
if (word_mode == wm_word && (addr_in & 1)) [[unlikely]] {
DOLOG(debug, false, "WRITE to %06o (value: %06o) - odd address!", addr_in, value);
trap_odd(addr_in);
mmu_->trap_if_odd(addr_in, run_mode, space, true);
throw 10;
}

1
bus.h
View file

@ -140,7 +140,6 @@ public:
void writePhysical(const uint32_t a, const uint16_t value);
void check_odd_addressing(const uint16_t a, const int run_mode, const d_i_space_t space, const bool is_write);
void trap_odd(const uint16_t a);
uint32_t get_io_base() const { return mmu_->getMMR0() & 1 ? (mmu_->getMMR3() & 16 ? 017760000 : 0760000) : 0160000; }
bool is_psw(const uint16_t addr, const int run_mode, const d_i_space_t space) const;

2
cpu.cpp
View file

@ -1361,7 +1361,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
}
else {
auto a = getGAM(dst_mode, dst_reg, word_mode, rm_cur);
addToMMR1(a);
addToMMR1(a);
uint16_t vl = a.value.value();
uint16_t v = (vl << 1) & (word_mode == wm_byte ? 0xff : 0xffff);

11
mmu.cpp
View file

@ -213,6 +213,17 @@ void mmu::write_byte(const uint16_t a, const uint8_t value)
write_par(a, 3, value, wm_byte);
}
void mmu::trap_if_odd(const uint16_t a, const int run_mode, const d_i_space_t space, const bool is_write)
{
int page = a >> 13;
if (is_write)
set_page_trapped(run_mode, space == d_space, page);
MMR0 &= ~(7 << 1);
MMR0 |= page << 1;
}
#if IS_POSIX
void mmu::add_par_pdr(json_t *const target, const int run_mode, const bool is_d, const std::string & name) const
{

2
mmu.h
View file

@ -88,6 +88,8 @@ public:
void setMMR0Bit(const int bit);
void clearMMR0Bit(const int bit);
void trap_if_odd(const uint16_t a, const int run_mode, const d_i_space_t space, const bool is_write);
uint16_t getCPUERR() const { return CPUERR; }
void setCPUERR(const uint16_t v) { CPUERR = v; }