X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Ftables%2Fmi%2FInstructionView.java;h=b9627aada38a29b075927a0835a9c7e6932d6d3d;hb=4294019fb99a78ffa6802c0765e4efb7f96bd880;hp=931d1a60e56aabc832f8acf110d17799680d15af;hpb=259c5b8d38b6ed641fd9b5d78fe20969c67015dc;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 931d1a60..b9627aad 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
@@ -6,7 +6,6 @@ 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;
@@ -25,8 +24,9 @@ import net.mograsim.machine.mi.MicroInstructionMemoryParser;
 import net.mograsim.machine.mi.parameters.ParameterClassification;
 import net.mograsim.plugin.MachineContext;
 import net.mograsim.plugin.MachineContext.ContextObserver;
-import net.mograsim.plugin.asm.AsmNumberUtil.NumberType;
+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;
@@ -34,17 +34,19 @@ import net.mograsim.plugin.util.DropDownMenu.DropDownEntry;
 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 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);
 
@@ -52,12 +54,14 @@ public class InstructionView extends ViewPart implements ContextObserver
 		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;
@@ -65,6 +69,14 @@ public class InstructionView extends ViewPart implements ContextObserver
 
 		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")
@@ -114,11 +126,15 @@ public class InstructionView extends ViewPart implements ContextObserver
 	private void deleteColumns()
 	{
 		for (TableViewerColumn col : columns)
-			col.getColumn().dispose();
+			if (col != null)
+				col.getColumn().dispose();
 	}
 
 	private void createColumns()
 	{
+		TableViewerColumn col = createTableViewerColumn("Address", 200);
+		col.setLabelProvider(new AddressLabelProvider());
+
 		int size = miDef.size();
 		int bit = 0;
 		columns = new TableViewerColumn[size];
@@ -131,10 +147,8 @@ public class InstructionView extends ViewPart implements ContextObserver
 			String name = startBit == endBit ? Integer.toString(startBit) : startBit + "..." + endBit;
 			int bounds = 20 + 20 * classes[i].getExpectedBits();
 
-			TableViewerColumn col = createTableViewerColumn(name, bounds);
-			createEditingAndLabel(col, miDef, i);
+			createEditingAndLabel(createTableViewerColumn(name, bounds), miDef, i);
 		}
-
 	}
 
 	private void createEditingAndLabel(TableViewerColumn col, MicroInstructionDefinition miDef, int index)
@@ -149,11 +163,11 @@ public class InstructionView extends ViewPart implements ContextObserver
 			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:
@@ -162,6 +176,7 @@ public class InstructionView extends ViewPart implements ContextObserver
 		}
 		col.setEditingSupport(support);
 		col.setLabelProvider(provider);
+		col.getColumn().setToolTipText(miDef.getParameterDescription(index).orElse(""));
 	}
 
 	private TableViewerColumn createTableViewerColumn(String title, int bound)