From dd3b1d9d66813869dc57f12b3d74a391643d4cda Mon Sep 17 00:00:00 2001 From: folkert van heusden Date: Sat, 11 Jun 2022 08:59:07 +0200 Subject: [PATCH] Renamed 'FIXME' to 'TODO' for a few cases: they're really TODOs and lgtm.com complains about them. --- bus.cpp | 6 +++--- console.cpp | 6 +++++- cpu.cpp | 4 ++-- cpu.h | 4 ++-- main.cpp | 4 ++-- rk05.cpp | 2 +- rk05.h | 1 - terminal.cpp | 13 +------------ tm-11.cpp | 12 ++++++------ 9 files changed, 22 insertions(+), 30 deletions(-) diff --git a/bus.cpp b/bus.cpp index 4730419..08159a6 100644 --- a/bus.cpp +++ b/bus.cpp @@ -530,7 +530,7 @@ uint16_t bus::write(const uint16_t a, const bool word_mode, uint16_t value, cons if (a == 0177772) { // PIR D(fprintf(stderr, "write set PIR: %o\n", value);) - PIR = value; // FIXME + PIR = value; // TODO return PIR; } @@ -665,7 +665,7 @@ uint16_t bus::write(const uint16_t a, const bool word_mode, uint16_t value, cons //// if (a == 0177746) { // cache control register - // FIXME + // TODO return value; } @@ -676,7 +676,7 @@ uint16_t bus::write(const uint16_t a, const bool word_mode, uint16_t value, cons /////////// - if (a == 0177374) { // FIXME + if (a == 0177374) { // TODO fprintf(stderr, "char: %c\n", value & 127); return 128; } diff --git a/console.cpp b/console.cpp index 3542b62..678f266 100644 --- a/console.cpp +++ b/console.cpp @@ -19,6 +19,9 @@ console::console(std::atomic_uint32_t *const stop_event, bus *const b) : console::~console() { + // done as well in subclasses but also here to + // stop lgtm.com complaining about it + stop_thread(); } void console::start_thread() @@ -126,7 +129,7 @@ std::string console::read_line(const std::string & prompt) str.clear(); } - else if (c >= 32 && c < 127) { + else if (c >= 32) { str += c; put_char(c); @@ -159,6 +162,7 @@ void console::put_char(const char c) put_char_ll(c); if (c == 0) { + // ignore these } else if (c == 13) tx = 0; diff --git a/cpu.cpp b/cpu.cpp index 3265be8..9c771a2 100644 --- a/cpu.cpp +++ b/cpu.cpp @@ -1060,7 +1060,7 @@ bool cpu::single_operand_instructions(const uint16_t instr) if (set_flags) { setPSW_n(SIGN(v, word_mode)); setPSW_z(IS_0(v, word_mode)); - setPSW_v(word_mode? (v & 0xff) == 0x80 : v == 0x8000); // FIXME? v/c flags? + setPSW_v(word_mode? (v & 0xff) == 0x80 : v == 0x8000); if (IS_0(vo, word_mode) && org_c) setPSW_c(true); @@ -1246,7 +1246,7 @@ bool cpu::single_operand_instructions(const uint16_t instr) setPSW_n(SIGN(v, word_mode)); setPSW_z(IS_0(v, word_mode)); - setPSW_c(SIGN(vl, word_mode)); // FIXME vl? + setPSW_c(SIGN(vl, word_mode)); setPSW_v(getPSW_n() ^ getPSW_c()); setRegister(dst_reg, false, v); diff --git a/cpu.h b/cpu.h index 7380f99..70a205e 100644 --- a/cpu.h +++ b/cpu.h @@ -130,8 +130,8 @@ public: void setStackPointer(const int which, const uint16_t value) { assert(which >= 0 && which < 4); sp[which] = value; } void setPC(const uint16_t value) { pc = value; } - uint16_t getRegister(const int nr) const { return getRegister(nr, false); } // FIXME remove - void setRegister(const int nr, const uint16_t v) { setRegister(nr, false, v); } // FIXME remove + uint16_t getRegister(const int nr) const { return getRegister(nr, false); } + void setRegister(const int nr, const uint16_t v) { setRegister(nr, false, v); } bool put_result(const uint16_t a, const uint8_t dst_mode, const uint8_t dst_reg, const bool word_mode, const uint16_t value); }; diff --git a/main.cpp b/main.cpp index 1e895b0..ac80912 100644 --- a/main.cpp +++ b/main.cpp @@ -27,12 +27,12 @@ std::atomic_uint32_t event { 0 }; std::atomic_bool *running { nullptr }; bool trace_output { false }; -std::atomic_bool sw { false }; +std::atomic_bool sigw_event { false }; void sw_handler(int s) { if (s == SIGWINCH) - sw = true; + sigw_event = true; else { fprintf(stderr, "Terminating...\n"); diff --git a/rk05.cpp b/rk05.cpp index cb76b86..e48caea 100644 --- a/rk05.cpp +++ b/rk05.cpp @@ -153,7 +153,7 @@ void rk05::writeWord(const uint16_t addr, uint16_t v) D(fprintf(stderr, "RK05 drive %d position sec %d surf %d cyl %d, reclen %zo, WRITE to %o, mem: %o\n", device, sector, surface, cylinder, reclen, diskoffb, memoff);) - uint32_t p = reclen; // FIXME + uint32_t p = reclen; for(size_t i=0; ireadUnibusByte(memoff + i); diff --git a/rk05.h b/rk05.h index d794580..2d54923 100644 --- a/rk05.h +++ b/rk05.h @@ -13,7 +13,6 @@ #endif -// FIXME namen van defines #define RK05_DS 0177400 // drive status #define RK05_ERROR 0177402 // error #define RK05_CS 0177404 // control status diff --git a/terminal.cpp b/terminal.cpp index 176265b..e838b17 100644 --- a/terminal.cpp +++ b/terminal.cpp @@ -36,10 +36,7 @@ void determine_terminal_size() void apply_mouse_setting(void) { - if (1) // FIXME (ignore_mouse) - mousemask(0, nullptr); - else - mousemask(BUTTON1_CLICKED | BUTTON1_DOUBLE_CLICKED | BUTTON3_CLICKED, nullptr); + mousemask(0, nullptr); } void init_ncurses(bool init_mouse) @@ -105,14 +102,6 @@ void mydoupdate() { update_panels(); -#if 0 // FIXME - else if (input_window) - { - wmove(input_window -> win, 0, ul_x); - setsyx(input_window -> y + 0, input_window -> x + ul_x); - } -#endif - doupdate(); } diff --git a/tm-11.cpp b/tm-11.cpp index 84c1285..8b52717 100644 --- a/tm-11.cpp +++ b/tm-11.cpp @@ -96,7 +96,7 @@ void tm_11::writeWord(const uint16_t addr, uint16_t v) D(printf("invoke %d\n", func);) if (func == 0) { // off-line - v = 128; // FIXME set error if error + v = 128; // TODO set error if error } else if (func == 1) { // read D(printf("reading %d bytes from offset %d\n", reclen, offset);) @@ -106,27 +106,27 @@ void tm_11::writeWord(const uint16_t addr, uint16_t v) m -> writeByte(registers[(TM_11_MTCMA - TM_11_BASE) / 2] + i, xfer_buffer[i]); offset += reclen; - v = 128; // FIXME set error if error + v = 128; // TODO set error if error } else if (func == 2) { // write for(int i=0; i readByte(registers[(TM_11_MTCMA - TM_11_BASE) / 2] + i); fwrite(xfer_buffer, 1, reclen, fh); offset += reclen; - v = 128; // FIXME + v = 128; // TODO } else if (func == 4) { // space forward offset += reclen; - v = 128; // FIXME + v = 128; // TODO } else if (func == 5) { // space backward if (offset >= reclen) offset -= reclen; - v = 128; // FIXME + v = 128; // TODO } else if (func == 7) { // rewind offset = 0; - v = 128; // FIXME set error if error + v = 128; // TODO set error if error } } }