From cbe458788963913f90f815523c3d5a9f2fdfcfe5 Mon Sep 17 00:00:00 2001
From: Ivan Kosarev <ivan@kosarev.info>
Date: Wed, 29 Sep 2021 21:08:01 +0100
Subject: [PATCH] [#37] Represent ground and power lines directly as nodes.

---
 tests/z80sim/z80sim.py | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/tests/z80sim/z80sim.py b/tests/z80sim/z80sim.py
index a41694d..de606ef 100755
--- a/tests/z80sim/z80sim.py
+++ b/tests/z80sim/z80sim.py
@@ -107,7 +107,7 @@ def __load_transistors(self):
                     continue
 
                 # TODO: Why the original source does this?
-                if c1 in (self.__ngnd, self.__npwr):
+                if self.__nodes[c1] in (self.__gnd, self.__pwr):
                     c1, c2 = c2, c1
 
                 t = Transistor(id, gate, c1, c2)
@@ -123,8 +123,8 @@ def __load_defs(self):
         self.__load_node_names()
         self.__load_nodes()
 
-        self.__ngnd = self.__node_ids['vss']
-        self.__npwr = self.__node_ids['vcc']
+        self.__gnd = self.__nodes[self.__node_ids['vss']]
+        self.__pwr = self.__nodes[self.__node_ids['vcc']]
 
         self.__nclk = self.__node_ids['~clk']
 
@@ -144,7 +144,7 @@ def __load_defs(self):
     def __all_nodes(self):
         res = []
         for i in self.__nodes:
-            if i != self.__npwr and i != self.__ngnd:
+            if i != self.__pwr.id and i != self.__gnd.id:
                 res.append(i)
         return res
 
@@ -153,9 +153,7 @@ def __add_node_to_group(self, i):
             return
 
         self.__group.append(i)
-        if i == self.__ngnd:
-            return
-        if i == self.__npwr:
+        if self.__nodes[i] in (self.__gnd, self.__pwr):
             return
         for t in self.__nodes[i].c1c2s:
             if not t.on:
@@ -173,9 +171,9 @@ def __get_node_group(self, i):
 
     def __get_node_value(self):
         # 1. deal with power connections first
-        if self.__ngnd in self.__group:
+        if self.__gnd.id in self.__group:
             return False
-        if self.__npwr in self.__group:
+        if self.__pwr.id in self.__group:
             return True
 
         # 2. deal with pullup/pulldowns next
@@ -206,9 +204,7 @@ def __get_node_value(self):
         return max_state
 
     def __add_recalc_node(self, nn):
-        if nn == self.__ngnd:
-            return
-        if nn == self.__npwr:
+        if self.__nodes[nn] in (self.__gnd, self.__pwr):
             return
         if nn in self.__recalc_hash:
             return
@@ -230,9 +226,7 @@ def __turn_transistor_off(self, t):
         self.__add_recalc_node(t.c2)
 
     def __recalc_node(self, node):
-        if node == self.__ngnd:
-            return
-        if node == self.__npwr:
+        if self.__nodes[node] in (self.__gnd, self.__pwr):
             return
 
         self.__get_node_group(node)
@@ -300,8 +294,8 @@ def __init_chip(self):
         for n in self.__nodes.values():
             n.state = False
 
-        self.__nodes[self.__ngnd].state = False
-        self.__nodes[self.__npwr].state = True
+        self.__gnd.state = False
+        self.__pwr.state = True
 
         for t in self.__trans.values():
             t.on = False