X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.machine%2Fsrc%2Fnet%2Fmograsim%2Fmachine%2Fmi%2FMicroInstructionMemoryParser.java;h=1aa518dcd77d133ee6b61f9248d0db34ec092726;hb=95b1269b5d1ff51f4321e2182d3c37efa6ae093a;hp=d049e37776e0ec39466d81b200727110552eb564;hpb=e7c51111e07a9e499eb3a17d784addd426e0ca43;p=Mograsim.git 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 d049e377..1aa518dc 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 @@ -35,8 +35,7 @@ public class MicroInstructionMemoryParser { for (; i <= maxAddr && input.ready() && !"".equals((line = input.readLine())); i++) { - long iFinal = i; - memory.setCell(i, parse(() -> memory.notifyObservers(iFinal), miDef, line)); + memory.setCell(i, parse(miDef, line)); } } catch (IOException e) @@ -46,12 +45,11 @@ public class MicroInstructionMemoryParser for (; i <= maxAddr; i++) { - long iFinal = i; - memory.setCell(i, miDef.createDefaultInstruction(() -> memory.notifyObservers(iFinal))); + memory.setCell(i, miDef.createDefaultInstruction()); } } - public static MicroInstruction parse(Runnable updateCallback, MicroInstructionDefinition definition, String toParse) + public static MicroInstruction parse(MicroInstructionDefinition definition, String toParse) { int size = definition.size(); String[] strings = toParse.split(","); @@ -65,7 +63,7 @@ public class MicroInstructionMemoryParser { params[i] = classes[i].parse(strings[i]); } - return new StandardMicroInstruction(updateCallback, params); + return new StandardMicroInstruction(params); } catch (Exception e) {