Skip to content

Commit

Permalink
Merge pull request #357 from emustudio/feature-314
Browse files Browse the repository at this point in the history 
[#314] Fix contention
  • Loading branch information
@vbmacher
vbmacher authored Jan 2, 2024
2 parents 4e1e462 + c7c8691 commit 010a1bf
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 46 deletions.
6 changes: 3 additions & 3 deletions plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/EmulatorEngine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ public void setDispatchListener(DispatchListener dispatchListener) {
this.dispatchListener = dispatchListener;
}

public void addExecutedCyclesPerTimeSlice(long tstates) {
preciseRunner.addExecutedCycles(tstates);
public void addExecutedCyclesPerTimeSlice(long cycles) {
advanceCycles(cycles);
}

public void requestMaskableInterrupt(byte[] data) {
Expand Down Expand Up @@ -198,7 +198,7 @@ public CPU.RunState run(CPU cpu) {
);
}

private void advanceCycles(int cycles) {
private void advanceCycles(long cycles) {
preciseRunner.addExecutedCycles(cycles);
for (int i = 0; i < cycles; i++) {
context.passedCycles(1); // make it precise to the bones
Expand Down
76 changes: 34 additions & 42 deletions ...trum-bus/src/main/java/net/emustudio/plugins/device/zxspectrum/bus/ZxSpectrumBusImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,44 +76,37 @@
*/
@NotThreadSafe
public class ZxSpectrumBusImpl extends AbstractMemoryContext<Byte> implements ZxSpectrumBus, CPUContext.PassedCyclesListener {
private static final long LINE_TSTATES = 224;
private static final long FRAME_TSTATES = 69888;
private static final long FRAME_CYCLES = (64 + 192 + 56) * LINE_CYCLES; // 69888

// from 14335 to 14463, then 96 tstates pause to reach "end of line", then repeat.
private final static Map<Long, Integer> CONTENTION_MAP = new HashMap<>();

static {
CONTENTION_MAP.put(14335L, 6);
CONTENTION_MAP.put(14336L, 5);
CONTENTION_MAP.put(14337L, 4);
CONTENTION_MAP.put(14338L, 3);
CONTENTION_MAP.put(14339L, 2);
CONTENTION_MAP.put(14340L, 1);
CONTENTION_MAP.put(14343L, 6);
CONTENTION_MAP.put(14344L, 5);
CONTENTION_MAP.put(14345L, 4);
CONTENTION_MAP.put(14346L, 3);
CONTENTION_MAP.put(14347L, 2);
CONTENTION_MAP.put(14348L, 1);
CONTENTION_MAP.put(14351L, 6);
CONTENTION_MAP.put(14352L, 5);
CONTENTION_MAP.put(14353L, 4);
CONTENTION_MAP.put(14354L, 3);
CONTENTION_MAP.put(14355L, 2);
CONTENTION_MAP.put(14356L, 1);
CONTENTION_MAP.put(14359L, 6);
CONTENTION_MAP.put(14360L, 5);
CONTENTION_MAP.put(14361L, 4);
CONTENTION_MAP.put(14362L, 3);
CONTENTION_MAP.put(14363L, 2);
// CONTENTION_MAP.put(14364L, 1);
// border contention
for (long i = 14335; i <= 14463; i += 8) {
CONTENTION_MAP.put(i, 6);
CONTENTION_MAP.put(i + 1, 5);
CONTENTION_MAP.put(i + 2, 4);
CONTENTION_MAP.put(i + 3, 3);
CONTENTION_MAP.put(i + 4, 2);
CONTENTION_MAP.put(i + 5, 1);
}
// screen contention
for (long i = 14559; i <= LINE_CYCLES * 192; i += 8) {
CONTENTION_MAP.put(i, 6);
CONTENTION_MAP.put(i + 1, 5);
CONTENTION_MAP.put(i + 2, 4);
CONTENTION_MAP.put(i + 3, 3);
CONTENTION_MAP.put(i + 4, 2);
CONTENTION_MAP.put(i + 5, 1);
}
}

private ContextZ80 cpu;
private MemoryContext<Byte> memory;
private volatile byte busData; // data on the bus

private long contentionCycles;
private long frameCycles;

private final Map<Integer, Context8080.CpuPortDevice> deferredAttachments = new HashMap<>();
private final Set<CPUContext.PassedCyclesListener> deferredListeners = new HashSet<>();
Expand Down Expand Up @@ -199,25 +192,25 @@ public void writeData(Byte data) {

@Override
public Byte read(int location) {
contendedMemory(location);
contendMemory(location);
return memory.read(location);
}

@Override
public Byte[] read(int location, int count) {
contendedMemory(location);
contendMemory(location);
return memory.read(location, count);
}

@Override
public void write(int location, Byte data) {
contendedMemory(location);
contendMemory(location);
memory.write(location, data);
}

@Override
public void write(int location, Byte[] data, int count) {
contendedMemory(location);
contendMemory(location);
memory.write(location, data, count);
}

Expand Down Expand Up @@ -246,11 +239,10 @@ public MemoryContextAnnotations annotations() {
return memory.annotations();
}

private void contendedMemory(int location) {
private void contendMemory(int location) {
if (location >= 0x4000 && location <= 0x7FFF) {
Integer cycles = CONTENTION_MAP.get(contentionCycles);
Integer cycles = CONTENTION_MAP.get(frameCycles);
if (cycles != null) {
// System.out.printf("%04x: %d, tstates=%d\n", location, cycles, contentionCycles);
cpu.addCycles(cycles);
}
}
Expand All @@ -269,37 +261,37 @@ private void contendedPort(int portAddress) {
// after this, CPU adds 4 cycles for I/O.
if ((portAddress & 1) == 0) {
// Yes | Reset | C:1, C:3
Integer cycles = CONTENTION_MAP.get(contentionCycles); // at C:1
Integer cycles = CONTENTION_MAP.get(frameCycles); // at C:1
if (cycles != null) {
cpu.addCycles(cycles);
}
cycles = CONTENTION_MAP.get(contentionCycles + 1); // after C:1
cycles = CONTENTION_MAP.get(frameCycles + 1); // after C:1
if (cycles != null) {
cpu.addCycles(cycles);
}
} else {
// Yes | Set | C:1, C:1, C:1, C:1
Integer cycles = CONTENTION_MAP.get(contentionCycles); // at C:1
Integer cycles = CONTENTION_MAP.get(frameCycles); // at C:1
if (cycles != null) {
cpu.addCycles(cycles);
}
cycles = CONTENTION_MAP.get(contentionCycles + 1); // 2x at C:1
cycles = CONTENTION_MAP.get(frameCycles + 1); // 2x at C:1
if (cycles != null) {
cpu.addCycles(cycles);
}
cycles = CONTENTION_MAP.get(contentionCycles + 2); // 3x at C:1
cycles = CONTENTION_MAP.get(frameCycles + 2); // 3x at C:1
if (cycles != null) {
cpu.addCycles(cycles);
}
cycles = CONTENTION_MAP.get(contentionCycles + 3); // after 3x at C:1
cycles = CONTENTION_MAP.get(frameCycles + 3); // after 3x at C:1
if (cycles != null) {
cpu.addCycles(cycles);
}
}
} else {
// No | Reset | N:1, C:3
if ((portAddress & 1) == 0) {
Integer cycles = CONTENTION_MAP.get(contentionCycles + 1); // after N:1
Integer cycles = CONTENTION_MAP.get(frameCycles + 1); // after N:1
if (cycles != null) {
cpu.addCycles(cycles);
}
Expand All @@ -309,7 +301,7 @@ private void contendedPort(int portAddress) {

@Override
public void passedCycles(long tstates) {
contentionCycles = (contentionCycles + tstates) % FRAME_TSTATES;
frameCycles = (frameCycles + tstates) % FRAME_CYCLES;
}

private class ContendedDeviceProxy implements Context8080.CpuPortDevice {
Expand Down
1 change: 1 addition & 0 deletions ...trum-bus/src/main/java/net/emustudio/plugins/device/zxspectrum/bus/api/ZxSpectrumBus.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
*/
@PluginContext
public interface ZxSpectrumBus extends DeviceContext<Byte>, MemoryContext<Byte> {
long LINE_CYCLES = 224;

/**
* Attach a device on the bus.
Expand Down
2 changes: 1 addition & 1 deletion ...m-ula/src/main/java/net/emustudio/plugins/device/zxspectrum/ula/PassedCyclesMediator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.util.Objects;
import java.util.concurrent.atomic.AtomicReference;

import static net.emustudio.plugins.device.zxspectrum.bus.api.ZxSpectrumBus.LINE_CYCLES;
import static net.emustudio.plugins.device.zxspectrum.ula.ZxParameters.*;

/**
Expand All @@ -41,7 +42,6 @@
* at 3.5MHz/69888=50.08 Hz.
*/
public class PassedCyclesMediator implements CPUContext.PassedCyclesListener {
private static final long LINE_CYCLES = 224;
private static final long FRAME_CYCLES = (PRE_SCREEN_LINES + SCREEN_HEIGHT + POST_SCREEN_LINES) * LINE_CYCLES; // 69888;

private long frameCycles = 0;
Expand Down

0 comments on commit 010a1bf

Please sign in to comment.