X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Ftables%2Fmi%2FIntegerEditingSupport.java;h=2cc130afa4b3c72e87548bb220f9f044329ff658;hb=648fc6e69e09fe4467cb6bac47934be1a7dcf0d6;hp=d3b48ce439d086cdc742bfcd83b98a920ca1041d;hpb=58babf45ae7d259a296656451d796dbe601377a4;p=Mograsim.git diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/IntegerEditingSupport.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/IntegerEditingSupport.java index d3b48ce4..2cc130af 100644 --- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/IntegerEditingSupport.java +++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/IntegerEditingSupport.java @@ -4,9 +4,11 @@ import java.math.BigInteger; import org.eclipse.jface.viewers.TableViewer; +import net.mograsim.machine.mi.MicroInstruction; import net.mograsim.machine.mi.MicroInstructionDefinition; import net.mograsim.machine.mi.parameters.IntegerClassification; import net.mograsim.machine.mi.parameters.IntegerImmediate; +import net.mograsim.machine.mi.parameters.MicroInstructionParameter; import net.mograsim.plugin.tables.DisplaySettings; import net.mograsim.plugin.tables.NumberCellEditingSupport; @@ -19,7 +21,7 @@ public class IntegerEditingSupport extends NumberCellEditingSupport public IntegerEditingSupport(TableViewer viewer, MicroInstructionDefinition miDef, int index, DisplaySettings displaySettings, InstructionTableContentProvider provider) { - super(viewer, displaySettings); + super(viewer, displaySettings, true); classification = (IntegerClassification) miDef.getParameterClassifications()[index]; this.index = index; this.provider = provider; @@ -29,7 +31,12 @@ public class IntegerEditingSupport extends NumberCellEditingSupport protected void setAsBigInteger(Object element, BigInteger value) { InstructionTableRow row = ((InstructionTableRow) element); - row.data.setParameter(index, new IntegerImmediate(value, classification.getExpectedBits())); + MicroInstructionParameter[] params = row.data.getCell(row.address).getParameters(); + IntegerImmediate newParam = new IntegerImmediate(classification, value, classification.getExpectedBits()); + if (params[index].equals(newParam)) + return; + params[index] = newParam; + row.data.setCell(row.address, MicroInstruction.create(params)); provider.update(row.address); // viewer.update(element, null); Does not do anything for some reason } @@ -37,7 +44,15 @@ public class IntegerEditingSupport extends NumberCellEditingSupport @Override protected BigInteger getAsBigInteger(Object element) { - return ((IntegerImmediate) ((InstructionTableRow) element).data.getParameter(index)).getValueAsBigInteger(); + InstructionTableRow row = ((InstructionTableRow) element); + return ((IntegerImmediate) row.data.getCell(row.address).getParameter(index)).getValueAsBigInteger(); + } + + @Override + public int getBitLength(Object element) + { + return ((InstructionTableRow) element).getData().getDefinition().getMicroInstructionDefinition().getParameterClassification(index) + .getExpectedBits(); } }