From 0a7480e192f9710432f4945923cc739ec51be9b8 Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Mon, 3 Jun 2019 14:12:35 +0200 Subject: [PATCH] Wires now can have a name --- .../src/net/mograsim/logic/core/wires/Wire.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java index b26111f5..bae4cb41 100644 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java +++ b/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java @@ -21,6 +21,7 @@ import net.mograsim.logic.core.types.BitVector.BitVectorMutator; */ public class Wire { + public final String name; private BitVector values; public final int travelTime; private List attached = new ArrayList<>(); @@ -29,10 +30,16 @@ public class Wire Timeline timeline; public Wire(Timeline timeline, int length, int travelTime) + { + this(timeline, length, travelTime, null); + } + + public Wire(Timeline timeline, int length, int travelTime, String name) { if (length < 1) throw new IllegalArgumentException( String.format("Tried to create an array of wires with length %d, but a length of less than 1 makes no sense.", length)); + this.name = name; this.timeline = timeline; this.length = length; this.travelTime = travelTime; @@ -491,7 +498,8 @@ public class Wire @Override public String toString() { - return String.format("wire 0x%08x value: %s inputs: %s", hashCode(), values, inputs); + String name = this.name == null ? String.format("0x%08x", hashCode()) : this.name; + return String.format("wire %s value: %s inputs: %s", name, values, inputs); } public static ReadEnd[] extractEnds(Wire[] w) -- 2.17.1