Finished MPROM support. Fixes #10

[Mograsim.git] / plugins / net.mograsim.machine / src / net / mograsim / machine / mi / AssignableMPROM.java

diff --git a/plugins/net.mograsim.machine/src/net/mograsim/machine/mi/AssignableMPROM.java b/plugins/net.mograsim.machine/src/net/mograsim/machine/mi/AssignableMPROM.java
index 0405013..39cd679 100644 (file)
--- a/plugins/net.mograsim.machine/src/net/mograsim/machine/mi/AssignableMPROM.java
+++ b/plugins/net.mograsim.machine/src/net/mograsim/machine/mi/AssignableMPROM.java
@@ -1,99 +1,17 @@
 package net.mograsim.machine.mi;
 
-import java.math.BigInteger;
-import java.util.HashSet;
-import java.util.Set;
+import net.mograsim.machine.standard.memory.AbstractAssignableBitVectorMemory;
 
-import net.mograsim.logic.core.types.BitVector;
-import net.mograsim.machine.Memory.MemoryCellModifiedListener;
-
-public class AssignableMPROM implements MPROM, MemoryCellModifiedListener
+public class AssignableMPROM extends AbstractAssignableBitVectorMemory<MPROM> implements MPROM
 {
-
-       private Set<MemoryCellModifiedListener> observers = new HashSet<>();
-
-       private Set<MPROMReassignedListener> reassignmentListeners = new HashSet<>();
-       private MPROM real = null;
-
-       public AssignableMPROM(MPROM standardMPROM)
-       {
-               real = standardMPROM;
-               real.registerCellModifiedListener(this);
-       }
-
-       public void bind(MPROM real)
-       {
-               this.real.deregisterCellModifiedListener(this);
-               this.real = real;
-               real.registerCellModifiedListener(this);
-               notifyMemoryChanged(-1);
-               notifyMemoryReassigned(real);
-       }
-
-       @Override
-       public BitVector getCell(long address)
-       {
-               return real.getCell(address);
-       }
-
-       @Override
-       public void setCell(long address, BitVector data)
-       {
-               real.setCell(address, data);
-       }
-
-       @Override
-       public BigInteger getCellAsBigInteger(long address)
-       {
-               return real.getCellAsBigInteger(address);
-       }
-
-       @Override
-       public void registerCellModifiedListener(MemoryCellModifiedListener ob)
+       public AssignableMPROM(MPROM memory)
        {
-               observers.add(ob);
-       }
-
-       @Override
-       public void deregisterCellModifiedListener(MemoryCellModifiedListener ob)
-       {
-               observers.remove(ob);
-       }
-
-       private void notifyMemoryChanged(long address)
-       {
-               observers.forEach(o -> o.update(address));
+               super(memory);
        }
 
        @Override
        public MPROMDefinition getDefinition()
        {
-               return real.getDefinition();
-       }
-
-       @Override
-       public void update(long address)
-       {
-               notifyMemoryChanged(address);
-       }
-
-       public void registerMemoryReassignedListener(MPROMReassignedListener listener)
-       {
-               reassignmentListeners.add(listener);
-       }
-
-       public void deregisterMemoryReassignedListener(MPROMReassignedListener listener)
-       {
-               reassignmentListeners.remove(listener);
-       }
-
-       private void notifyMemoryReassigned(MPROM newAssignee)
-       {
-               reassignmentListeners.forEach(l -> l.reassigned(newAssignee));
-       }
-
-       public static interface MPROMReassignedListener
-       {
-               public void reassigned(MPROM newAssignee);
+               return getReal().getDefinition();
        }
 }