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=68e83298932facecb7483849394d3d247fa13e2a;hpb=227b60111a67be1f268d89033ddbbf6768131704;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 68e83298..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
@@ -69,6 +69,7 @@ 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)
@@ -130,12 +131,14 @@ public class InstructionView extends ViewPart implements ContextObserver
 
 	private void createColumns()
 	{
+		int size = miDef.size();
+		columns = new TableViewerColumn[size + 1];
+
 		TableViewerColumn col = createTableViewerColumn("Address", 200);
+		columns[0] = col;
 		col.setLabelProvider(new AddressLabelProvider());
 
-		int size = miDef.size();
 		int bit = 0;
-		columns = new TableViewerColumn[size];
 		ParameterClassification[] classes = miDef.getParameterClassifications();
 
 		for (int i = 0; i < size; i++)
@@ -145,9 +148,10 @@ public class InstructionView extends ViewPart implements ContextObserver
 			String name = startBit == endBit ? Integer.toString(startBit) : startBit + "..." + endBit;
 			int bounds = 20 + 20 * classes[i].getExpectedBits();
 
-			createEditingAndLabel(createTableViewerColumn(name, bounds), miDef, i);
+			col = createTableViewerColumn(name, bounds);
+			columns[i + 1] = col;
+			createEditingAndLabel(col, miDef, i);
 		}
-
 	}
 
 	private void createEditingAndLabel(TableViewerColumn col, MicroInstructionDefinition miDef, int index)