Hooking up the Jump table dialog (#213)

src/Gui/Forms/IJumpTableDialog.cs

@@ -19,6 +19,7 @@
 #endregion
 
 using Reko.Core;
+using Reko.Core.Machine;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -28,6 +29,10 @@ namespace Reko.Gui.Forms
 {
     public interface IJumpTableDialog : IDialog
     {
+        Program Program { get; set; }
+        MachineInstruction Instruction { get; set; }
+        Address VectorAddress { get; set; }
+
         UserIndirectJump GetResults();
     }
 }

src/Gui/Windows/Forms/JumpTableDialog.cs

@@ -44,7 +44,7 @@ public JumpTableDialog()
         }
 
         public IServiceProvider Services { get; set; }
-        public MachineInstruction IndirectJump { get; set; }
+        public MachineInstruction Instruction { get; set; }
         public Address VectorAddress { get;  set; }
         public Program Program { get; set; }
 

src/Gui/Windows/Forms/JumpTableInteractor.cs

@@ -44,8 +44,8 @@ public void Attach(JumpTableDialog dlg)
 
         private void Dlg_Load(object sender, EventArgs e)
         {
-            dlg.CaptionLabel.Text = string.Format("Jump table for {0}", dlg.IndirectJump.Address);
-            dlg.IndirectJumpLabel.Text = dlg.IndirectJump.ToString().Replace('\t', ' ');
+            dlg.CaptionLabel.Text = string.Format("Jump table for {0}", dlg.Instruction.Address);
+            dlg.IndirectJumpLabel.Text = dlg.Instruction.ToString().Replace('\t', ' ');
             if (dlg.VectorAddress != null)
             {
                 dlg.JumpTableStartAddress.Text = dlg.VectorAddress.ToString();
@@ -97,7 +97,7 @@ public UserIndirectJump GetResults()
             var table =  new ImageMapVectorTable(dlg.VectorAddress, entries.ToArray(), 0);
             return new UserIndirectJump
             {
-                Address = dlg.IndirectJump.Address,
+                Address = dlg.Instruction.Address,
                 Table = table,
                 IndexRegister = dlg.Program.Architecture.GetRegister(dlg.IndexRegister.SelectedIndex.ToString())
             };

src/Gui/Windows/WindowsFormsDialogFactory.cs

@@ -162,7 +162,7 @@ public IJumpTableDialog CreateJumpTableDialog(Program program, MachineInstructio
             {
                 Services = this.services,
                 Program = program,
-                IndirectJump = instrIndirectJmp,
+                Instruction = instrIndirectJmp,
                 VectorAddress = addrVector
             };
         }

src/UnitTests/Gui/Windows/Forms/JumpTableInteractorTests.cs

@@ -62,7 +62,7 @@ private void Given_Dialog_32Bit()
             this.dlg = new JumpTableDialog()
             {
                 Program = program,
-                IndirectJump = new FakeInstruction(Operation.Jump) {  Address = Address.Ptr32(0x1000) }
+                Instruction = new FakeInstruction(Operation.Jump) {  Address = Address.Ptr32(0x1000) }
             };
         }