From 2a834ac44f5c7c255037dd9bee01d04b0d4e92c8 Mon Sep 17 00:00:00 2001
From: Ross Wilson <rzzzwilson@gmail.com>
Date: Tue, 20 Oct 2015 13:00:41 +0700
Subject: [PATCH] Still fiddling with bugs

---
 vimlac/Makefile |  2 +-
 vimlac/cpu.c    | 27 ---------------------------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/vimlac/Makefile b/vimlac/Makefile
index 5f461a3..1cdadaf 100755
--- a/vimlac/Makefile
+++ b/vimlac/Makefile
@@ -1,4 +1,4 @@
-DEVFILES = cpu.o dcpu.o ptr.o ptp.o memory.o kb.o ttyin.o ttyout.o trace.o error.o log.o
+DEVFILES = cpu.o dcpu.o ptr.o ptp.o memory.o kb.o ttyin.o ttyout.o trace.o error.o log.o plist.o
 OFILES = vimlac.o $(DEVFILES)
 
 #CFLAGS=-fPIC -O2 -Wall -ansi -pedantic -std=c99 -g
diff --git a/vimlac/cpu.c b/vimlac/cpu.c
index 8435725..d8c9ae4 100755
--- a/vimlac/cpu.c
+++ b/vimlac/cpu.c
@@ -67,26 +67,6 @@ cpu_eff_address(WORD address, bool indirect)
     return address;
 }
 
-#ifdef JUNK
-def cpu_eff_address(self, address, indirect):
-    """Get an effective memory address.
-    
-    The address can be indirect, and may be through an
-    auto-increment address.
-    """
-    
-    # the Imlac can get into infinite defer loops, and so can we!
-    while indirect:
-        if ISAUTOINC(address):
-            # indirect on auto-inc register, add one to it before use
-            self.memory[address] = MASK_MEM(self.memory[address] + 1)
-        address = self.memory[address]
-        indirect = bool(address & 0100000)
-    
-    return address
-#endif
-
-
 
 /******************************************************************************
 Description : Function to start the main CPU.
@@ -254,13 +234,6 @@ i_JMP(bool indirect, WORD address)
     return (indirect) ? 3 : 2;
 }
 
-#ifdef JUNK
-    address = self.memory.eff_address(address, indirect)
-    self.PC = address & PCMASK
-    Trace.itrace('JMP', indirect, address)
-    return 3 if indirect else 2
-#endif
-
 
 /******************************************************************************
 Description : Emulate the DAC instruction.