From bdcf2b384a7cb416b18705bd63e6b3523d107d53 Mon Sep 17 00:00:00 2001 From: Redo0 Date: Sat, 5 Jun 2021 17:05:22 -0500 Subject: [PATCH] remove some error prints --- sim/gate.lua | 4 ++-- sim/group.lua | 2 +- sim/main.lua | 4 ++-- sim/simulation.lua | 5 ++++- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/sim/gate.lua b/sim/gate.lua index 7b28322..7db37b1 100644 --- a/sim/gate.lua +++ b/sim/gate.lua @@ -18,13 +18,13 @@ function Gate.addport(gate, port) Port.setgate(port, gate) end +-- Logic Critical function Gate.getportstate(gate, index) return gate.port_nets[index].state end +-- Logic Critical function Gate.setportstate(gate, index, state) - if type(state)~="number" then error("invalid state type - must be number (gate "..gate.objref..")") end - local port = gate.ports[index] if state ~= port.state then local group = port.group diff --git a/sim/group.lua b/sim/group.lua index 0a6b707..1264003 100644 --- a/sim/group.lua +++ b/sim/group.lua @@ -170,8 +170,8 @@ function Group.mergeinto(group, group2) Simulation.dequeuegroup(GSim, group) end +-- Logic Critical function Group.setstate(group, state) - if type(state)~="number" then error("group state type must be number") end if state ~= group.state then local sim = GSim diff --git a/sim/main.lua b/sim/main.lua index c933328..041ee46 100644 --- a/sim/main.lua +++ b/sim/main.lua @@ -328,8 +328,8 @@ while 1 do Simulation.tickinit(sim) Simulation.tickinput(sim) - for i = 1, OPT_TICK_MULT, 100 do - local ticksthis = math.min(OPT_TICK_MULT-i+1, 100) + for i = 1, OPT_TICK_MULT, 97 do + local ticksthis = math.min(OPT_TICK_MULT-i+1, 97) for j = 1, ticksthis do Simulation.ticklogic(sim) end diff --git a/sim/simulation.lua b/sim/simulation.lua index 58a7826..b36666b 100644 --- a/sim/simulation.lua +++ b/sim/simulation.lua @@ -235,6 +235,7 @@ function Simulation.connectport(sim, port) end end +-- Logic Critical function Simulation.queuegate(sim, gate) if not gate.in_queue then table.insert(sim.gatequeue, gate) @@ -260,6 +261,7 @@ function Simulation.queuegateinit(sim, gate) sim.initqueue[gate] = gate end +-- Logic Critical function Simulation.queuegroup(sim, group) if not group.in_queue then table.insert(sim.groupqueue, group) @@ -294,6 +296,7 @@ function Simulation.queuecallback(sim, gate, ...) sim.callbacks[gate.objref] = {...} end +-- Logic Critical function Simulation.ticklogic(sim) for k, group in ipairs(sim.groupqueue) do Group.update(group) @@ -309,7 +312,7 @@ function Simulation.ticklogic(sim) end for k, gate in ipairs(sim.gatequeue) do - Gate.logic(gate) + gate.logic(gate) gate.in_queue = false end sim.gatequeue = {}