Fixed a bug in Am2900; created dlatch8/80; relayouted some components

[Mograsim.git] / net.mograsim.plugin.core / src / net / mograsim / plugin / tables / mi / InstructionView.java

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 ee1f5da..3af070f 100644 (file)
--- 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,10 +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;
@@ -16,31 +16,37 @@ 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.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();
+               provider = new InstructionTableContentProvider();
                GridLayout layout = new GridLayout(3, false);
                setupMenuButtons(parent);
 
@@ -48,18 +54,29 @@ public class InstructionView extends ViewPart
                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()));
+       }
+
+       public void highlight(int index)
+       {
+               viewer.highlightRow(highlighted, false);
+               viewer.highlightRow(index, true);
+               viewer.getTable().setTopIndex(index);
        }
 
        @SuppressWarnings("unused")
@@ -97,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++)
@@ -125,10 +148,10 @@ 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 = createTableViewerColumn(name, bounds);
+                       columns[i + 1] = col;
                        createEditingAndLabel(col, miDef, i);
                }
-
        }
 
        private void createEditingAndLabel(TableViewerColumn col, MicroInstructionDefinition miDef, int index)
@@ -143,11 +166,11 @@ public class InstructionView extends ViewPart
                        provider = new ParameterLabelProvider(index);
                        break;
                case INTEGER_IMMEDIATE:
-                       support = 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:
-                       support = new MnemonicEditingSupport(viewer, miDef, index);
+                       support = new MnemonicEditingSupport(viewer, miDef, index, this.provider);
                        provider = new ParameterLabelProvider(index);
                        break;
                default:
@@ -156,6 +179,7 @@ public class InstructionView extends ViewPart
                }
                col.setEditingSupport(support);
                col.setLabelProvider(provider);
+               col.getColumn().setToolTipText(miDef.getParameterDescription(index).orElse(""));
        }
 
        private TableViewerColumn createTableViewerColumn(String title, int bound)
@@ -178,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();
                }
@@ -198,7 +222,7 @@ public class InstructionView extends ViewPart
                {
                        try
                        {
-                               MicroprogramMemoryParser.write(memory, file);
+                               MicroInstructionMemoryParser.write(memory, file);
                        }
                        catch (IOException e)
                        {
@@ -212,4 +236,14 @@ public class InstructionView extends ViewPart
        {
                viewer.getControl().setFocus();
        }
+
+       @Override
+       public void setMachine(Optional<Machine> machine)
+       {
+               if (machine.isPresent())
+               {
+                       Machine actualMachine = machine.get();
+                       bindMicroInstructionMemory(actualMachine.getMicroInstructionMemory());
+               }
+       }
 }