Corrected incorrect correction of bit order

diff --git a/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdlatch4.java b/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdlatch4.java
index 61a239a..8da90e1 100644 (file)
--- a/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdlatch4.java
+++ b/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdlatch4.java
@@ -91,10 +91,10 @@ public class GUIdlatch4 extends SimpleRectangularSubmodelComponent
                        break;
                case "q":
                        BitVector newStateCasted = (BitVector) newState;
-                       setHighLevelState("q1", newStateCasted.getBit(3));
-                       setHighLevelState("q2", newStateCasted.getBit(2));
-                       setHighLevelState("q3", newStateCasted.getBit(1));
-                       setHighLevelState("q4", newStateCasted.getBit(0));
+                       setHighLevelState("q1", newStateCasted.getBit(0));
+                       setHighLevelState("q2", newStateCasted.getBit(1));
+                       setHighLevelState("q3", newStateCasted.getBit(2));
+                       setHighLevelState("q4", newStateCasted.getBit(3));
                        break;
                default:
                        super.setHighLevelState(stateID, newState);
@@ -120,7 +120,7 @@ public class GUIdlatch4 extends SimpleRectangularSubmodelComponent
                        Bit q2 = (Bit) getHighLevelState("q2");
                        Bit q3 = (Bit) getHighLevelState("q3");
                        Bit q4 = (Bit) getHighLevelState("q4");
-                       return BitVector.of(q4, q3, q2, q1);
+                       return BitVector.of(q1, q2, q3, q4);
                default:
                        return super.getHighLevelState(stateID);
                }

diff --git a/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIram4.java b/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIram4.java
index 4f7c303..d982f01 100644 (file)
--- a/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIram4.java
+++ b/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIram4.java
@@ -294,20 +294,20 @@ public class GUIram4 extends SimpleRectangularSubmodelComponent
                {
                case "q":
                        BitVector q0000 = (BitVector) getHighLevelState("c0000.q");
-                       BitVector q0001 = (BitVector) getHighLevelState("c0100.q");
-                       BitVector q0010 = (BitVector) getHighLevelState("c1000.q");
-                       BitVector q0011 = (BitVector) getHighLevelState("c1100.q");
-                       BitVector q0100 = (BitVector) getHighLevelState("c0001.q");
+                       BitVector q0001 = (BitVector) getHighLevelState("c0001.q");
+                       BitVector q0010 = (BitVector) getHighLevelState("c0010.q");
+                       BitVector q0011 = (BitVector) getHighLevelState("c0011.q");
+                       BitVector q0100 = (BitVector) getHighLevelState("c0100.q");
                        BitVector q0101 = (BitVector) getHighLevelState("c0101.q");
-                       BitVector q0110 = (BitVector) getHighLevelState("c1001.q");
-                       BitVector q0111 = (BitVector) getHighLevelState("c1101.q");
-                       BitVector q1000 = (BitVector) getHighLevelState("c0010.q");
-                       BitVector q1001 = (BitVector) getHighLevelState("c0110.q");
+                       BitVector q0110 = (BitVector) getHighLevelState("c0110.q");
+                       BitVector q0111 = (BitVector) getHighLevelState("c0111.q");
+                       BitVector q1000 = (BitVector) getHighLevelState("c1000.q");
+                       BitVector q1001 = (BitVector) getHighLevelState("c1001.q");
                        BitVector q1010 = (BitVector) getHighLevelState("c1010.q");
-                       BitVector q1011 = (BitVector) getHighLevelState("c1110.q");
-                       BitVector q1100 = (BitVector) getHighLevelState("c0011.q");
-                       BitVector q1101 = (BitVector) getHighLevelState("c1011.q");
-                       BitVector q1110 = (BitVector) getHighLevelState("c0111.q");
+                       BitVector q1011 = (BitVector) getHighLevelState("c1011.q");
+                       BitVector q1100 = (BitVector) getHighLevelState("c1100.q");
+                       BitVector q1101 = (BitVector) getHighLevelState("c1101.q");
+                       BitVector q1110 = (BitVector) getHighLevelState("c1110.q");
                        BitVector q1111 = (BitVector) getHighLevelState("c1111.q");
                        return q0000.concat(q0001).concat(q0010).concat(q0011).concat(q0100).concat(q0101).concat(q0110).concat(q0111).concat(q1000)
                                        .concat(q1001).concat(q1010).concat(q1011).concat(q1100).concat(q1101).concat(q1110).concat(q1111);
@@ -319,25 +319,25 @@ public class GUIram4 extends SimpleRectangularSubmodelComponent
                                switch (cellID)
                                {
                                case "c0000":
-                               case "c0100":
-                               case "c1000":
-                               case "c1100":
-                                       return cell00.getHighLevelState(cellID.substring(0, 3) + stateID.substring(indexOfDot));
                                case "c0001":
-                               case "c0101":
-                               case "c1001":
-                               case "c1101":
-                                       return cell01.getHighLevelState(cellID.substring(0, 3) + stateID.substring(indexOfDot));
                                case "c0010":
-                               case "c0110":
-                               case "c1010":
-                               case "c1110":
-                                       return cell10.getHighLevelState(cellID.substring(0, 3) + stateID.substring(indexOfDot));
                                case "c0011":
+                                       return cell00.getHighLevelState('c' + cellID.substring(3, 5) + stateID.substring(indexOfDot));
+                               case "c0100":
+                               case "c0101":
+                               case "c0110":
                                case "c0111":
+                                       return cell01.getHighLevelState('c' + cellID.substring(3, 5) + stateID.substring(indexOfDot));
+                               case "c1000":
+                               case "c1001":
+                               case "c1010":
                                case "c1011":
+                                       return cell10.getHighLevelState('c' + cellID.substring(3, 5) + stateID.substring(indexOfDot));
+                               case "c1100":
+                               case "c1101":
+                               case "c1110":
                                case "c1111":
-                                       return cell11.getHighLevelState(cellID.substring(0, 3) + stateID.substring(indexOfDot));
+                                       return cell11.getHighLevelState('c' + cellID.substring(3, 5) + stateID.substring(indexOfDot));
                                default:
                                        return super.getHighLevelState(stateID);
                                }
@@ -354,20 +354,20 @@ public class GUIram4 extends SimpleRectangularSubmodelComponent
                case "q":
                        BitVector newStateCasted = (BitVector) newState;
                        setHighLevelState("c0000.q", newStateCasted.subVector(0, 4));
-                       setHighLevelState("c0100.q", newStateCasted.subVector(4, 8));
-                       setHighLevelState("c1000.q", newStateCasted.subVector(8, 12));
-                       setHighLevelState("c1100.q", newStateCasted.subVector(12, 16));
-                       setHighLevelState("c0001.q", newStateCasted.subVector(16, 20));
+                       setHighLevelState("c0001.q", newStateCasted.subVector(4, 8));
+                       setHighLevelState("c0010.q", newStateCasted.subVector(8, 12));
+                       setHighLevelState("c0011.q", newStateCasted.subVector(12, 16));
+                       setHighLevelState("c0100.q", newStateCasted.subVector(16, 20));
                        setHighLevelState("c0101.q", newStateCasted.subVector(20, 24));
-                       setHighLevelState("c1001.q", newStateCasted.subVector(24, 28));
-                       setHighLevelState("c1101.q", newStateCasted.subVector(28, 32));
-                       setHighLevelState("c0010.q", newStateCasted.subVector(32, 36));
-                       setHighLevelState("c0110.q", newStateCasted.subVector(36, 40));
+                       setHighLevelState("c0110.q", newStateCasted.subVector(24, 28));
+                       setHighLevelState("c0111.q", newStateCasted.subVector(28, 32));
+                       setHighLevelState("c1000.q", newStateCasted.subVector(32, 36));
+                       setHighLevelState("c1001.q", newStateCasted.subVector(36, 40));
                        setHighLevelState("c1010.q", newStateCasted.subVector(40, 44));
-                       setHighLevelState("c1110.q", newStateCasted.subVector(44, 48));
-                       setHighLevelState("c0011.q", newStateCasted.subVector(48, 52));
-                       setHighLevelState("c1011.q", newStateCasted.subVector(52, 56));
-                       setHighLevelState("c0111.q", newStateCasted.subVector(56, 60));
+                       setHighLevelState("c1011.q", newStateCasted.subVector(44, 48));
+                       setHighLevelState("c1100.q", newStateCasted.subVector(48, 52));
+                       setHighLevelState("c1101.q", newStateCasted.subVector(52, 56));
+                       setHighLevelState("c1110.q", newStateCasted.subVector(56, 60));
                        setHighLevelState("c1111.q", newStateCasted.subVector(60, 64));
                        break;
                default:
@@ -378,28 +378,28 @@ public class GUIram4 extends SimpleRectangularSubmodelComponent
                                switch (cellID)
                                {
                                case "c0000":
-                               case "c0100":
-                               case "c1000":
-                               case "c1100":
-                                       cell00.setHighLevelState(cellID.substring(0, 3) + stateID.substring(indexOfDot), newState);
-                                       break;
                                case "c0001":
-                               case "c0101":
-                               case "c1001":
-                               case "c1101":
-                                       cell01.setHighLevelState(cellID.substring(0, 3) + stateID.substring(indexOfDot), newState);
-                                       break;
                                case "c0010":
-                               case "c0110":
-                               case "c1010":
-                               case "c1110":
-                                       cell10.setHighLevelState(cellID.substring(0, 3) + stateID.substring(indexOfDot), newState);
-                                       break;
                                case "c0011":
+                                       cell00.setHighLevelState('c' + cellID.substring(3, 5) + stateID.substring(indexOfDot), newState);
+                                       break;
+                               case "c0100":
+                               case "c0101":
+                               case "c0110":
                                case "c0111":
+                                       cell01.setHighLevelState('c' + cellID.substring(3, 5) + stateID.substring(indexOfDot), newState);
+                                       break;
+                               case "c1000":
+                               case "c1001":
+                               case "c1010":
                                case "c1011":
+                                       cell10.setHighLevelState('c' + cellID.substring(3, 5) + stateID.substring(indexOfDot), newState);
+                                       break;
+                               case "c1100":
+                               case "c1101":
+                               case "c1110":
                                case "c1111":
-                                       cell11.setHighLevelState(cellID.substring(0, 3) + stateID.substring(indexOfDot), newState);
+                                       cell11.setHighLevelState('c' + cellID.substring(3, 5) + stateID.substring(indexOfDot), newState);
                                        break;
                                default:
                                        super.setHighLevelState(stateID, newState);

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUICanvas.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUICanvas.java
index 08a40a4..8e01a16 100644 (file)
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUICanvas.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUICanvas.java
@@ -100,7 +100,7 @@ public class LogicUICanvas extends ZoomableCanvas
                radioBit.setText("Single bit");
                Button radioBitVector = new Button(radioGroup, SWT.RADIO);
                radioBitVector.setText("Bitvector");
-               new Label(debugShell, SWT.NONE).setText("Value string representation: ");
+               new Label(debugShell, SWT.NONE).setText("Value string representation: \n(Bit vectors: MSBit...LSBit)");
                Text valueText = new Text(debugShell, SWT.SINGLE | SWT.LEAD | SWT.BORDER);
                valueText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
                Button send = new Button(debugShell, SWT.PUSH);
@@ -121,7 +121,7 @@ public class LogicUICanvas extends ZoomableCanvas
                                if (radioBit.getSelection())
                                        value = Bit.parse(valueString);
                                else if (radioBitVector.getSelection())
-                                       value = BitVector.parse(valueString);
+                                       value = BitVector.parse(new StringBuilder(valueString).reverse().toString());
                                else
                                        throw new RuntimeException("No value type selected");
                                target.setHighLevelState(stateIDText.getText(), value);
@@ -138,7 +138,8 @@ public class LogicUICanvas extends ZoomableCanvas
                        {
                                if (componentSelector.getSelectionIndex() >= componentsByItemIndex.size())
                                        throw new RuntimeException("No valid component selected");
-                               output.setText("Success! Value: \r\n" + componentsByItemIndex.get(componentSelector.getSelectionIndex()).getHighLevelState(stateIDText.getText()));
+                               output.setText("Success! Value: \r\n"
+                                               + componentsByItemIndex.get(componentSelector.getSelectionIndex()).getHighLevelState(stateIDText.getText()));
                        }
                        catch (Exception x)
                        {