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

DS GX: Use CircleBufferRead/Write

This commit is contained in:
Vicki Pfau 2017-03-21 22:30:43 -07:00
parent 1de5d4e330
commit 1b0d74f3dc
1 changed files with 7 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/ds/gx.c
View File

@ -116,29 +116,13 @@ static struct DSGXRenderer dummyRenderer = {
static void _pullPipe(struct DSGX* gx) { static void _pullPipe(struct DSGX* gx) {
if (CircleBufferSize(&gx->fifo) >= sizeof(struct DSGXEntry)) { if (CircleBufferSize(&gx->fifo) >= sizeof(struct DSGXEntry)) {
struct DSGXEntry entry = { 0 }; struct DSGXEntry entry = { 0 };
CircleBufferRead8(&gx->fifo, (int8_t*) &entry.command); CircleBufferRead(&gx->fifo, &entry, sizeof(entry));
CircleBufferRead8(&gx->fifo, (int8_t*) &entry.params[0]); CircleBufferWrite(&gx->pipe, &entry, sizeof(entry));
CircleBufferRead8(&gx->fifo, (int8_t*) &entry.params[1]);
CircleBufferRead8(&gx->fifo, (int8_t*) &entry.params[2]);
CircleBufferRead8(&gx->fifo, (int8_t*) &entry.params[3]);
CircleBufferWrite8(&gx->pipe, entry.command);
CircleBufferWrite8(&gx->pipe, entry.params[0]);
CircleBufferWrite8(&gx->pipe, entry.params[1]);
CircleBufferWrite8(&gx->pipe, entry.params[2]);
CircleBufferWrite8(&gx->pipe, entry.params[3]);
} }
if (CircleBufferSize(&gx->fifo) >= sizeof(struct DSGXEntry)) { if (CircleBufferSize(&gx->fifo) >= sizeof(struct DSGXEntry)) {
struct DSGXEntry entry = { 0 }; struct DSGXEntry entry = { 0 };
CircleBufferRead8(&gx->fifo, (int8_t*) &entry.command); CircleBufferRead(&gx->fifo, &entry, sizeof(entry));
CircleBufferRead8(&gx->fifo, (int8_t*) &entry.params[0]); CircleBufferWrite(&gx->pipe, &entry, sizeof(entry));
CircleBufferRead8(&gx->fifo, (int8_t*) &entry.params[1]);
CircleBufferRead8(&gx->fifo, (int8_t*) &entry.params[2]);
CircleBufferRead8(&gx->fifo, (int8_t*) &entry.params[3]);
CircleBufferWrite8(&gx->pipe, entry.command);
CircleBufferWrite8(&gx->pipe, entry.params[0]);
CircleBufferWrite8(&gx->pipe, entry.params[1]);
CircleBufferWrite8(&gx->pipe, entry.params[2]);
CircleBufferWrite8(&gx->pipe, entry.params[3]);
} }
} }
@ -680,11 +664,7 @@ static void _fifoRun(struct mTiming* timing, void* context, uint32_t cyclesLate)
} else if (!gx->activeParams && cycles > cyclesLate) { } else if (!gx->activeParams && cycles > cyclesLate) {
break; break;
} }
CircleBufferRead8(&gx->pipe, (int8_t*) &entry.command); CircleBufferRead(&gx->pipe, &entry, sizeof(entry));
CircleBufferRead8(&gx->pipe, (int8_t*) &entry.params[0]);
CircleBufferRead8(&gx->pipe, (int8_t*) &entry.params[1]);
CircleBufferRead8(&gx->pipe, (int8_t*) &entry.params[2]);
CircleBufferRead8(&gx->pipe, (int8_t*) &entry.params[3]);
if (gx->activeParams) { if (gx->activeParams) {
int index = _gxCommandParams[entry.command] - gx->activeParams; int index = _gxCommandParams[entry.command] - gx->activeParams;
@ -1452,17 +1432,9 @@ static void DSGXWriteFIFO(struct DSGX* gx, struct DSGXEntry entry) {
return; return;
} }
if (CircleBufferSize(&gx->fifo) == 0 && CircleBufferSize(&gx->pipe) < (DS_GX_PIPE_SIZE * sizeof(entry))) { if (CircleBufferSize(&gx->fifo) == 0 && CircleBufferSize(&gx->pipe) < (DS_GX_PIPE_SIZE * sizeof(entry))) {
CircleBufferWrite8(&gx->pipe, entry.command); CircleBufferWrite(&gx->pipe, &entry, sizeof(entry));
CircleBufferWrite8(&gx->pipe, entry.params[0]);
CircleBufferWrite8(&gx->pipe, entry.params[1]);
CircleBufferWrite8(&gx->pipe, entry.params[2]);
CircleBufferWrite8(&gx->pipe, entry.params[3]);
} else if (CircleBufferSize(&gx->fifo) < (DS_GX_FIFO_SIZE * sizeof(entry))) { } else if (CircleBufferSize(&gx->fifo) < (DS_GX_FIFO_SIZE * sizeof(entry))) {
CircleBufferWrite8(&gx->fifo, entry.command); CircleBufferWrite(&gx->fifo, &entry, sizeof(entry));
CircleBufferWrite8(&gx->fifo, entry.params[0]);
CircleBufferWrite8(&gx->fifo, entry.params[1]);
CircleBufferWrite8(&gx->fifo, entry.params[2]);
CircleBufferWrite8(&gx->fifo, entry.params[3]);
} }
if (entry.command == DS_GX_CMD_BOX_TEST) { if (entry.command == DS_GX_CMD_BOX_TEST) {
DSRegGXSTAT gxstat = gx->p->memory.io9[DS9_REG_GXSTAT_LO >> 1]; DSRegGXSTAT gxstat = gx->p->memory.io9[DS9_REG_GXSTAT_LO >> 1];