From: Fabian Stemmler Date: Fri, 20 Sep 2019 16:00:31 +0000 (+0200) Subject: Machine name is no in mpm files X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;a=commitdiff_plain;h=38902818500a67f6a55973b9acbd4194f7a82838 Machine name is no in mpm files --- diff --git a/plugins/net.mograsim.machine/src/net/mograsim/machine/mi/MicroInstructionMemoryParser.java b/plugins/net.mograsim.machine/src/net/mograsim/machine/mi/MicroInstructionMemoryParser.java index 3c13f67b..b351ca7b 100644 --- a/plugins/net.mograsim.machine/src/net/mograsim/machine/mi/MicroInstructionMemoryParser.java +++ b/plugins/net.mograsim.machine/src/net/mograsim/machine/mi/MicroInstructionMemoryParser.java @@ -1,15 +1,12 @@ package net.mograsim.machine.mi; import java.io.BufferedReader; +import java.io.ByteArrayInputStream; import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.util.Objects; -import net.mograsim.machine.MachineRegistry; -import net.mograsim.machine.MemoryDefinition; import net.mograsim.machine.mi.parameters.MicroInstructionParameter; import net.mograsim.machine.mi.parameters.ParameterClassification; @@ -19,46 +16,22 @@ public class MicroInstructionMemoryParser public static void parseMemory(final MicroInstructionMemory memory, String inputPath) throws IOException { - try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(inputPath)))) + try (InputStream input = new FileInputStream(inputPath)) { - parseMemory(memory, reader); - } - } - - public static MicroInstructionMemory parseMemory(String inputPath) throws IOException - { - try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(inputPath)))) - { - return parseMemory(reader); - } - } - - /** - * First line must be the machine name, the rest must be in csv format - */ - public static MicroInstructionMemory parseMemory(BufferedReader input) - { - try - { - return parseMemory(input.readLine(), input); - } - catch (IOException e) - { - throw new MicroInstructionMemoryParseException(e); + parseMemory(memory, input); } } /** - * must be in csv format + * @param input The input to parse must be in csv format; The stream is closed after being consumed. + * + * @throws IOException */ - public static MicroInstructionMemory parseMemory(String machineName, BufferedReader input) + public static MicroInstructionMemory parseMemory(MicroInstructionMemoryDefinition memDef, InputStream input) throws IOException { try { - MicroInstructionMemoryDefinition def = Objects - .requireNonNull(MachineRegistry.getinstalledMachines().get(machineName), "Unknown machine: " + machineName) - .getMicroInstructionMemoryDefinition(); - MicroInstructionMemory memory = new StandardMicroInstructionMemory(def); + MicroInstructionMemory memory = new StandardMicroInstructionMemory(memDef); parseMemory(memory, input); return memory; } @@ -69,43 +42,49 @@ public class MicroInstructionMemoryParser } /** - * must be in csv format + * + * @param input The input to parse must be in csv format; The stream is closed after being consumed. + * + * @throws IOException */ - public static void parseMemory(final MicroInstructionMemory memory, BufferedReader input) + public static void parseMemory(final MicroInstructionMemory memory, InputStream input) throws IOException { - MicroInstructionMemoryDefinition def = memory.getDefinition(); - MicroInstructionDefinition miDef = def.getMicroInstructionDefinition(); + try (BufferedReader reader = new BufferedReader(new InputStreamReader(input))) + { + MicroInstructionMemoryDefinition def = memory.getDefinition(); + MicroInstructionDefinition miDef = def.getMicroInstructionDefinition(); - long minAddr = def.getMinimalAddress(); - long maxAddr = def.getMaximalAddress(); + long minAddr = def.getMinimalAddress(); + long maxAddr = def.getMaximalAddress(); - String line; - long i = minAddr; - try - { - for (; i <= maxAddr && input.ready() && !"".equals((line = input.readLine())); i++) + String line; + long i = minAddr; + try { - memory.setCell(i, parse(miDef, line)); + for (; i <= maxAddr && reader.ready() && !"".equals((line = reader.readLine())); i++) + { + memory.setCell(i, parse(miDef, line)); + } + } + catch (IOException e) + { + e.printStackTrace(); } - } - catch (IOException e) - { - e.printStackTrace(); - } - for (; i <= maxAddr; i++) - { - memory.setCell(i, miDef.createDefaultInstruction()); + for (; i <= maxAddr; i++) + { + memory.setCell(i, miDef.createDefaultInstruction()); + } } } /** * must be in csv format */ - public static MicroInstruction parse(MicroInstructionDefinition definition, String path) + public static MicroInstruction parse(MicroInstructionDefinition definition, String input) { int size = definition.size(); - String[] strings = path.split(","); + String[] strings = input.split(","); if (size != strings.length) throw new MicroInstructionMemoryParseException("String does not match definition! The number of parameters does not match."); MicroInstructionParameter[] params = new MicroInstructionParameter[size]; @@ -124,43 +103,6 @@ public class MicroInstructionMemoryParser } } - public static void write(MicroInstructionMemory memory, String outputPath) throws IOException - { - try (OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(outputPath))) - { - write(memory, writer); - } - } - - public static void write(MicroInstructionMemory memory, String machineName, String outputPath) throws IOException - { - try (OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(outputPath))) - { - write(memory, machineName, writer); - } - } - - public static void write(MicroInstructionMemory memory, OutputStreamWriter output) throws IOException - { - MemoryDefinition def = memory.getDefinition(); - long min = def.getMinimalAddress(), max = def.getMaximalAddress() + 1; - for (long i = min; i < max; i++) - { - output.write(toCSV(memory.getCell(i)) + lineSeparator); - } - } - - public static void write(MicroInstructionMemory memory, String machineName, OutputStreamWriter output) throws IOException - { - output.write(machineName + lineSeparator); - MemoryDefinition def = memory.getDefinition(); - long min = def.getMinimalAddress(), max = def.getMaximalAddress() + 1; - for (long i = min; i < max; i++) - { - output.write(toCSV(memory.getCell(i)) + lineSeparator); - } - } - private static String toCSV(MicroInstruction inst) { int max = inst.getSize() - 1; @@ -173,4 +115,25 @@ public class MicroInstructionMemoryParser sb.append(inst.getParameter(max).toString()); return sb.toString(); } + + public static InputStream write(MicroInstructionMemory memory) + { + return new InputStream() + { + long instIndex = memory.getDefinition().getMinimalAddress(), maxAddress = memory.getDefinition().getMaximalAddress(); + InputStream instStream = new ByteArrayInputStream(new byte[0]); + + @Override + public int read() throws IOException + { + int val = instStream.read(); + if (val == -1 && instIndex <= maxAddress) + { + instStream = new ByteArrayInputStream((toCSV(memory.getCell(instIndex++)) + lineSeparator).getBytes()); + val = instStream.read(); + } + return val; + } + }; + } } diff --git a/plugins/net.mograsim.plugin.core/META-INF/MANIFEST.MF b/plugins/net.mograsim.plugin.core/META-INF/MANIFEST.MF index 6dfa9547..636da057 100644 --- a/plugins/net.mograsim.plugin.core/META-INF/MANIFEST.MF +++ b/plugins/net.mograsim.plugin.core/META-INF/MANIFEST.MF @@ -28,7 +28,8 @@ Require-Bundle: org.eclipse.core.runtime, javax.annotation;bundle-version="1.0.0", net.mograsim.preferences;bundle-version="0.1.0", net.mograsim.machine, - net.mograsim.plugin.core + net.mograsim.plugin.core, + org.eclipse.ui.ide;bundle-version="3.15.0" Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: net.mograsim.plugin.core Bundle-Vendor: %Bundle-Vendor.0 diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionTable.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionTable.java index 93179c08..914fb2f3 100644 --- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionTable.java +++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionTable.java @@ -94,8 +94,11 @@ public class InstructionTable public void bindMicroInstructionMemory(MicroInstructionMemory memory) { this.memory = memory; - this.miDef = memory.getDefinition().getMicroInstructionDefinition(); - setViewerInput(memory); + if (memory != null) + { + this.miDef = memory.getDefinition().getMicroInstructionDefinition(); + setViewerInput(memory); + } } private static final String[] HEX_DIGITS = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F" }; diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java index b21c848d..b50dc84f 100644 --- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java +++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java @@ -1,10 +1,10 @@ package net.mograsim.plugin.tables.mi; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; import java.io.IOException; +import java.io.InputStream; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -12,10 +12,9 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.FileDialog; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorSite; -import org.eclipse.ui.IPathEditorInput; +import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.PartInitException; import org.eclipse.ui.part.EditorPart; @@ -34,7 +33,6 @@ public class InstructionView extends EditorPart implements MemoryCellModifiedLis private InstructionTableContentProvider provider; private int highlighted = 0; private boolean dirty = false; - private String machineName; private MicroInstructionMemory memory; private InstructionTable table; @@ -83,37 +81,40 @@ public class InstructionView extends EditorPart implements MemoryCellModifiedLis public void bindMicroInstructionMemory(MicroInstructionMemory memory) { this.memory = memory; - this.memory.registerCellModifiedListener(this); - this.memory.registerActiveMicroInstructionChangedListener(this); + if (memory != null) + { + this.memory.registerCellModifiedListener(this); + this.memory.registerActiveMicroInstructionChangedListener(this); + } if (table != null) table.bindMicroInstructionMemory(memory); } - private void open(String file) + private void open(IFile file) { - try (BufferedReader bf = new BufferedReader(new FileReader(file))) + try { - machineName = bf.readLine(); - bindMicroInstructionMemory(MicroInstructionMemoryParser.parseMemory(machineName, bf)); + bindMicroInstructionMemory(MicroInstructionMemoryParser.parseMemory( + MachineContext.getInstance().getMachine().getDefinition().getMicroInstructionMemoryDefinition(), file.getContents())); } - catch (IOException | MicroInstructionMemoryParseException e) + catch (IOException | MicroInstructionMemoryParseException | CoreException e) { e.printStackTrace(); } } - private void save(String file) + private void save(IFile file, IProgressMonitor progressMonitor) { if (memory == null) { System.err.println("Failed to write MicroprogrammingMemory to File. No MicroprogrammingMemory assigned."); return; } - try + try (InputStream toWrite = MicroInstructionMemoryParser.write(memory)) { - MicroInstructionMemoryParser.write(memory, machineName, file); + file.setContents(toWrite, 0, progressMonitor); } - catch (IOException e) + catch (IOException | CoreException e) { e.printStackTrace(); } @@ -129,10 +130,10 @@ public class InstructionView extends EditorPart implements MemoryCellModifiedLis public void doSave(IProgressMonitor progressMonitor) { IEditorInput input = getEditorInput(); - if (input instanceof IPathEditorInput) + if (input instanceof IFileEditorInput) { - IPathEditorInput pathInput = (IPathEditorInput) input; - save(pathInput.getPath().toOSString()); + IFileEditorInput pathInput = (IFileEditorInput) input; + save(pathInput.getFile(), progressMonitor); setDirty(false); } } @@ -140,32 +141,33 @@ public class InstructionView extends EditorPart implements MemoryCellModifiedLis @Override public void doSaveAs() { - openSaveAsDialog(); +// openSaveAsDialog(); } - private void openSaveAsDialog() - { - FileDialog d = new FileDialog(table.getTableViewer().getTable().getShell(), SWT.SAVE); - d.open(); - String filename = d.getFileName(); - if (!filename.equals("")) - { - save(d.getFilterPath() + File.separator + filename); - setDirty(false); - } - } +// private void openSaveAsDialog() +// { +// FileDialog d = new FileDialog(table.getTableViewer().getTable().getShell(), SWT.SAVE); +// d.open(); +// String filename = d.getFileName(); +// if (!filename.equals("")) +// { +// save(d.getFilterPath() + File.separator + filename); +// setDirty(false); +// } +// } @Override public void init(IEditorSite site, IEditorInput input) throws PartInitException { setSite(site); setInput(input); - if (input instanceof IPathEditorInput) + if (input instanceof IFileEditorInput) { - IPathEditorInput pathInput = (IPathEditorInput) input; - setPartName(pathInput.getName()); - open(pathInput.getPath().toOSString()); + IFileEditorInput fileInput = (IFileEditorInput) input; + setPartName(fileInput.getName()); + open(fileInput.getFile()); } + } @Override @@ -177,7 +179,7 @@ public class InstructionView extends EditorPart implements MemoryCellModifiedLis @Override public boolean isSaveAsAllowed() { - return true; + return false; } @Override