X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=net.mograsim.machine%2Fsrc%2Fnet%2Fmograsim%2Fmachine%2Fmi%2FMicroInstructionMemoryParser.java;h=cacf79982237bff4c2066f68d946e078a4a4a388;hb=4ba119cab03498736851e6f3f32eec1957839a2e;hp=b5117a75b66072a5179d9d3bdf40cc013d5bed24;hpb=b32414f8406634aca730d724a011023c0da8bf22;p=Mograsim.git diff --git a/net.mograsim.machine/src/net/mograsim/machine/mi/MicroInstructionMemoryParser.java b/net.mograsim.machine/src/net/mograsim/machine/mi/MicroInstructionMemoryParser.java index b5117a75..cacf7998 100644 --- a/net.mograsim.machine/src/net/mograsim/machine/mi/MicroInstructionMemoryParser.java +++ b/net.mograsim.machine/src/net/mograsim/machine/mi/MicroInstructionMemoryParser.java @@ -28,29 +28,29 @@ public class MicroInstructionMemoryParser long minAddr = def.getMinimalAddress(); long maxAddr = def.getMaximalAddress(); - + String line; long i = minAddr; try { for (; i <= maxAddr && input.ready() && !"".equals((line = input.readLine())); i++) memory.setCell(i, parse(miDef, line)); - } catch (IOException e) + } + catch (IOException e) { e.printStackTrace(); } - - for(; i <= maxAddr; i++) + + for (; i <= maxAddr; i++) memory.setCell(i, miDef.createDefaultInstruction()); } - + public static MicroInstruction parse(MicroInstructionDefinition definition, String toParse) { int size = definition.size(); String[] strings = toParse.split(","); if (size != strings.length) - throw new MicroInstructionMemoryParseException( - "String does not match definition! The number of parameters does not match."); + throw new MicroInstructionMemoryParseException("String does not match definition! The number of parameters does not match."); MicroInstructionParameter[] params = new MicroInstructionParameter[size]; ParameterClassification[] classes = definition.getParameterClassifications(); try @@ -60,7 +60,8 @@ public class MicroInstructionMemoryParser params[i] = classes[i].parse(strings[i]); } return new StandardMicroInstruction(params); - } catch (Exception e) + } + catch (Exception e) { throw new MicroInstructionMemoryParseException(e.getCause()); }