ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GBA SIO: Add periodic hard sync so the runner doesn't get too ahead

This commit is contained in:
Vicki Pfau 2024-09-17 00:35:31 -07:00
parent 79ed790a4e
commit 7089a5572b
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/mgba/internal/gba/sio/lockstep.h
View File

@ -41,6 +41,7 @@ struct GBASIOLockstepCoordinator {
enum GBASIOMode transferMode; enum GBASIOMode transferMode;
int32_t cycle; int32_t cycle;
int32_t nextHardSync;
uint16_t multiData[4]; uint16_t multiData[4];
uint32_t normalData[4]; uint32_t normalData[4];

26
src/gba/sio/lockstep.c
View File

@ -12,6 +12,7 @@
#define DRIVER_STATE_VERSION 1 #define DRIVER_STATE_VERSION 1
#define LOCKSTEP_INTERVAL 2048 #define LOCKSTEP_INTERVAL 2048
#define UNLOCKED_INTERVAL 4096 #define UNLOCKED_INTERVAL 4096
#define HARD_SYNC_INTERVAL 0x80000
#define TARGET(P) (1 << (P)) #define TARGET(P) (1 << (P))
#define TARGET_ALL 0xF #define TARGET_ALL 0xF
#define TARGET_PRIMARY 0x1 #define TARGET_PRIMARY 0x1
@ -67,7 +68,8 @@ struct GBASIOLockstepSerializedState {
struct { struct {
int32_t cycle; int32_t cycle;
uint32_t waiting; uint32_t waiting;
uint32_t reservedCoordinator[4]; int32_t nextHardSync;
uint32_t reservedCoordinator[3];
uint16_t multiData[4]; uint16_t multiData[4];
uint32_t normalData[4]; uint32_t normalData[4];
} coordinator; } coordinator;
@ -159,9 +161,10 @@ static void GBASIOLockstepDriverDeinit(struct GBASIODriver* driver) {
static void GBASIOLockstepDriverReset(struct GBASIODriver* driver) { static void GBASIOLockstepDriverReset(struct GBASIODriver* driver) {
struct GBASIOLockstepDriver* lockstep = (struct GBASIOLockstepDriver*) driver; struct GBASIOLockstepDriver* lockstep = (struct GBASIOLockstepDriver*) driver;
struct GBASIOLockstepCoordinator* coordinator = lockstep->coordinator; struct GBASIOLockstepCoordinator* coordinator = lockstep->coordinator;
struct GBASIOLockstepPlayer* player;
if (!lockstep->lockstepId) { if (!lockstep->lockstepId) {
struct GBASIOLockstepPlayer* player = calloc(1, sizeof(*player));
unsigned id; unsigned id;
player = calloc(1, sizeof(*player));
player->driver = lockstep; player->driver = lockstep;
player->mode = driver->p->mode; player->mode = driver->p->mode;
player->playerId = -1; player->playerId = -1;
@ -195,16 +198,19 @@ static void GBASIOLockstepDriverReset(struct GBASIODriver* driver) {
}; };
_enqueueEvent(coordinator, &event, TARGET_ALL & ~TARGET(player->playerId)); _enqueueEvent(coordinator, &event, TARGET_ALL & ~TARGET(player->playerId));
} }
MutexUnlock(&coordinator->mutex); } else {
player = TableLookup(&coordinator->players, lockstep->lockstepId);
if (player->playerId != 0) {
player->cycleOffset = mTimingCurrentTime(&driver->p->p->timing) - coordinator->cycle + LOCKSTEP_INTERVAL;
}
} }
if (mTimingIsScheduled(&lockstep->d.p->p->timing, &lockstep->event)) { if (mTimingIsScheduled(&lockstep->d.p->p->timing, &lockstep->event)) {
MutexUnlock(&coordinator->mutex);
return; return;
} }
int32_t nextEvent; int32_t nextEvent;
MutexLock(&coordinator->mutex);
struct GBASIOLockstepPlayer* player = TableLookup(&coordinator->players, lockstep->lockstepId);
_setReady(coordinator, player, player->playerId, player->mode); _setReady(coordinator, player, player->playerId, player->mode);
if (TableSize(&coordinator->players) == 1) { if (TableSize(&coordinator->players) == 1) {
coordinator->cycle = mTimingCurrentTime(&lockstep->d.p->p->timing); coordinator->cycle = mTimingCurrentTime(&lockstep->d.p->p->timing);
@ -341,6 +347,7 @@ static bool GBASIOLockstepDriverLoadState(struct GBASIODriver* driver, const voi
if (player->playerId == 0) { if (player->playerId == 0) {
LOAD_32LE(coordinator->cycle, 0, &state->coordinator.cycle); LOAD_32LE(coordinator->cycle, 0, &state->coordinator.cycle);
LOAD_32LE(coordinator->waiting, 0, &state->coordinator.waiting); LOAD_32LE(coordinator->waiting, 0, &state->coordinator.waiting);
LOAD_32LE(coordinator->nextHardSync, 0, &state->coordinator.nextHardSync);
for (i = 0; i < 4; ++i) { for (i = 0; i < 4; ++i) {
LOAD_16LE(coordinator->multiData[i], 0, &state->coordinator.multiData[i]); LOAD_16LE(coordinator->multiData[i], 0, &state->coordinator.multiData[i]);
LOAD_32LE(coordinator->normalData[i], 0, &state->coordinator.normalData[i]); LOAD_32LE(coordinator->normalData[i], 0, &state->coordinator.normalData[i]);
@ -406,6 +413,7 @@ static void GBASIOLockstepDriverSaveState(struct GBASIODriver* driver, void** st
if (player->playerId == 0) { if (player->playerId == 0) {
STORE_32LE(coordinator->cycle, 0, &state->coordinator.cycle); STORE_32LE(coordinator->cycle, 0, &state->coordinator.cycle);
STORE_32LE(coordinator->waiting, 0, &state->coordinator.waiting); STORE_32LE(coordinator->waiting, 0, &state->coordinator.waiting);
STORE_32LE(coordinator->nextHardSync, 0, &state->coordinator.nextHardSync);
for (i = 0; i < 4; ++i) { for (i = 0; i < 4; ++i) {
STORE_16LE(coordinator->multiData[i], 0, &state->coordinator.multiData[i]); STORE_16LE(coordinator->multiData[i], 0, &state->coordinator.multiData[i]);
STORE_32LE(coordinator->normalData[i], 0, &state->coordinator.normalData[i]); STORE_32LE(coordinator->normalData[i], 0, &state->coordinator.normalData[i]);
@ -643,6 +651,7 @@ void _advanceCycle(struct GBASIOLockstepCoordinator* coordinator, struct GBASIOL
int32_t newCycle = GBASIOLockstepTime(player); int32_t newCycle = GBASIOLockstepTime(player);
mASSERT(newCycle - coordinator->cycle >= 0); mASSERT(newCycle - coordinator->cycle >= 0);
//mLOG(GBA_SIO, DEBUG, "Advancing from cycle %08X to %08X (%i cycles)", coordinator->cycle, newCycle, newCycle - coordinator->cycle); //mLOG(GBA_SIO, DEBUG, "Advancing from cycle %08X to %08X (%i cycles)", coordinator->cycle, newCycle, newCycle - coordinator->cycle);
coordinator->nextHardSync -= newCycle - coordinator->cycle;
coordinator->cycle = newCycle; coordinator->cycle = newCycle;
} }
@ -674,6 +683,7 @@ void _reconfigPlayers(struct GBASIOLockstepCoordinator* coordinator) {
struct GBASIOLockstepPlayer* player = TableIteratorGetValue(&coordinator->players, &iter); struct GBASIOLockstepPlayer* player = TableIteratorGetValue(&coordinator->players, &iter);
coordinator->cycle = mTimingCurrentTime(&player->driver->d.p->p->timing); coordinator->cycle = mTimingCurrentTime(&player->driver->d.p->p->timing);
coordinator->nextHardSync = HARD_SYNC_INTERVAL;
if (player->playerId != 0) { if (player->playerId != 0) {
player->playerId = 0; player->playerId = 0;
@ -859,6 +869,12 @@ void _lockstepEvent(struct mTiming* timing, void* context, uint32_t cyclesLate)
if (!coordinator->transferActive) { if (!coordinator->transferActive) {
GBASIOLockstepCoordinatorWakePlayers(coordinator); GBASIOLockstepCoordinatorWakePlayers(coordinator);
} }
if (coordinator->nextHardSync < 0) {
if (!coordinator->waiting) {
_hardSync(coordinator, player);
}
coordinator->nextHardSync += HARD_SYNC_INTERVAL;
}
} }
int32_t nextEvent = _untilNextSync(coordinator, player); int32_t nextEvent = _untilNextSync(coordinator, player);