From 4f2b9f4e6d6f384ce09ba2fe6a5c00202d6df6c5 Mon Sep 17 00:00:00 2001
From: Redo <A509DCFC@cock.li>
Date: Fri, 4 Nov 2022 18:43:50 -0600
Subject: [PATCH] make gate queue use c structs

---
 sim/simulation.lua | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/sim/simulation.lua b/sim/simulation.lua
index d6c8fd2..63f7515 100644
--- a/sim/simulation.lua
+++ b/sim/simulation.lua
@@ -246,15 +246,15 @@ function Simulation.connectport(sim, port)
 end
 
 -- Logic Critical
-function Simulation.queuegate(sim, gate)
-	sim.gatequeue[sim.num_gatequeue+1] = gate
+function Simulation.queuegate_c(sim, cgate)
+	sim.gatequeue[sim.num_gatequeue + 1] = cgate
 	sim.num_gatequeue = sim.num_gatequeue + 1
-	gate.in_queue[0] = 1
+	cgate.in_queue[0] = 1
 end
 
-function Simulation.queuegate_c(sim, cgate)
-	local gate = Simulation.gate_from_cgate(sim, cgate)
-	Simulation.queuegate(sim, gate)
+function Simulation.queuegate(sim, gate)
+	local cgate = gate.c
+	Simulation.queuegate_c(sim, cgate)
 end
 
 function Simulation.queuegate_safe(sim, gate)
@@ -263,6 +263,7 @@ function Simulation.queuegate_safe(sim, gate)
 	end
 end
 
+-- Logic Critical
 function Simulation.queuegatelater(sim, gate, delay)
 	local tick = sim.current_tick + delay
 	if sim.tickqueue[tick] == nil then
@@ -273,7 +274,6 @@ end
 
 function Simulation.queuegateinput(sim, gate, argv)
 	sim.inputqueue = sim.inputqueue or {}
-	--sim.inputqueue[gate] = argv
 	sim.inputqueue[gate] = sim.inputqueue[gate] or {}
 	table.insert(sim.inputqueue[gate], argv)
 end
@@ -307,7 +307,7 @@ end
 
 function Simulation.dequeuegate(sim, gate)
 	if gate.in_queue[0]~=0 then
-		array_remove(sim.gatequeue, gate, true)
+		array_remove(sim.gatequeue, gate.c, true)
 		sim.num_gatequeue = sim.num_gatequeue - 1
 		gate.in_queue[0] = 0
 	end
@@ -348,9 +348,8 @@ function Simulation.ticklogic(sim)
 	end
 	
 	for i = 1, sim.num_gatequeue do
-		local gate = sim.gatequeue[i]
-		local cgate = gate.c
-		gate = Simulation.gate_from_cgate(sim, cgate)
+		local cgate = sim.gatequeue[i]
+		local gate = Simulation.gate_from_cgate(sim, cgate)
 		gate.logic(gate)
 		cgate.in_queue[0] = 0
 		sim.gatequeue[i] = nil