X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Flaunch%2FMachineLaunchConfigType.java;h=a09ff23f46b10d351e4102df40cbbc87df3d13d9;hb=b5d55c59d7069171bd928e4a945d9185ee4bc2b0;hp=82d7e8be8d96d7f1aa0b8165638aed0e6d2cca32;hpb=a5fc4258e37df6e64b09ee814401c6ac7793bd7e;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..a09ff23f 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,26 +6,27 @@ 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.BitVectorMemoryDefinition; 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.MPROMDefinition; import net.mograsim.machine.mi.MicroInstructionMemoryDefinition; import net.mograsim.machine.mi.MicroInstructionMemoryParser; -import net.mograsim.machine.standard.memory.MainMemoryParser; +import net.mograsim.machine.standard.memory.BitVectorBasedMemoryParser; +import net.mograsim.machine.standard.memory.StandardBitVectorMemory; import net.mograsim.plugin.MograsimActivator; import net.mograsim.plugin.nature.MachineContext; import net.mograsim.plugin.nature.MograsimNature; @@ -35,23 +36,9 @@ public class MachineLaunchConfigType extends LaunchConfigurationDelegate { public static final String PROJECT_ATTR = MograsimActivator.PLUGIN_ID + ".project"; public static final String MPM_FILE_ATTR = MograsimActivator.PLUGIN_ID + ".mpm"; + public static final String MPROM_FILE_ATTR = MograsimActivator.PLUGIN_ID + ".mprom"; 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); - } - @Override public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException { @@ -73,6 +60,7 @@ public class MachineLaunchConfigType extends LaunchConfigurationDelegate MachineDefinition machineDefinition = machDefOptional.orElseThrow(); MicroInstructionMemoryDefinition miMemDef = machineDefinition.getMicroInstructionMemoryDefinition(); MainMemoryDefinition mainMemDef = machineDefinition.getMainMemoryDefinition(); + MPROMDefinition mpromDef = machineDefinition.getMPROMDefinition(); String mpmFileName = configuration.getAttribute(MPM_FILE_ATTR, ""); if ("".equals(mpmFileName)) @@ -91,25 +79,37 @@ public class MachineLaunchConfigType extends LaunchConfigurationDelegate throw new CoreException(new Status(IStatus.ERROR, MograsimActivator.PLUGIN_ID, "Unexpected IO exception reading MPM file", e)); } + String mpromFileName = configuration.getAttribute(MPROM_FILE_ATTR, ""); + if (!checkMemoryFileReadable(project, mpromDef, mpromFileName, "MPROM")) + return false; + String initialRAMFileName = configuration.getAttribute(INITIAL_RAM_FILE_ATTR, ""); - if (!"".equals(initialRAMFileName)) + if (!checkMemoryFileReadable(project, mainMemDef, initialRAMFileName, "initial RAM")) + return false; + + return super.preLaunchCheck(configuration, mode, monitor); + } + + private static boolean checkMemoryFileReadable(IProject project, BitVectorMemoryDefinition mainMemDef, String fileName, String fileType) + throws CoreException + { + if (!"".equals(fileName)) { - IFile initialRAMFile = project.getFile(initialRAMFileName); + IFile initialRAMFile = project.getFile(fileName); if (initialRAMFile == null || !initialRAMFile.isAccessible()) - return showErrorAndReturnFalse("Initial RAM file not accessible"); + return showErrorAndReturnFalse(fileType + " file not accessible"); try (InputStream initialRAMStream = initialRAMFile.getContents()) { - MainMemoryParser.parseMemory(mainMemDef, initialRAMStream); + BitVectorBasedMemoryParser.parseMemory(new StandardBitVectorMemory<>(mainMemDef), initialRAMStream); } catch (IOException e) { throw new CoreException( - new Status(IStatus.ERROR, MograsimActivator.PLUGIN_ID, "Unexpected IO exception reading initial RAM file", e)); + new Status(IStatus.ERROR, MograsimActivator.PLUGIN_ID, "Unexpected IO exception reading " + fileType + " file", e)); } } - - return super.preLaunchCheck(configuration, mode, monitor); + return true; } private static boolean showErrorAndReturnFalse(String message) @@ -126,76 +126,27 @@ 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)); - } - - String initialRAMFileName = configuration.getAttribute(INITIAL_RAM_FILE_ATTR, ""); - MainMemory mem; - 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); + Optional mpromFile = fileOptional(project, configuration.getAttribute(MPROM_FILE_ATTR, "")); + Optional memFile = fileOptional(project, configuration.getAttribute(INITIAL_RAM_FILE_ATTR, "")); + MachineDebugTarget debugTarget = new MachineDebugTarget(launch, mpmFile, mpromFile, 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.reset(); + + // 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) }); } - private void resourceChanged(IResourceChangeEvent event) + private static Optional fileOptional(IProject project, String filename) { - // 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 = ""; - } - System.out.println(typeStr + ": " + event); + if ("".equals(filename)) + return Optional.empty(); + return Optional.of(project.getFile(filename)); } + } \ No newline at end of file