X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Ftables%2Fmi%2FInstructionView.java;h=3af070f301cbd8b6a28f4b362ba41b788a3b04aa;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=846d9abf07aac0e69c85e1e1470bda7b6a408be6;hpb=62d703a95cafb4e98b4c3ffc305fb0224a6aec71;p=Mograsim.git diff --git a/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java b/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java index 846d9abf..3af070f3 100644 --- a/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java +++ b/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java @@ -2,9 +2,10 @@ package net.mograsim.plugin.tables.mi; import java.io.File; import java.io.IOException; +import java.util.Optional; +import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.jface.viewers.EditingSupport; -import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TableViewerColumn; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -15,39 +16,67 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.ui.part.ViewPart; +import net.mograsim.machine.Machine; import net.mograsim.machine.mi.MicroInstructionDefinition; -import net.mograsim.machine.mi.MicroprogramMemory; -import net.mograsim.machine.mi.MicroprogramMemoryParseException; -import net.mograsim.machine.mi.MicroprogramMemoryParser; +import net.mograsim.machine.mi.MicroInstructionMemory; +import net.mograsim.machine.mi.MicroInstructionMemoryParseException; +import net.mograsim.machine.mi.MicroInstructionMemoryParser; import net.mograsim.machine.mi.parameters.ParameterClassification; -import net.mograsim.plugin.asm.AsmNumberUtil.NumberType; -import net.mograsim.plugin.tables.memory.DisplaySettings; +import net.mograsim.plugin.MachineContext; +import net.mograsim.plugin.MachineContext.ContextObserver; +import net.mograsim.plugin.tables.AddressLabelProvider; +import net.mograsim.plugin.tables.DisplaySettings; +import net.mograsim.plugin.tables.LazyTableViewer; +import net.mograsim.plugin.tables.RadixSelector; import net.mograsim.plugin.util.DropDownMenu; import net.mograsim.plugin.util.DropDownMenu.DropDownEntry; -public class InstructionView extends ViewPart +public class InstructionView extends ViewPart implements ContextObserver { private String saveLoc = null; - private TableViewer viewer; + private LazyTableViewer viewer; private TableViewerColumn[] columns = new TableViewerColumn[0]; private MicroInstructionDefinition miDef; - private MicroprogramMemory memory; + private MicroInstructionMemory memory; + private DisplaySettings displaySettings; + private InstructionTableContentProvider provider; + private int highlighted = 0; + @SuppressWarnings("unused") @Override public void createPartControl(Composite parent) { - InstructionTableContentProvider provider = new InstructionTableContentProvider(); - GridLayout layout = new GridLayout(1, false); + provider = new InstructionTableContentProvider(); + GridLayout layout = new GridLayout(3, false); setupMenuButtons(parent); + + displaySettings = new DisplaySettings(); + new RadixSelector(parent, displaySettings); + parent.setLayout(layout); - viewer = new TableViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.BORDER | SWT.VIRTUAL); + viewer = new LazyTableViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.BORDER | SWT.VIRTUAL); + Table table = viewer.getTable(); table.setHeaderVisible(true); table.setLinesVisible(true); viewer.setUseHashlookup(true); viewer.setContentProvider(provider); + getSite().setSelectionProvider(viewer); + + GridData viewerData = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.FILL_BOTH); + viewerData.horizontalSpan = 3; + viewer.getTable().setLayoutData(viewerData); + + displaySettings.addObserver(() -> viewer.refresh()); + MachineContext.getInstance().registerObserver(this); + setMachine(Optional.ofNullable(MachineContext.getInstance().getMachine())); + } - viewer.getTable().setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.FILL_BOTH)); + public void highlight(int index) + { + viewer.highlightRow(highlighted, false); + viewer.highlightRow(index, true); + viewer.getTable().setTopIndex(index); } @SuppressWarnings("unused") @@ -85,25 +114,31 @@ public class InstructionView extends ViewPart saveLoc = d.getFilterPath() + File.separator + filename; } - public void bindMicroprogramMemory(MicroprogramMemory memory) + public void bindMicroInstructionMemory(MicroInstructionMemory memory) { + deleteColumns(); this.memory = memory; viewer.setInput(memory); + this.miDef = memory.getDefinition().getMicroInstructionDefinition(); + createColumns(); } - public void bindMicroInstructionDef(MicroInstructionDefinition miDef) + private void deleteColumns() { - this.miDef = miDef; - createColumns(); + for (TableViewerColumn col : columns) + col.getColumn().dispose(); } private void createColumns() { - for (TableViewerColumn col : columns) - col.getColumn().dispose(); int size = miDef.size(); + columns = new TableViewerColumn[size + 1]; + + TableViewerColumn col = createTableViewerColumn("Address", 200); + columns[0] = col; + col.setLabelProvider(new AddressLabelProvider()); + int bit = 0; - columns = new TableViewerColumn[size]; ParameterClassification[] classes = miDef.getParameterClassifications(); for (int i = 0; i < size; i++) @@ -113,28 +148,38 @@ public class InstructionView extends ViewPart String name = startBit == endBit ? Integer.toString(startBit) : startBit + "..." + endBit; int bounds = 20 + 20 * classes[i].getExpectedBits(); - TableViewerColumn col = createTableViewerColumn(name, bounds); - col.setLabelProvider(new ParameterLabelProvider(i)); - col.setEditingSupport(createEditingSupport(miDef, i)); + col = createTableViewerColumn(name, bounds); + columns[i + 1] = col; + createEditingAndLabel(col, miDef, i); } - } - private EditingSupport createEditingSupport(MicroInstructionDefinition miDef, int index) + private void createEditingAndLabel(TableViewerColumn col, MicroInstructionDefinition miDef, int index) { ParameterClassification parameterClassification = miDef.getParameterClassifications()[index]; + EditingSupport support; + ColumnLabelProvider provider; switch (parameterClassification.getExpectedType()) { case BOOLEAN_IMMEDIATE: - return new BooleanEditingSupport(viewer, miDef, index); + support = new BooleanEditingSupport(viewer, miDef, index); + provider = new ParameterLabelProvider(index); + break; case INTEGER_IMMEDIATE: - return new IntegerEditingSupport(viewer, miDef, index, new DisplaySettings(NumberType.DECIMAL)); + support = new IntegerEditingSupport(viewer, miDef, index, displaySettings, this.provider); + provider = new IntegerColumnLabelProvider(displaySettings, index); + break; case MNEMONIC: - return new MnemonicEditingSupport(viewer, miDef, index); + support = new MnemonicEditingSupport(viewer, miDef, index, this.provider); + provider = new ParameterLabelProvider(index); + break; default: throw new IllegalStateException( "Unable to create EditingSupport for unknown ParameterType " + parameterClassification.getExpectedType()); } + col.setEditingSupport(support); + col.setLabelProvider(provider); + col.getColumn().setToolTipText(miDef.getParameterDescription(index).orElse("")); } private TableViewerColumn createTableViewerColumn(String title, int bound) @@ -157,11 +202,11 @@ public class InstructionView extends ViewPart } try { - MicroprogramMemory newMemory = MicroprogramMemoryParser.parseMemory(miDef, file); - bindMicroprogramMemory(newMemory); + MicroInstructionMemoryParser.parseMemory(memory, file); + viewer.refresh(); saveLoc = file; } - catch (IOException | MicroprogramMemoryParseException e) + catch (IOException | MicroInstructionMemoryParseException e) { e.printStackTrace(); } @@ -177,7 +222,7 @@ public class InstructionView extends ViewPart { try { - MicroprogramMemoryParser.write(memory, file); + MicroInstructionMemoryParser.write(memory, file); } catch (IOException e) { @@ -191,4 +236,14 @@ public class InstructionView extends ViewPart { viewer.getControl().setFocus(); } + + @Override + public void setMachine(Optional machine) + { + if (machine.isPresent()) + { + Machine actualMachine = machine.get(); + bindMicroInstructionMemory(actualMachine.getMicroInstructionMemory()); + } + } }