kw11 cleanups

avr11.cc

@@ -33,8 +33,6 @@ void setup(char * disk) {
     printf("Ready\n");
 }
 
-uint16_t instcounter;
-
 jmp_buf trapbuf;
 
 void loop0();

kb11.cc

@@ -748,8 +748,7 @@ void KB11::interrupt(uint8_t vec, uint8_t pri) {
 
 // pop the top interrupt off the itab.
 void KB11::popirq() {
-    uint8_t i;
-    for (i = 0; i < itab.size() - 1; i++) {
+    for (uint8_t i = 0; i < itab.size() - 1; i++) {
         itab[i] = itab[i + 1];
     }
     itab[itab.size() - 1].vec = 0;

kb11.h

@@ -26,8 +26,6 @@ enum {
 #define SA(x) (aget(S(x), L(x)))
 #define DA(x) (aget(D(x), L(x)))
 
-extern UNIBUS unibus;
-
 class KB11 {
   public:
     uint16_t PC;
@@ -66,7 +64,7 @@ class KB11 {
             PS |= (1 << 13) | (1 << 12);
         }
     }
-    
+
     struct intr {
         uint8_t vec;
         uint8_t pri;
@@ -78,8 +76,8 @@ class KB11 {
     UNIBUS unibus;
 
   private:
-    std::array<uint16_t,8> R; // R0-R8
-    
+    std::array<uint16_t, 8> R; // R0-R8
+
     bool N();
     bool Z();
     void setZ(const bool b);

kw11.cc

@@ -13,11 +13,16 @@ void kw11alarm(int) {
 
 KW11::KW11() {
     signal(SIGALRM, kw11alarm);
-    struct itimerval itv;
-    itv.it_interval.tv_sec = 0;
-    itv.it_interval.tv_usec = 20000;
-    itv.it_value.tv_sec = 0;
-    itv.it_value.tv_usec = 20000;
+    struct itimerval itv = {
+        .it_interval = {
+            .tv_sec = 0,
+            .tv_usec = 20000,
+        },
+        .it_value = {
+            .tv_sec = 0,
+            .tv_usec = 20000,
+        },
+    };
     setitimer(ITIMER_REAL, &itv, NULL);
 }
 

unibus.cc

@@ -127,7 +127,8 @@ uint16_t UNIBUS::read16(uint32_t a) {
     }
 
     printf("unibus: read from invalid address %06o\n", a);
-    return trap(INTBUS);
+    trap(INTBUS);
+    std::abort(); // not reached
 }
 
 void UNIBUS::reset() {