diff --git a/bus.cpp b/bus.cpp index 9df590c..5b15ba5 100644 --- a/bus.cpp +++ b/bus.cpp @@ -412,7 +412,7 @@ void bus::addToMMR1(const int8_t delta, const uint8_t reg) MMR1 |= reg; } -uint16_t bus::write(const uint16_t a, const bool word_mode, uint16_t value, const bool use_prev) +void bus::write(const uint16_t a, const bool word_mode, uint16_t value, const bool use_prev) { int run_mode = (c->getPSW() >> (use_prev ? 12 : 14)) & 3; @@ -445,7 +445,7 @@ uint16_t bus::write(const uint16_t a, const bool word_mode, uint16_t value, cons c -> setPSW(vtemp, false); - return value; + return; } if (a == 0177774 || a == 0177775) { // stack limit register @@ -458,68 +458,68 @@ uint16_t bus::write(const uint16_t a, const bool word_mode, uint16_t value, cons v = (v & 0xff00) | value; c -> setStackLimitRegister(v); - return v; + return; } } else { if (a == 0177776) { // PSW DOLOG(debug, true, "write PSW %o", value); c -> setPSW(value & ~16, false); - return value; + return; } if (a == 0177774) { // stack limit register DOLOG(debug, true, "write Set stack limit register: %o", value); c -> setStackLimitRegister(value); - return value; + return; } if (a >= 0177700 && a <= 0177705) { // kernel R0-R5 DOLOG(debug, true, "write kernel R%d: %o", a - 01777700, value); c -> setRegister(a - 0177700, false, false, value); - return value; + return; } if (a >= 0177710 && a <= 0177715) { // user R0-R5 DOLOG(debug, true, "write user R%d: %o", a - 01777710, value); c -> setRegister(a - 0177710, true, false, value); - return value; + return; } if (a == 0177706) { // kernel SP DOLOG(debug, true, "write kernel SP: %o", value); c -> setStackPointer(0, value); - return value; + return; } if (a == 0177707) { // PC DOLOG(debug, true, "write PC: %o", value); c -> setPC(value); - return value; + return; } if (a == 0177716) { // supervisor SP DOLOG(debug, true, "write supervisor sp: %o", value); c -> setStackPointer(1, value); - return value; + return; } if (a == 0177717) { // user SP DOLOG(debug, true, "write user sp: %o", value); c -> setStackPointer(3, value); - return value; + return; } if (a == 0177770) { // microprogram break register - return value; + return; } } if (a == 0177766) { // cpu error register DOLOG(debug, true, "write CPUERR: %o", value); CPUERR = 0; - return CPUERR; + return; } if (a == 0172516) { // MMR3 DOLOG(debug, true, "write set MMR3: %o", value); MMR3 = value & 067; - return MMR3; + return; } if (a == 0177572) { // MMR0 @@ -532,39 +532,39 @@ uint16_t bus::write(const uint16_t a, const bool word_mode, uint16_t value, cons MMR0 = value; - return MMR0; + return; } if (a == 0177772) { // PIR DOLOG(debug, true, "write set PIR: %o", value); PIR = value; // TODO - return PIR; + return; } if (a == 0177546) { // line frequency clock and status register DOLOG(debug, true, "write set LFC/SR: %o", value); lf_csr = value; - return lf_csr; + return; } if (tm11 && a >= TM_11_BASE && a < TM_11_END) { word_mode ? tm11 -> writeByte(a, value) : tm11 -> writeWord(a, value); - return value; + return; } if (rk05_ && a >= RK05_BASE && a < RK05_END) { word_mode ? rk05_ -> writeByte(a, value) : rk05_ -> writeWord(a, value); - return value; + return; } if (rl02_ && a >= RL02_BASE && a < RL02_END) { word_mode ? rl02_ -> writeByte(a, value) : rl02_ -> writeWord(a, value); - return value; + return; } if (tty_ && a >= PDP11TTY_BASE && a < PDP11TTY_END) { word_mode ? tty_ -> writeByte(a, value) : tty_ -> writeWord(a, value); - return value; + return; } /// MMU /// @@ -588,7 +588,7 @@ uint16_t bus::write(const uint16_t a, const bool word_mode, uint16_t value, cons DOLOG(debug, true, "write supervisor %c PDR for %d: %o [%d]", is_d ? 'D' : 'I', page, value, word_mode); - return value; + return; } if (a >= 0172240 && a < 0172300) { bool is_d = is_11_34 ? false : (a & 16); @@ -607,7 +607,7 @@ uint16_t bus::write(const uint16_t a, const bool word_mode, uint16_t value, cons DOLOG(debug, true, "write supervisor %c PAR for %d: %o (%07o)", is_d ? 'D' : 'I', page, word_mode ? value & 0xff : value, pages[001][is_d][page].par * 64); - return value; + return; } // kernel @@ -630,7 +630,7 @@ uint16_t bus::write(const uint16_t a, const bool word_mode, uint16_t value, cons DOLOG(debug, true, "write kernel %c PDR for %d: %o [%d]", is_d ? 'D' : 'I', page, value, word_mode); - return value; + return; } if (a >= 0172340 && a < 0172400) { bool is_d = is_11_34 ? false : (a & 16); @@ -649,7 +649,7 @@ uint16_t bus::write(const uint16_t a, const bool word_mode, uint16_t value, cons DOLOG(debug, true, "write kernel %c PAR for %d: %o (%07o)", is_d ? 'D' : 'I', page, word_mode ? value & 0xff : value, pages[000][is_d][page].par * 64); - return value; + return; } // user @@ -672,7 +672,7 @@ uint16_t bus::write(const uint16_t a, const bool word_mode, uint16_t value, cons DOLOG(debug, true, "write user %c PDR for %d: %o [%d]", is_d ? 'D' : 'I', page, value, word_mode); - return value; + return; } if (a >= 0177640 && a < 0177700) { bool is_d = is_11_34 ? false : (a & 16); @@ -691,25 +691,25 @@ uint16_t bus::write(const uint16_t a, const bool word_mode, uint16_t value, cons DOLOG(debug, true, "write user %c PAR for %d: %o (%07o)", is_d ? 'D' : 'I', page, word_mode ? value & 0xff : value, pages[003][is_d][page].par * 64); - return value; + return; } //// if (a == 0177746) { // cache control register // TODO - return value; + return; } if (a == 0177570) { // switch register switch_register = value; - return value; + return; } /////////// if (a == 0177374) { // TODO DOLOG(debug, true, "char: %c", value & 127); - return 128; + return; } if (a & 1) @@ -719,7 +719,7 @@ uint16_t bus::write(const uint16_t a, const bool word_mode, uint16_t value, cons // c -> busError(); - return value; + return; } uint32_t m_offset = calculate_physical_address(run_mode, a, true, true, false); @@ -730,8 +730,6 @@ uint16_t bus::write(const uint16_t a, const bool word_mode, uint16_t value, cons m->writeByte(m_offset, value); else m->writeWord(m_offset, value); - - return value; } uint16_t bus::readWord(const uint16_t a) @@ -744,9 +742,9 @@ uint16_t bus::peekWord(const uint16_t a) return read(a, false, false, true); } -uint16_t bus::writeWord(const uint16_t a, const uint16_t value) +void bus::writeWord(const uint16_t a, const uint16_t value) { - return write(a, false, value, false); + write(a, false, value, false); } uint16_t bus::readUnibusByte(const uint16_t a) diff --git a/bus.h b/bus.h index 0a6dbf2..918da6d 100644 --- a/bus.h +++ b/bus.h @@ -70,9 +70,9 @@ public: uint16_t readUnibusByte(const uint16_t a); - uint16_t write(const uint16_t a, const bool word_mode, uint16_t value, const bool use_prev); - uint8_t writeByte(const uint16_t a, const uint8_t value) { return write(a, true, value, false); } - uint16_t writeWord(const uint16_t a, const uint16_t value); + void write(const uint16_t a, const bool word_mode, uint16_t value, const bool use_prev); + void writeByte(const uint16_t a, const uint8_t value) { return write(a, true, value, false); } + void writeWord(const uint16_t a, const uint16_t value); void writeUnibusByte(const uint16_t a, const uint8_t value);