projects
/
Mograsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5ab24a2
)
Made Am2900 a standard component; HLSShell no longer opens per default
author
Daniel Kirschten
<daniel.kirschten@gmx.de>
Sun, 8 Sep 2019 15:45:58 +0000
(17:45 +0200)
committer
Daniel Kirschten
<daniel.kirschten@gmx.de>
Sun, 8 Sep 2019 15:45:58 +0000
(17:45 +0200)
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ModelComponentTestbench.java
patch
|
blob
|
history
net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java
patch
|
blob
|
history
diff --git
a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json
b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json
index
bcfae4a
..
3df19d7
100644
(file)
--- a/
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json
+++ b/
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json
@@
-12,6
+12,7
@@
mograsim version: 0.1.3
"ram5_12": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.Modelram5_12",
"sel4_12": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.Modelsel4_12",
"ram5_12": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.Modelram5_12",
"sel4_12": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.Modelsel4_12",
+ "Am2900": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/Am2900.json",
"Am2901": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/Am2901.json",
"Am2901ALUFuncDecode": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json",
"Am2901ALUInclDecode": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json",
"Am2901": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/Am2901.json",
"Am2901ALUFuncDecode": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json",
"Am2901ALUInclDecode": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json",
diff --git
a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ModelComponentTestbench.java
b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ModelComponentTestbench.java
index
38d362e
..
1e654c8
100644
(file)
--- a/
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ModelComponentTestbench.java
+++ b/
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ModelComponentTestbench.java
@@
-26,8
+26,7
@@
public class ModelComponentTestbench
public static void createTestbench(LogicModelModifiable model)
{
Am2900Loader.setup();
public static void createTestbench(LogicModelModifiable model)
{
Am2900Loader.setup();
- ModelComponent comp = IndirectModelComponentCreator.createComponent(model,
- "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff16_invwe.json");
+ ModelComponent comp = IndirectModelComponentCreator.createComponent(model, "Am2900");
List<String> inputPinNames = new ArrayList<>();
List<String> outputPinNames = new ArrayList<>();
List<String> inputPinNames = new ArrayList<>();
List<String> outputPinNames = new ArrayList<>();
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java
index
812f401
..
15346c6
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java
@@
-38,7
+38,7
@@
import net.mograsim.preferences.Preferences;
*/
public class LogicUICanvas extends ZoomableCanvas
{
*/
public class LogicUICanvas extends ZoomableCanvas
{
- private static final boolean OPEN_DEBUG_SETHIGHLEVELSTATE_SHELL =
tru
e;
+ private static final boolean OPEN_DEBUG_SETHIGHLEVELSTATE_SHELL =
fals
e;
private final LogicModel model;
private final LogicModel model;