projects
/
Mograsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3e34976
)
Changed pin names and and a pin coordinate
author
Daniel Kirschten
<daniel.kirschten@gmx.de>
Sat, 10 Aug 2019 18:42:19 +0000
(20:42 +0200)
committer
Daniel Kirschten
<daniel.kirschten@gmx.de>
Sat, 10 Aug 2019 18:42:19 +0000
(20:42 +0200)
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUInor12.java
patch
|
blob
|
history
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910RegCntr.java
patch
|
blob
|
history
diff --git
a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUInor12.java
b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUInor12.java
index
6149994
..
5c95035
100644
(file)
--- a/
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUInor12.java
+++ b/
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUInor12.java
@@
-24,7
+24,7
@@
public class GUInor12 extends SimpleRectangularHardcodedGUIComponent
super(model, name, "=0");
setSize(35, 20);
addPin(new Pin(this, "D", 12, 0, 10), Usage.INPUT, Position.RIGHT);
super(model, name, "=0");
setSize(35, 20);
addPin(new Pin(this, "D", 12, 0, 10), Usage.INPUT, Position.RIGHT);
- addPin(new Pin(this, "Y", 1, 3
0
, 10), Usage.OUTPUT, Position.LEFT);
+ addPin(new Pin(this, "Y", 1, 3
5
, 10), Usage.OUTPUT, Position.LEFT);
}
@Override
}
@Override
diff --git
a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910RegCntr.java
b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910RegCntr.java
index
3c1ca2e
..
baf456a
100644
(file)
--- a/
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910RegCntr.java
+++ b/
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910RegCntr.java
@@
-24,8
+24,8
@@
public class GUIAm2910RegCntr extends SimpleRectangularHardcodedGUIComponent
setSize(40, 40);
addPin(new Pin(this, "D", 12, 20, 0), Usage.INPUT, Position.BOTTOM);
addPin(new Pin(this, "_RLD", 1, 0, 5), Usage.INPUT, Position.RIGHT);
setSize(40, 40);
addPin(new Pin(this, "D", 12, 20, 0), Usage.INPUT, Position.BOTTOM);
addPin(new Pin(this, "_RLD", 1, 0, 5), Usage.INPUT, Position.RIGHT);
- addPin(new Pin(this, "
R
WE", 1, 0, 20), Usage.INPUT, Position.RIGHT);
- addPin(new Pin(this, "
R
DEC", 1, 0, 30), Usage.INPUT, Position.RIGHT);
+ addPin(new Pin(this, "WE", 1, 0, 20), Usage.INPUT, Position.RIGHT);
+ addPin(new Pin(this, "DEC", 1, 0, 30), Usage.INPUT, Position.RIGHT);
addPin(new Pin(this, "C", 1, 40, 20), Usage.INPUT, Position.LEFT);
addPin(new Pin(this, "Y", 12, 20, 40), Usage.OUTPUT, Position.TOP);
}
addPin(new Pin(this, "C", 1, 40, 20), Usage.INPUT, Position.LEFT);
addPin(new Pin(this, "Y", 12, 20, 40), Usage.OUTPUT, Position.TOP);
}
@@
-42,8
+42,8
@@
public class GUIAm2910RegCntr extends SimpleRectangularHardcodedGUIComponent
ReadEnd D = readEnds.get("D");
ReadEnd _RLD = readEnds.get("_RLD");
ReadEnd D = readEnds.get("D");
ReadEnd _RLD = readEnds.get("_RLD");
- ReadEnd
RWE = readEnds.get("R
WE");
- ReadEnd
RDEC = readEnds.get("R
DEC");
+ ReadEnd
WE = readEnds.get("
WE");
+ ReadEnd
DEC = readEnds.get("
DEC");
ReadEnd C = readEnds.get("C");
ReadWriteEnd Y = readWriteEnds.get("Y");
ReadEnd C = readEnds.get("C");
ReadWriteEnd Y = readWriteEnds.get("Y");
@@
-53,9
+53,9
@@
public class GUIAm2910RegCntr extends SimpleRectangularHardcodedGUIComponent
// TODO handle U/X/Z
if (oldCVal == ZERO && CVal == ONE)
{
// TODO handle U/X/Z
if (oldCVal == ZERO && CVal == ONE)
{
- if ((
RDEC.getValue() == ZERO && R
WE.getValue() == ONE) || _RLD.getValue() == ZERO)
+ if ((
DEC.getValue() == ZERO &&
WE.getValue() == ONE) || _RLD.getValue() == ZERO)
System.arraycopy(D.getValues().getBits(), 0, QC, 0, 12);
System.arraycopy(D.getValues().getBits(), 0, QC, 0, 12);
- else if (
R
WE.getValue() == ONE)
+ else if (WE.getValue() == ONE)
{
Bit carry = Bit.ZERO;
// TODO extract to helper. This code almost also exists in GUIinc12.
{
Bit carry = Bit.ZERO;
// TODO extract to helper. This code almost also exists in GUIinc12.