X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fam2910%2FModelAm2910InstrPLA.java;fp=plugins%2Fnet.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fam2910%2FModelAm2910InstrPLA.java;h=c93c4e31c9db5a74858374b5c50f51125ea325b4;hb=66ec8ddc6e89cf0a41e8b82b279b241bbdde59f2;hp=a00fc302b8aa4d9bc2d6f08cb4148000c8905b0b;hpb=4acc1a56201838cc7073e6bf7ce61f9e014826ad;p=Mograsim.git

diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/ModelAm2910InstrPLA.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/ModelAm2910InstrPLA.java
index a00fc302..c93c4e31 100644
--- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/ModelAm2910InstrPLA.java
+++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/ModelAm2910InstrPLA.java
@@ -29,7 +29,7 @@ public class ModelAm2910InstrPLA extends SimpleRectangularHardcodedModelComponen
 		addPin(new Pin(model, this, "_PL", 1, PinUsage.OUTPUT, 5, 85), Position.TOP);
 		addPin(new Pin(model, this, "_MAP", 1, PinUsage.OUTPUT, 15, 85), Position.TOP);
 		addPin(new Pin(model, this, "_VECT", 1, PinUsage.OUTPUT, 25, 85), Position.TOP);
-		addPin(new Pin(model, this, "RWE", 1, PinUsage.OUTPUT, 30, 5), Position.LEFT);
+		addPin(new Pin(model, this, "RLD", 1, PinUsage.OUTPUT, 30, 5), Position.LEFT);
 		addPin(new Pin(model, this, "RDEC", 1, PinUsage.OUTPUT, 30, 15), Position.LEFT);
 		addPin(new Pin(model, this, "YD", 1, PinUsage.OUTPUT, 30, 25), Position.LEFT);
 		addPin(new Pin(model, this, "YR", 1, PinUsage.OUTPUT, 30, 35), Position.LEFT);
@@ -50,7 +50,7 @@ public class ModelAm2910InstrPLA extends SimpleRectangularHardcodedModelComponen
 		ReadWriteEnd _PL = readWriteEnds.get("_PL");
 		ReadWriteEnd _MAP = readWriteEnds.get("_MAP");
 		ReadWriteEnd _VECT = readWriteEnds.get("_VECT");
-		ReadWriteEnd RWE = readWriteEnds.get("RWE");
+		ReadWriteEnd RLD = readWriteEnds.get("RLD");
 		ReadWriteEnd RDEC = readWriteEnds.get("RDEC");
 		ReadWriteEnd YD = readWriteEnds.get("YD");
 		ReadWriteEnd YR = readWriteEnds.get("YR");
@@ -73,7 +73,7 @@ public class ModelAm2910InstrPLA extends SimpleRectangularHardcodedModelComponen
 				_PL.feedSignals(U);
 				_MAP.feedSignals(U);
 				_VECT.feedSignals(U);
-				RWE.feedSignals(U);
+				RLD.feedSignals(U);
 				RDEC.feedSignals(U);
 				YD.feedSignals(U);
 				YR.feedSignals(U);
@@ -86,7 +86,7 @@ public class ModelAm2910InstrPLA extends SimpleRectangularHardcodedModelComponen
 				_PL.feedSignals(X);
 				_MAP.feedSignals(X);
 				_VECT.feedSignals(X);
-				RWE.feedSignals(X);
+				RLD.feedSignals(X);
 				RDEC.feedSignals(X);
 				YD.feedSignals(X);
 				YR.feedSignals(X);
@@ -112,19 +112,19 @@ public class ModelAm2910InstrPLA extends SimpleRectangularHardcodedModelComponen
 			_VECT.feedSignals(_VECTVal);
 			if (IAsInt == 8 || IAsInt == 9 || IAsInt == 15)
 			{
-				RWE.feedSignals(Req0Val);
+				RLD.feedSignals(ZERO);
 				RDEC.feedSignals(Req0Val);// "forward" X/U/Z
 			} else if (IAsInt == 4)
 			{
-				RWE.feedSignals(PASSVal);
-				RDEC.feedSignals(PASSVal == ONE ? ZERO : PASSVal);// "forward" X/U/Z
+				RLD.feedSignals(PASSVal);// "forward" X/U/Z
+				RDEC.feedSignals(X);
 			} else if (IAsInt == 12)
 			{
-				RWE.feedSignals(ONE);
-				RDEC.feedSignals(ZERO);
+				RLD.feedSignals(ONE);
+				RDEC.feedSignals(X);
 			} else
 			{
-				RWE.feedSignals(ZERO);
+				RLD.feedSignals(ZERO);
 				RDEC.feedSignals(ZERO);
 			}
 			if (!PASSVal.isBinary())