projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GUIAm2904ShiftInstrDecode now outputs X for Don't Care instead of Z
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
src
/
net
/
mograsim
/
logic
/
model
/
examples
/
GUIComponentTestbench.java
diff --git
a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java
b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java
index
5781322
..
e5b24f1
100644
(file)
--- a/
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java
+++ b/
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java
@@
-25,8
+25,7
@@
public class GUIComponentTestbench
@SuppressWarnings("unused") // for GUIWires being created
public static void createTestbench(ViewModelModifiable model)
{
@SuppressWarnings("unused") // for GUIWires being created
public static void createTestbench(ViewModelModifiable model)
{
- GUIComponent comp = IndirectGUIComponentCreator.createComponent(model,
- "class:net.mograsim.logic.model.am2900.components.am2904.RegCTInstrDecode");
+ GUIComponent comp = IndirectGUIComponentCreator.createComponent(model, "file:components/am2904/GUIAm2904.json");
// guess which pins are outputs and which are inputs
// TODO this code exists four times... but it seems too "hacky" to put it in a helper class
// guess which pins are outputs and which are inputs
// TODO this code exists four times... but it seems too "hacky" to put it in a helper class
@@
-42,7
+41,7
@@
public class GUIComponentTestbench
outputPinNames.add(p.name);
} else
for (Pin p : comp.getPins().values())
outputPinNames.add(p.name);
} else
for (Pin p : comp.getPins().values())
- if (p.getRelX()
== 0
)
+ if (p.getRelX()
< comp.getWidth()
)
inputPinNames.add(p.name);
else
outputPinNames.add(p.name);
inputPinNames.add(p.name);
else
outputPinNames.add(p.name);