public_mirrors/symon
1
0 Fork 1
mirror of https://codeberg.org/sethm/symon.git synced 2026-11-09 11:32:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from Max840/master

Browse Source 
New way of defining devices and a bit of optimization
This commit is contained in:
Seth Morabito committed 2013-12-28 23:20:23 -08:00
2 parents a5af522c5c bc6b93e3fe
commit e9a9786135
7 files changed
+40 -59
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/loomcom/symon/Bus.java
+5 -31
View File
@@ -114,40 +114,14 @@ public class Bus {
return false; return false;
} }
// Loop over devices and ensure they are contiguous. // Loop over devices and add their size
MemoryRange prev = null; int filledMemory = 0;
int i = 0;
int length = devices.size();
for (Device d : devices) { for (Device d : devices) {
MemoryRange cur = d.getMemoryRange(); filledMemory += d.getSize();
if (i == 0) {
// If the first entry doesn't start at 'startAddress', return false.
if (cur.startAddress() != startAddress) {
return false;
}
} }
if (prev != null && i < length - 1) { // Returns if the total size of the devices fill the bus' memory space
// Otherwise, compare previous map's end against this map's return filledMemory == endAddress - startAddress + 1;
// endAddress. They must be adjacent!
if (cur.startAddress() - 1 != prev.endAddress()) {
return false;
}
}
if (i == length - 1) {
// If the last entry doesn't end at endAddress, return false;
if (cur.endAddress() != endAddress) {
return false;
}
}
i++;
prev = cur;
}
// Must be complete.
return true;
} }
public int read(int address) throws MemoryAccessException { public int read(int address) throws MemoryAccessException {
src/main/java/com/loomcom/symon/Simulator.java
+4 -4
View File
@@ -152,7 +152,7 @@ public class Simulator {
this.via = new Via(VIA_BASE); this.via = new Via(VIA_BASE);
this.bus = new Bus(BUS_BOTTOM, BUS_TOP); this.bus = new Bus(BUS_BOTTOM, BUS_TOP);
this.cpu = new Cpu(); this.cpu = new Cpu();
this.ram = new Memory(MEMORY_BASE, MEMORY_SIZE, false); this.ram = new Memory(MEMORY_BASE, MEMORY_BASE + MEMORY_SIZE - 1, false);
bus.addCpu(cpu); bus.addCpu(cpu);
bus.addDevice(ram); bus.addDevice(ram);
@@ -163,11 +163,11 @@ public class Simulator {
File romImage = new File("rom.bin"); File romImage = new File("rom.bin");
if (romImage.canRead()) { if (romImage.canRead()) {
logger.info("Loading ROM image from file " + romImage); logger.info("Loading ROM image from file " + romImage);
this.rom = Memory.makeROM(ROM_BASE, ROM_SIZE, romImage); this.rom = Memory.makeROM(ROM_BASE, ROM_BASE + ROM_SIZE - 1, romImage);
} else { } else {
logger.info("Default ROM file " + romImage + logger.info("Default ROM file " + romImage +
" not found, loading empty R/W memory image."); " not found, loading empty R/W memory image.");
this.rom = Memory.makeRAM(ROM_BASE, ROM_SIZE); this.rom = Memory.makeRAM(ROM_BASE, ROM_BASE + ROM_SIZE - 1);
} }
bus.addDevice(rom); bus.addDevice(rom);
} }
@@ -568,7 +568,7 @@ public class Simulator {
bus.removeDevice(rom); bus.removeDevice(rom);
} }
// Load the new ROM image // Load the new ROM image
rom = Memory.makeROM(ROM_BASE, ROM_SIZE, romFile); rom = Memory.makeROM(ROM_BASE, ROM_BASE + ROM_SIZE - 1, romFile);
bus.addDevice(rom); bus.addDevice(rom);
// Now, reset // Now, reset
src/main/java/com/loomcom/symon/devices/Acia.java
+1 -1
View File
@@ -75,7 +75,7 @@ public class Acia extends Device {
private boolean txEmpty = true; private boolean txEmpty = true;
public Acia(int address) throws MemoryRangeException { public Acia(int address) throws MemoryRangeException {
super(address, ACIA_SIZE, "ACIA"); super(address, address + ACIA_SIZE - 1, "ACIA");
this.baseAddress = address; this.baseAddress = address;
} }
src/main/java/com/loomcom/symon/devices/Device.java
+12 -4
View File
@@ -35,20 +35,24 @@ public abstract class Device implements Comparable<Device> {
/** The memory range for this device. */ /** The memory range for this device. */
private MemoryRange memoryRange; private MemoryRange memoryRange;
/** Size of the device in memory **/
int size;
/** The name of the device. */ /** The name of the device. */
private String name; private String name;
/** Reference to the bus where this Device is attached. */ /** Reference to the bus where this Device is attached. */
private Bus bus; private Bus bus;
public Device(int address, int size, String name) public Device(int startAddress, int endAddress, String name)
throws MemoryRangeException { throws MemoryRangeException {
this.memoryRange = new MemoryRange(address, address + size - 1); this.memoryRange = new MemoryRange(startAddress, endAddress);
this.size = endAddress - startAddress + 1;
this.name = name; this.name = name;
} }
public Device(int address, int size) throws MemoryRangeException { public Device(int startAddress, int endAddress) throws MemoryRangeException {
this(address, size, null); this(startAddress, endAddress, null);
} }
/* Methods required to be implemented by inheriting classes. */ /* Methods required to be implemented by inheriting classes. */
@@ -80,6 +84,10 @@ public abstract class Device implements Comparable<Device> {
return name; return name;
} }
public int getSize(){
return size;
}
public void setName(String name) { public void setName(String name) {
this.name = name; this.name = name;
} }
src/main/java/com/loomcom/symon/devices/Memory.java
+9 -9
View File
@@ -38,26 +38,26 @@ public class Memory extends Device {
/* Initialize all locations to 0x00 (BRK) */ /* Initialize all locations to 0x00 (BRK) */
private static final int DEFAULT_FILL = 0x00; private static final int DEFAULT_FILL = 0x00;
public Memory(int address, int size, boolean readOnly) public Memory(int startAddress, int endAddress, boolean readOnly)
throws MemoryRangeException { throws MemoryRangeException {
super(address, size, (readOnly ? "RO Memory" : "RW Memory")); super(startAddress, endAddress, (readOnly ? "RO Memory" : "RW Memory"));
this.readOnly = readOnly; this.readOnly = readOnly;
this.mem = new int[size]; this.mem = new int[this.size];
this.fill(DEFAULT_FILL); this.fill(DEFAULT_FILL);
} }
public Memory(int address, int size) throws MemoryRangeException { public Memory(int startAddress, int endAddress) throws MemoryRangeException {
this(address, size, false); this(startAddress, endAddress, false);
} }
public static Memory makeROM(int address, int size, File f) throws MemoryRangeException, IOException { public static Memory makeROM(int startAddress, int endAddress, File f) throws MemoryRangeException, IOException {
Memory memory = new Memory(address, size, true); Memory memory = new Memory(startAddress, endAddress, true);
memory.loadFromFile(f); memory.loadFromFile(f);
return memory; return memory;
} }
public static Memory makeRAM(int address, int size) throws MemoryRangeException { public static Memory makeRAM(int startAddress, int endAddress) throws MemoryRangeException {
Memory memory = new Memory(address, size, false); Memory memory = new Memory(startAddress, endAddress, false);
return memory; return memory;
} }
src/main/java/com/loomcom/symon/devices/Via.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class Via extends Device {
private static final int ORA_H = 15; private static final int ORA_H = 15;
public Via(int address) throws MemoryRangeException { public Via(int address) throws MemoryRangeException {
super(address, VIA_SIZE, "VIA"); super(address, address + VIA_SIZE - 1, "VIA");
} }
@Override @Override
src/test/java/com/loomcom/symon/BusTest.java
+8 -9
View File
@@ -47,8 +47,8 @@ public class BusTest extends TestCase {
} }
public void testAddDevice() throws MemoryRangeException { public void testAddDevice() throws MemoryRangeException {
Device memory = new Memory(0x0000, 0x0100, true); Device memory = new Memory(0x0000, 0x00ff, true);
Device rom = new Memory(0x0100, 0x0200, false); Device rom = new Memory(0x0100, 0x02ff, false);
Bus b = new Bus(0x0000, 0xffff); Bus b = new Bus(0x0000, 0xffff);
@@ -85,8 +85,7 @@ public class BusTest extends TestCase {
} }
public void testIsCompleteWithOneDevice() throws MemoryRangeException { public void testIsCompleteWithOneDevice() throws MemoryRangeException {
Device memory = new Memory(0x0000, 0x10000, true); Device memory = new Memory(0x0000, 0xffff, true);
Bus b = new Bus(0x0000, 0xffff); Bus b = new Bus(0x0000, 0xffff);
assertFalse("Address space was unexpectedly complete!", b.isComplete()); assertFalse("Address space was unexpectedly complete!", b.isComplete());
b.addDevice(memory); b.addDevice(memory);
@@ -94,8 +93,8 @@ public class BusTest extends TestCase {
} }
public void testIsCompleteWithTwoDevices() throws MemoryRangeException { public void testIsCompleteWithTwoDevices() throws MemoryRangeException {
Device memory = new Memory(0x0000, 0x8000, true); Device memory = new Memory(0x0000, 0x7fff, true);
Device rom = new Memory(0x8000, 0x8000, false); Device rom = new Memory(0x8000, 0xffff, false);
Bus b = new Bus(0x0000, 0xffff); Bus b = new Bus(0x0000, 0xffff);
assertFalse("Address space was unexpectedly complete!", b.isComplete()); assertFalse("Address space was unexpectedly complete!", b.isComplete());
@@ -106,9 +105,9 @@ public class BusTest extends TestCase {
} }
public void testIsCompleteWithThreeDevices() throws MemoryRangeException { public void testIsCompleteWithThreeDevices() throws MemoryRangeException {
Device memory = new Memory(0x0000, 0x8000, true); Device memory = new Memory(0x0000, 0x7fff, true);
Device rom1 = new Memory(0x8000, 0x4000, false); Device rom1 = new Memory(0x8000, 0xBfff, false);
Device rom2 = new Memory(0xC000, 0x4000, false); Device rom2 = new Memory(0xC000, 0xffff, false);
Bus b = new Bus(0x0000, 0xffff); Bus b = new Bus(0x0000, 0xffff);
assertFalse("Address space was unexpectedly complete!", b.isComplete()); assertFalse("Address space was unexpectedly complete!", b.isComplete());