--- /dev/null
+package net.mograsim.machine;
+
+public class DefaultMainMemoryDefinition implements MainMemoryDefinition {
+ private final int memoryAddressBits, cellWidth;
+ private final long minimalAddress, maximalAddress;
+
+ public DefaultMainMemoryDefinition(int memoryAddressBits, int cellWidth, long minimalAddress, long maximalAddress)
+ {
+ super();
+ this.memoryAddressBits = memoryAddressBits;
+ this.cellWidth = cellWidth;
+ this.minimalAddress = minimalAddress;
+ this.maximalAddress = maximalAddress;
+ }
+
+ public DefaultMainMemoryDefinition(MainMemoryDefinition definition)
+ {
+ this(definition.getMemoryAddressBits(), definition.getCellWidth(), definition.getMinimalAddress(), definition.getMaximalAddress());
+ }
+
+ @Override
+ public int getMemoryAddressBits()
+ {
+ return memoryAddressBits;
+ }
+
+ @Override
+ public int getCellWidth()
+ {
+ return cellWidth;
+ }
+
+ @Override
+ public long getMinimalAddress()
+ {
+ return minimalAddress;
+ }
+
+ @Override
+ public long getMaximalAddress()
+ {
+ return maximalAddress;
+ }
+
+}
package net.mograsim.machine;
+import net.mograsim.logic.core.types.BitVector;
+
public interface MainMemory {
+ public BitVector getCell(long address);
+ public void setCell(long address, BitVector word);
+ public MainMemoryDefinition getDefinition();
}
import org.eclipse.swt.graphics.Color;
+import com.google.gson.Gson;
import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
import net.haspamelodica.swt.helper.gcs.GeneralGC;
import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;
import net.mograsim.logic.model.serializing.IdentifierGetter;
import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
+import net.mograsim.machine.DefaultMainMemoryDefinition;
+import net.mograsim.machine.MainMemoryDefinition;
+import net.mograsim.machine.standard.memory.WordAddressableMemoryComponent;
import net.mograsim.preferences.Preferences;
public class GUIMemoryWA extends GUIComponent
{
- private final static String paramAddr = "addrBits", paramWordWidth = "wordWidth", paramMaxAddr = "maxAddr", paramMinAddr = "minAddr";
- private final int addressBits, wordWidth;
- public final long maximalAddress, minimalAddress;
+ private final MainMemoryDefinition definition;
private final Pin addrPin, dataPin, rWPin;
+ private WordAddressableMemoryComponent memory;
private final static int width = 100, height = 300;
- public GUIMemoryWA(ViewModelModifiable model, int addressBits, int wordWidth, long maximalAddress, long minimalAddress, String name)
+ public GUIMemoryWA(ViewModelModifiable model, MainMemoryDefinition definition, String name)
{
super(model, name);
- this.addressBits = addressBits;
- this.wordWidth = wordWidth;
- this.maximalAddress = maximalAddress;
- this.minimalAddress = minimalAddress;
+ this.definition = definition;
setSize(width, height);
- addPin(addrPin = new Pin(this, "A", addressBits, 0, 10));
- addPin(dataPin = new Pin(this, "D", wordWidth, 0, 30));
+ addPin(addrPin = new Pin(this, "A", definition.getMemoryAddressBits(), 0, 10));
+ addPin(dataPin = new Pin(this, "D", definition.getCellWidth(), 0, 30));
addPin(rWPin = new Pin(this, "RW", 1, 0, 50));
}
{
return rWPin;
}
+
+ public void setLogicModelBinding(WordAddressableMemoryComponent memory)
+ {
+ this.memory = memory;
+ }
+
+ public MainMemoryDefinition getDefinition()
+ {
+ return definition;
+ }
+
+ public WordAddressableMemoryComponent getMemory()
+ {
+ return memory;
+ }
@Override
public void render(GeneralGC gc, Rectangle visibleRegion)
@Override
public JsonElement getParamsForSerializing(IdentifierGetter idGetter)
{
- JsonObject obj = new JsonObject();
- obj.addProperty(paramAddr, addressBits);
- obj.addProperty(paramWordWidth, wordWidth);
- obj.addProperty(paramMaxAddr, maximalAddress);
- obj.addProperty(paramMinAddr, minimalAddress);
- return obj;
+ return new Gson().toJsonTree(new DefaultMainMemoryDefinition(definition));
}
static
ViewLogicModelAdapter.addComponentAdapter(new WordAddressableMemoryAdapter());
IndirectGUIComponentCreator.setComponentSupplier(GUIAndGate.class.getCanonicalName(), (m, p, n) ->
{
- JsonObject obj = p.getAsJsonObject();
- return new GUIMemoryWA(m, obj.get(paramAddr).getAsInt(), obj.get(paramWordWidth).getAsInt(), obj.get(paramMaxAddr).getAsLong(),
- obj.get(paramMinAddr).getAsLong(), n);
+ return new GUIMemoryWA(m, new Gson().fromJson(p, DefaultMainMemoryDefinition.class), n);
});
}
}
import net.mograsim.logic.core.types.Bit;
import net.mograsim.logic.core.types.BitVector;
+import net.mograsim.machine.MainMemory;
+import net.mograsim.machine.MainMemoryDefinition;
-public class WordAddressableMemory
+public class WordAddressableMemory implements MainMemory
{
private final int cellWidth;
private final long minimalAddress, maximalAddress;
+ private final MainMemoryDefinition definition;
private final int pageSize = 64;
private HashMap<Long, Page> pages;
- public WordAddressableMemory(int cellWidth, long minimalAddress, long maximalAddress)
+ public WordAddressableMemory(MainMemoryDefinition definition)
{
super();
- this.cellWidth = cellWidth;
- this.minimalAddress = minimalAddress;
- this.maximalAddress = maximalAddress;
+ this.cellWidth = definition.getCellWidth();
+ this.minimalAddress = definition.getMinimalAddress();
+ this.maximalAddress = definition.getMaximalAddress();
+ this.definition = definition;
this.pages = new HashMap<>();
}
+ @Override
public void setCell(long address, BitVector b)
{
if (address < minimalAddress || address > maximalAddress)
p.setCell(offset, b);
}
+ @Override
public BitVector getCell(long address)
{
long page = address / pageSize;
return Arrays.deepToString(memory);
}
}
+
+ @Override
+ public MainMemoryDefinition getDefinition()
+ {
+ return definition;
+ }
}
ReadWriteEnd data = logicWiresPerPin.get(guiComponent.getDataPin()).createReadWriteEnd();
ReadEnd address = logicWiresPerPin.get(guiComponent.getAddressPin()).createReadOnlyEnd();
ReadEnd mode = logicWiresPerPin.get(guiComponent.getReadWritePin()).createReadOnlyEnd();
- new WordAddressableMemoryComponent(timeline, 2, guiComponent.maximalAddress, guiComponent.minimalAddress, data, mode, address);
+ new WordAddressableMemoryComponent(timeline, 2, guiComponent.getDefinition(), data, mode, address);
}
}
import net.mograsim.logic.core.types.BitVector;
import net.mograsim.logic.core.wires.Wire.ReadEnd;
import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
+import net.mograsim.machine.MainMemoryDefinition;
/**
* A memory component that only allows access to words of a specific length
* @param rWBit The value of the 0th bit dictates the mode: 0: Write, 1: Read
* @param address The bits of this ReadEnd address the memory cell to read/write
*/
- public WordAddressableMemoryComponent(Timeline timeline, int processTime, long minimalAddress, long maximalAddress, ReadWriteEnd data,
+ public WordAddressableMemoryComponent(Timeline timeline, int processTime, MainMemoryDefinition definition, ReadWriteEnd data,
ReadEnd rWBit, ReadEnd address)
{
super(timeline, processTime);
+ if(data.length() != definition.getCellWidth())
+ throw new IllegalArgumentException(String.format("Bit width of data wire does not match main memory definition. Expected: %d Actual: %d", definition.getCellWidth(), data.length()));
+ if(rWBit.length() != 1)
+ throw new IllegalArgumentException(String.format("Bit width of read/write mode select wire is unexpected. Expected: 1 Actual: %d", rWBit.length()));
+ if(address.length() != definition.getMemoryAddressBits())
+ throw new IllegalArgumentException(String.format("Bit width of address wire does not match main memory definition. Expected: %d Actual: %d", definition.getMemoryAddressBits(), address.length()));
this.data = data;
this.rWBit = rWBit;
this.address = address;
rWBit.registerObserver(this);
address.registerObserver(this);
- memory = new WordAddressableMemory(data.length(), minimalAddress, maximalAddress);
+ memory = new WordAddressableMemory(definition);
}
@Override
projects / Mograsim.git / commitdiff