From d37fc2d7e8dcb265d13d5b9bd3ff0905679e3818 Mon Sep 17 00:00:00 2001
From: Ross Wilson <rzzzwilson@gmail.com>
Date: Sat, 5 Mar 2016 12:29:25 +0700
Subject: [PATCH] Reflect changes in LWC code

---
 pymlac/CPU.test    | 10 +++++-----
 pymlac/test_CPU.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pymlac/CPU.test b/pymlac/CPU.test
index e2d3777..9964bfb 100644
--- a/pymlac/CPU.test
+++ b/pymlac/CPU.test
@@ -9,10 +9,10 @@ setreg ac 0; setreg l 1; setmem 0100 [LAW 0377]; setreg pc 0100; RUN; checkcycle
 setreg ac 0; setreg l 0; setmem 0100 [LAW 0377]; setreg pc 0100; RUN; checkcycles 1; checkreg pc 0101; checkreg ac 0377
 
 # LWC
-setreg ac 0; setreg l 1; setmem 0100 [LWC 0]; setreg pc 0100; RUN; checkcycles 1; checkreg pc 0101; checkreg ac 0177777
-setreg ac 0; setreg l 0; setmem 0100 [LWC 0]; setreg pc 0100; RUN; checkcycles 1; checkreg pc 0101; checkreg ac 0177777
-setreg ac 0; setreg l 1; setmem 0100 [LWC 1]; setreg pc 0100; RUN; checkcycles 1; checkreg pc 0101; checkreg ac 0177776
-setreg ac 0; setreg l 0; setmem 0100 [LWC 1]; setreg pc 0100; RUN; checkcycles 1; checkreg pc 0101; checkreg ac 0177776
+setreg ac 0; setreg l 1; setmem 0100 [LWC 0]; setreg pc 0100; RUN; checkcycles 1; checkreg pc 0101; checkreg ac 0000000
+setreg ac 0; setreg l 0; setmem 0100 [LWC 0]; setreg pc 0100; RUN; checkcycles 1; checkreg pc 0101; checkreg ac 0000000
+setreg ac 0; setreg l 1; setmem 0100 [LWC 1]; setreg pc 0100; RUN; checkcycles 1; checkreg pc 0101; checkreg ac 0177777
+setreg ac 0; setreg l 0; setmem 0100 [LWC 1]; setreg pc 0100; RUN; checkcycles 1; checkreg pc 0101; checkreg ac 0177777
 
 # JMP
 setreg ac 012345; setreg l 1; setmem 0100 [JMP 0200]; setreg pc 0100; RUN; checkcycles 2; checkreg pc 0200
@@ -442,7 +442,7 @@ setreg ac 0; setreg pc 0100; mount ptp test.ptp
 	checkfile test.ptp
 setreg pc 0100; mount ptp test.ptp
         setmem 0100 [LWC 10|DAC 1|LAW 0|PSF|JMP 0103|PPC|IAC|ISZ 1|JMP 0103|HLT]
-        rununtil 0111; checkreg ac 013; checkreg pc 0111
+        rununtil 0111; checkreg ac 012; checkreg pc 0111
 	checkfile test.ptp
 # and lots of IOT instructions
 
diff --git a/pymlac/test_CPU.py b/pymlac/test_CPU.py
index 08144fd..8eab81f 100644
--- a/pymlac/test_CPU.py
+++ b/pymlac/test_CPU.py
@@ -251,7 +251,7 @@ class TestCPU(object):
 
         self.used_cycles= 0
         for _ in range(number):
-            cycles = self.cpu.execute_one_instruction()
+            (cycles, _) = self.cpu.execute_one_instruction()
             trace.itraceend(False)
             self.ptrptp.ptr_tick(cycles)
             self.ptrptp.ptp_tick(cycles)