X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Flaunch%2FMachineLaunchConfigType.java;h=5622ca6de42e2c1aeae61b929adc39dca9fa83c7;hb=7466dbebfdfa536d24fbf3994d068abc27d77e99;hp=82d7e8be8d96d7f1aa0b8165638aed0e6d2cca32;hpb=0eb525202d3c871a2a20f789af1728248f3cff11;p=Mograsim.git

diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineLaunchConfigType.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineLaunchConfigType.java
index 82d7e8be..5622ca6d 100644
--- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineLaunchConfigType.java
+++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineLaunchConfigType.java
@@ -6,23 +6,21 @@ import java.util.Optional;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.model.IMemoryBlock;
 import org.eclipse.debug.core.model.LaunchConfigurationDelegate;
 import org.eclipse.ui.statushandlers.StatusManager;
 
 import net.mograsim.machine.Machine;
 import net.mograsim.machine.MachineDefinition;
-import net.mograsim.machine.MainMemory;
 import net.mograsim.machine.MainMemoryDefinition;
-import net.mograsim.machine.mi.MicroInstructionMemory;
 import net.mograsim.machine.mi.MicroInstructionMemoryDefinition;
 import net.mograsim.machine.mi.MicroInstructionMemoryParser;
 import net.mograsim.machine.standard.memory.MainMemoryParser;
@@ -37,20 +35,8 @@ public class MachineLaunchConfigType extends LaunchConfigurationDelegate
 	public static final String MPM_FILE_ATTR = MograsimActivator.PLUGIN_ID + ".mpm";
 	public static final String INITIAL_RAM_FILE_ATTR = MograsimActivator.PLUGIN_ID + ".initialram";
 
-	private final IResourceChangeListener resChangedListener;
-
-	public MachineLaunchConfigType()
-	{
-		this.resChangedListener = this::resourceChanged;
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resChangedListener,
-				// IResourceChangeEvent.POST_BUILD |
-				IResourceChangeEvent.POST_CHANGE |
-				// IResourceChangeEvent.PRE_BUILD |
-				// IResourceChangeEvent.PRE_CLOSE |
-				// IResourceChangeEvent.PRE_DELETE |
-				// IResourceChangeEvent.PRE_REFRESH |
-						0);
-	}
+	private IFile mpmFile;
+	private Machine machine;
 
 	@Override
 	public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException
@@ -126,76 +112,25 @@ public class MachineLaunchConfigType extends LaunchConfigurationDelegate
 
 		MachineContext machineContext = ProjectMachineContext.getMachineContextOf(project);
 		MachineDefinition machineDefinition = machineContext.getMachineDefinition().orElseThrow();
-		MicroInstructionMemoryDefinition miMemDef = machineDefinition.getMicroInstructionMemoryDefinition();
-		MainMemoryDefinition mainMemDef = machineDefinition.getMainMemoryDefinition();
 
-		IFile mpmFile = project.getFile(configuration.getAttribute(MPM_FILE_ATTR, ""));
-
-		MicroInstructionMemory mpm;
-		try (InputStream mpmStream = mpmFile.getContents())
-		{
-			mpm = MicroInstructionMemoryParser.parseMemory(miMemDef, mpmStream);
-		}
-		catch (IOException e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR, MograsimActivator.PLUGIN_ID, "Unexpected IO exception reading MPM file", e));
-		}
+		mpmFile = project.getFile(configuration.getAttribute(MPM_FILE_ATTR, ""));
 
 		String initialRAMFileName = configuration.getAttribute(INITIAL_RAM_FILE_ATTR, "");
-		MainMemory mem;
+		Optional<IFile> memFile = Optional.empty();
 		if (!"".equals(initialRAMFileName))
 		{
-			IFile initialRAMFile = project.getFile(initialRAMFileName);
-			try (InputStream initialRAMStream = initialRAMFile.getContents())
-			{
-				mem = MainMemoryParser.parseMemory(mainMemDef, initialRAMStream);
-			}
-			catch (IOException e)
-			{
-				throw new CoreException(
-						new Status(IStatus.ERROR, MograsimActivator.PLUGIN_ID, "Unexpected IO exception reading initial RAM file", e));
-			}
-		} else
-			mem = null;
-
-		MachineDebugTarget debugTarget = new MachineDebugTarget(launch, machineDefinition);
+			memFile = Optional.of(project.getFile(initialRAMFileName));
+		}
+		MachineDebugTarget debugTarget = new MachineDebugTarget(launch, mpmFile, memFile, machineDefinition);
+		// TODO make selectable whether the machine starts paused or not
 		debugTarget.suspend();
 		debugTarget.setExecutionSpeed(1);
-		Machine machine = debugTarget.getMachine();
-		machine.getMicroInstructionMemory().bind(mpm);
-		if (mem != null)
-			machine.getMainMemory().bind(mem);
+		machine = debugTarget.getMachine();
 		machine.reset();
-	}
 
-	private void resourceChanged(IResourceChangeEvent event)
-	{
-		// TODO react to MPM changes
-		int type = event.getType();
-		String typeStr;
-		switch (type)
-		{
-		case IResourceChangeEvent.POST_BUILD:
-			typeStr = "POST_BUILD";
-			break;
-		case IResourceChangeEvent.POST_CHANGE:
-			typeStr = "POST_CHANGE";
-			break;
-		case IResourceChangeEvent.PRE_BUILD:
-			typeStr = "PRE_BUILD";
-			break;
-		case IResourceChangeEvent.PRE_CLOSE:
-			typeStr = "PRE_CLOSE";
-			break;
-		case IResourceChangeEvent.PRE_DELETE:
-			typeStr = "PRE_DELETE";
-			break;
-		case IResourceChangeEvent.PRE_REFRESH:
-			typeStr = "PRE_REFRESH";
-			break;
-		default:
-			typeStr = "<unknown: " + type + ">";
-		}
-		System.out.println(typeStr + ": " + event);
+		// Add the default Mograsim memory block to make it less confusing and more comfortable.
+		DebugPlugin.getDefault().getMemoryBlockManager()
+				.addMemoryBlocks(new IMemoryBlock[] { new MainMemoryBlockExtension(debugTarget, "0", null) });
 	}
+
 }
\ No newline at end of file