From 7084594fa8fcae1c167232244a0a112711c65f7a Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Mon, 13 Apr 2020 12:43:41 +0200 Subject: [PATCH] Changed incrementer layout to have the MSB on top --- .../logic/model/am2900/components/Am2900.json | 2 +- .../am2900/components/am2910/Am2910.json | 8 +- .../model/am2900/components/halfadder.json | 77 +++++++------ .../logic/model/am2900/components/inc12.json | 68 ++++++------ .../logic/model/am2900/components/inc16.json | 66 ++++++------ .../logic/model/am2900/components/inc4.json | 102 +++++++++--------- 6 files changed, 166 insertions(+), 157 deletions(-) diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json index ceb1351f..b1c31270 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json @@ -3621,7 +3621,7 @@ "path": [ { "x": 330.0, - "y": 120.0 + "y": 145.0 }, { "x": 330.0, diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json index 6e08f810..59b48acd 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json @@ -298,7 +298,7 @@ "name": "inc12#0", "pos": { "x": 255.0, - "y": 165.0 + "y": 170.0 } }, { @@ -981,15 +981,15 @@ "path": [ { "x": 250.0, - "y": 170.0 + "y": 190.0 }, { "x": 250.0, - "y": 160.0 + "y": 200.0 }, { "x": 290.0, - "y": 160.0 + "y": 200.0 }, { "x": 290.0, diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json index 63eb1ca8..2888e909 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json @@ -5,7 +5,7 @@ { "location": { "x": 0.0, - "y": 5.0 + "y": 15.0 }, "name": "A", "logicWidth": 1, @@ -14,7 +14,7 @@ { "location": { "x": 0.0, - "y": 15.0 + "y": 25.0 }, "name": "B", "logicWidth": 1, @@ -32,7 +32,7 @@ { "location": { "x": 0.0, - "y": 25.0 + "y": 5.0 }, "name": "Z", "logicWidth": 1, @@ -47,7 +47,7 @@ "name": "NandGate#0", "pos": { "x": 25.0, - "y": 32.5 + "y": 7.5 }, "params": 1 }, @@ -56,7 +56,7 @@ "name": "WireCrossPoint#0", "pos": { "x": 19.0, - "y": 36.5 + "y": 21.5 }, "params": 1 }, @@ -65,7 +65,7 @@ "name": "halfadder_invz#0", "pos": { "x": 10.0, - "y": 5.0 + "y": 35.0 } } ], @@ -83,15 +83,15 @@ "path": [ { "x": 50.0, - "y": 20.0 + "y": 50.0 }, { "x": 50.0, - "y": 27.5 + "y": 30.0 }, { "x": 20.0, - "y": 27.5 + "y": 30.0 } ] }, @@ -105,7 +105,12 @@ "pinName": "A" }, "name": "unnamedWire#1", - "path": [] + "path": [ + { + "x": 20.0, + "y": 12.5 + } + ] }, { "pin1": { @@ -117,12 +122,7 @@ "pinName": "B" }, "name": "unnamedWire#2", - "path": [ - { - "x": 20.0, - "y": 47.5 - } - ] + "path": [] }, { "pin1": { @@ -134,7 +134,16 @@ "pinName": "A" }, "name": "unnamedWire#3", - "path": [] + "path": [ + { + "x": 5.0, + "y": 30.0 + }, + { + "x": 5.0, + "y": 40.0 + } + ] }, { "pin1": { @@ -146,16 +155,7 @@ "pinName": "B" }, "name": "unnamedWire#4", - "path": [ - { - "x": 5.0, - "y": 30.0 - }, - { - "x": 5.0, - "y": 20.0 - } - ] + "path": [] }, { "pin1": { @@ -170,19 +170,19 @@ "path": [ { "x": 50.0, - "y": 42.5 + "y": 17.5 }, { "x": 50.0, - "y": 55.0 + "y": 5.0 }, { - "x": 15.0, - "y": 55.0 + "x": 5.0, + "y": 5.0 }, { - "x": 15.0, - "y": 50.0 + "x": 5.0, + "y": 10.0 } ] }, @@ -196,7 +196,16 @@ "pinName": "Y" }, "name": "unnamedWire#6", - "path": [] + "path": [ + { + "x": 55.0, + "y": 40.0 + }, + { + "x": 55.0, + "y": 10.0 + } + ] } ], "version": "0.1.1" diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc12.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc12.json index bcb0ff46..079dff76 100755 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc12.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc12.json @@ -5,7 +5,7 @@ { "location": { "x": 0.0, - "y": 15.0 + "y": 10.0 }, "name": "A", "logicWidth": 12, @@ -14,7 +14,7 @@ { "location": { "x": 0.0, - "y": 5.0 + "y": 20.0 }, "name": "CI", "logicWidth": 1, @@ -23,7 +23,7 @@ { "location": { "x": 20.0, - "y": 15.0 + "y": 10.0 }, "name": "Y", "logicWidth": 12, @@ -38,11 +38,11 @@ "name": "Splitter#0", "pos": { "x": 7.5, - "y": 10.0 + "y": 5.0 }, "params": { "logicWidth": 12, - "orientation": "RIGHT_ALT" + "orientation": "RIGHT" } }, { @@ -50,11 +50,11 @@ "name": "Splitter#1", "pos": { "x": 82.5, - "y": 10.0 + "y": 5.0 }, "params": { "logicWidth": 12, - "orientation": "LEFT_ALT" + "orientation": "LEFT" } }, { @@ -62,11 +62,11 @@ "name": "Splitter#2", "pos": { "x": 22.5, - "y": 10.0 + "y": 85.0 }, "params": { "logicWidth": 4, - "orientation": "LEFT_ALT" + "orientation": "LEFT" } }, { @@ -74,11 +74,11 @@ "name": "Splitter#3", "pos": { "x": 22.5, - "y": 50.0 + "y": 45.0 }, "params": { "logicWidth": 4, - "orientation": "LEFT_ALT" + "orientation": "LEFT" } }, { @@ -86,11 +86,11 @@ "name": "Splitter#4", "pos": { "x": 22.5, - "y": 90.0 + "y": 5.0 }, "params": { "logicWidth": 4, - "orientation": "LEFT_ALT" + "orientation": "LEFT" } }, { @@ -98,11 +98,11 @@ "name": "Splitter#5", "pos": { "x": 67.5, - "y": 10.0 + "y": 85.0 }, "params": { "logicWidth": 4, - "orientation": "RIGHT_ALT" + "orientation": "RIGHT" } }, { @@ -110,11 +110,11 @@ "name": "Splitter#6", "pos": { "x": 67.5, - "y": 50.0 + "y": 45.0 }, "params": { "logicWidth": 4, - "orientation": "RIGHT_ALT" + "orientation": "RIGHT" } }, { @@ -122,11 +122,11 @@ "name": "Splitter#7", "pos": { "x": 67.5, - "y": 90.0 + "y": 5.0 }, "params": { "logicWidth": 4, - "orientation": "RIGHT_ALT" + "orientation": "RIGHT" } }, { @@ -134,7 +134,7 @@ "name": "inc4#0", "pos": { "x": 42.5, - "y": 10.0 + "y": 85.0 } }, { @@ -142,7 +142,7 @@ "name": "inc4#1", "pos": { "x": 42.5, - "y": 50.0 + "y": 45.0 } }, { @@ -150,7 +150,7 @@ "name": "inc4#2", "pos": { "x": 42.5, - "y": 90.0 + "y": 5.0 } } ], @@ -168,19 +168,19 @@ "path": [ { "x": 5.0, - "y": 25.0 + "y": 100.0 }, { "x": 5.0, - "y": 5.0 + "y": 120.0 }, { "x": 37.5, - "y": 5.0 + "y": 120.0 }, { "x": 37.5, - "y": 15.0 + "y": 110.0 } ] }, @@ -269,11 +269,11 @@ "path": [ { "x": 5.0, - "y": 75.0 + "y": 50.0 }, { "x": 5.0, - "y": 65.0 + "y": 60.0 } ] }, @@ -434,11 +434,11 @@ "path": [ { "x": 37.5, - "y": 35.0 + "y": 90.0 }, { "x": 37.5, - "y": 55.0 + "y": 70.0 } ] }, @@ -455,11 +455,11 @@ "path": [ { "x": 37.5, - "y": 75.0 + "y": 50.0 }, { "x": 37.5, - "y": 95.0 + "y": 30.0 } ] }, @@ -500,11 +500,11 @@ "path": [ { "x": 95.0, - "y": 65.0 + "y": 60.0 }, { "x": 95.0, - "y": 75.0 + "y": 50.0 } ] }, diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc16.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc16.json index 07609bbd..eee630ac 100755 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc16.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc16.json @@ -14,7 +14,7 @@ { "location": { "x": 0.0, - "y": 5.0 + "y": 30.0 }, "name": "CI", "logicWidth": 1, @@ -42,7 +42,7 @@ }, "params": { "logicWidth": 16, - "orientation": "RIGHT_ALT" + "orientation": "RIGHT" } }, { @@ -54,7 +54,7 @@ }, "params": { "logicWidth": 16, - "orientation": "LEFT_ALT" + "orientation": "LEFT" } }, { @@ -62,11 +62,11 @@ "name": "Splitter#2", "pos": { "x": 22.5, - "y": 10.0 + "y": 130.0 }, "params": { "logicWidth": 4, - "orientation": "LEFT_ALT" + "orientation": "LEFT" } }, { @@ -74,11 +74,11 @@ "name": "Splitter#3", "pos": { "x": 22.5, - "y": 50.0 + "y": 90.0 }, "params": { "logicWidth": 4, - "orientation": "LEFT_ALT" + "orientation": "LEFT" } }, { @@ -86,11 +86,11 @@ "name": "Splitter#4", "pos": { "x": 22.5, - "y": 90.0 + "y": 50.0 }, "params": { "logicWidth": 4, - "orientation": "LEFT_ALT" + "orientation": "LEFT" } }, { @@ -98,11 +98,11 @@ "name": "Splitter#5", "pos": { "x": 22.5, - "y": 130.0 + "y": 10.0 }, "params": { "logicWidth": 4, - "orientation": "LEFT_ALT" + "orientation": "LEFT" } }, { @@ -110,11 +110,11 @@ "name": "Splitter#6", "pos": { "x": 67.5, - "y": 10.0 + "y": 130.0 }, "params": { "logicWidth": 4, - "orientation": "RIGHT_ALT" + "orientation": "RIGHT" } }, { @@ -122,11 +122,11 @@ "name": "Splitter#7", "pos": { "x": 67.5, - "y": 50.0 + "y": 90.0 }, "params": { "logicWidth": 4, - "orientation": "RIGHT_ALT" + "orientation": "RIGHT" } }, { @@ -134,11 +134,11 @@ "name": "Splitter#8", "pos": { "x": 67.5, - "y": 90.0 + "y": 50.0 }, "params": { "logicWidth": 4, - "orientation": "RIGHT_ALT" + "orientation": "RIGHT" } }, { @@ -146,11 +146,11 @@ "name": "Splitter#9", "pos": { "x": 67.5, - "y": 130.0 + "y": 10.0 }, "params": { "logicWidth": 4, - "orientation": "RIGHT_ALT" + "orientation": "RIGHT" } }, { @@ -158,7 +158,7 @@ "name": "inc4#0", "pos": { "x": 42.5, - "y": 10.0 + "y": 130.0 } }, { @@ -166,7 +166,7 @@ "name": "inc4#1", "pos": { "x": 42.5, - "y": 50.0 + "y": 90.0 } }, { @@ -174,7 +174,7 @@ "name": "inc4#2", "pos": { "x": 42.5, - "y": 90.0 + "y": 50.0 } }, { @@ -182,7 +182,7 @@ "name": "inc4#3", "pos": { "x": 42.5, - "y": 130.0 + "y": 10.0 } } ], @@ -200,19 +200,19 @@ "path": [ { "x": 5.0, - "y": 25.0 + "y": 150.0 }, { "x": 5.0, - "y": 5.0 + "y": 165.0 }, { "x": 37.5, - "y": 5.0 + "y": 165.0 }, { "x": 37.5, - "y": 15.0 + "y": 155.0 } ] }, @@ -538,11 +538,11 @@ "path": [ { "x": 37.5, - "y": 35.0 + "y": 135.0 }, { "x": 37.5, - "y": 55.0 + "y": 115.0 } ] }, @@ -559,11 +559,11 @@ "path": [ { "x": 37.5, - "y": 75.0 + "y": 95.0 }, { "x": 37.5, - "y": 95.0 + "y": 75.0 } ] }, @@ -580,11 +580,11 @@ "path": [ { "x": 37.5, - "y": 115.0 + "y": 55.0 }, { "x": 37.5, - "y": 135.0 + "y": 35.0 } ] }, diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc4.json index 9e1126b0..a6c81064 100755 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc4.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc4.json @@ -14,7 +14,7 @@ { "location": { "x": 0.0, - "y": 5.0 + "y": 25.0 }, "name": "CI", "logicWidth": 1, @@ -32,7 +32,7 @@ { "location": { "x": 0.0, - "y": 25.0 + "y": 5.0 }, "name": "Z", "logicWidth": 1, @@ -51,7 +51,7 @@ }, "params": { "logicWidth": 4, - "orientation": "RIGHT_ALT" + "orientation": "RIGHT" } }, { @@ -63,7 +63,7 @@ }, "params": { "logicWidth": 4, - "orientation": "LEFT_ALT" + "orientation": "LEFT" } }, { @@ -71,7 +71,7 @@ "name": "halfadder#0", "pos": { "x": 40.0, - "y": 5.0 + "y": 110.0 } }, { @@ -79,7 +79,7 @@ "name": "halfadder#1", "pos": { "x": 40.0, - "y": 40.0 + "y": 75.0 } }, { @@ -87,7 +87,7 @@ "name": "halfadder#2", "pos": { "x": 40.0, - "y": 75.0 + "y": 40.0 } }, { @@ -95,7 +95,7 @@ "name": "halfadder#3", "pos": { "x": 40.0, - "y": 110.0 + "y": 5.0 } } ], @@ -107,17 +107,17 @@ }, "pin2": { "compName": "halfadder#1", - "pinName": "A" + "pinName": "B" }, "name": "unnamedWire#0", "path": [ { "x": 35.0, - "y": 30.0 + "y": 115.0 }, { "x": 35.0, - "y": 45.0 + "y": 100.0 } ] }, @@ -128,17 +128,17 @@ }, "pin2": { "compName": "halfadder#2", - "pinName": "A" + "pinName": "B" }, "name": "unnamedWire#1", "path": [ { "x": 35.0, - "y": 65.0 + "y": 80.0 }, { "x": 35.0, - "y": 80.0 + "y": 65.0 } ] }, @@ -149,17 +149,17 @@ }, "pin2": { "compName": "halfadder#3", - "pinName": "A" + "pinName": "B" }, "name": "unnamedWire#2", "path": [ { "x": 35.0, - "y": 100.0 + "y": 45.0 }, { "x": 35.0, - "y": 115.0 + "y": 30.0 } ] }, @@ -170,17 +170,17 @@ }, "pin2": { "compName": "halfadder#0", - "pinName": "B" + "pinName": "A" }, "name": "unnamedWire#3", "path": [ { "x": 20.0, - "y": 60.0 + "y": 90.0 }, { "x": 20.0, - "y": 20.0 + "y": 125.0 } ] }, @@ -191,17 +191,17 @@ }, "pin2": { "compName": "halfadder#1", - "pinName": "B" + "pinName": "A" }, "name": "unnamedWire#4", "path": [ { "x": 25.0, - "y": 70.0 + "y": 80.0 }, { "x": 25.0, - "y": 55.0 + "y": 90.0 } ] }, @@ -212,17 +212,17 @@ }, "pin2": { "compName": "halfadder#2", - "pinName": "B" + "pinName": "A" }, "name": "unnamedWire#5", "path": [ { "x": 25.0, - "y": 80.0 + "y": 70.0 }, { "x": 25.0, - "y": 90.0 + "y": 55.0 } ] }, @@ -233,17 +233,17 @@ }, "pin2": { "compName": "halfadder#3", - "pinName": "B" + "pinName": "A" }, "name": "unnamedWire#6", "path": [ { "x": 20.0, - "y": 90.0 + "y": 60.0 }, { "x": 20.0, - "y": 125.0 + "y": 20.0 } ] }, @@ -260,11 +260,11 @@ "path": [ { "x": 80.0, - "y": 60.0 + "y": 90.0 }, { "x": 80.0, - "y": 10.0 + "y": 115.0 } ] }, @@ -278,16 +278,7 @@ "pinName": "O1" }, "name": "unnamedWire#8", - "path": [ - { - "x": 75.0, - "y": 45.0 - }, - { - "x": 75.0, - "y": 70.0 - } - ] + "path": [] }, { "pin1": { @@ -299,7 +290,16 @@ "pinName": "O2" }, "name": "unnamedWire#9", - "path": [] + "path": [ + { + "x": 75.0, + "y": 45.0 + }, + { + "x": 75.0, + "y": 70.0 + } + ] }, { "pin1": { @@ -313,12 +313,12 @@ "name": "unnamedWire#10", "path": [ { - "x": 75.0, - "y": 90.0 + "x": 80.0, + "y": 60.0 }, { - "x": 75.0, - "y": 115.0 + "x": 80.0, + "y": 10.0 } ] }, @@ -341,17 +341,17 @@ }, "pin2": { "compName": "halfadder#0", - "pinName": "A" + "pinName": "B" }, "name": "unnamedWire#12", "path": [ { "x": 10.0, - "y": 25.0 + "y": 125.0 }, { "x": 10.0, - "y": 10.0 + "y": 135.0 } ] }, @@ -380,11 +380,11 @@ "path": [ { "x": 10.0, - "y": 135.0 + "y": 10.0 }, { "x": 10.0, - "y": 125.0 + "y": 25.0 } ] } -- 2.17.1