From b1249d69d59c5f9606cd3c453ac877c6307ba609 Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Mon, 7 Oct 2019 02:04:52 +0200 Subject: [PATCH] Changed Modelram5_12's HLS-IDs to have a trailing .q --- .../mograsim/logic/model/am2900/components/Modelram5_12.java | 2 +- .../mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelram5_12.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelram5_12.java index 53c9960d..16c20776 100644 --- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelram5_12.java +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelram5_12.java @@ -86,7 +86,7 @@ public class Modelram5_12 extends SimpleRectangularHardcodedModelComponent return (bits[0] == ONE ? 4 : 0) + (bits[1] == ONE ? 2 : 0) + (bits[2] == ONE ? 1 : 0); } - Pattern stateIDPattern = Pattern.compile("c(0[10][10]|100)"); + Pattern stateIDPattern = Pattern.compile("c(0[10][10]|100).q"); @Override protected Object getHighLevelState(Object state, String stateID) diff --git a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java index 48b85698..ef763df2 100644 --- a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java +++ b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java @@ -139,7 +139,7 @@ public class TestableAm2910Impl implements TestableAm2910 case S_2: case S_3: case S_4: - return "stack.c" + BitVector.from(r.ordinal(), 3); + return "stack.c" + BitVector.from(r.ordinal(), 3) + ".q"; case SP: return "sp.q"; case PC: -- 2.17.1