Skip to content

Commit

Permalink
big update to interrupt flow
Browse files Browse the repository at this point in the history 
breaks nester's funky bowling but improves basically everything else so i'll figure that out later
  • Loading branch information
@skyfloogle
skyfloogle committed Dec 31, 2023
1 parent 111098a commit 0e9e730
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 31 deletions.
4 changes: 3 additions & 1 deletion source/3ds/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ int main() {
int qwe;
int frame = 0;
int err = 0;
int alt_buf = 1; // 1 is required for red alarm
int alt_buf = 0;
int skip = 0;
bool loaded = false;
PrintConsole main_console;
Expand Down Expand Up @@ -149,6 +149,8 @@ int main() {
skip = 0;
if (tVIPREG.DPCTRL & 0x0002) {
video_render(alt_buf);
}
if (tVIPREG.XPCTRL & 0x0002) {
memset(V810_DISPLAY_RAM.pmemory + 0x8000 * alt_buf, 0, 0x6000);
memset(V810_DISPLAY_RAM.pmemory + 0x10000 + 0x8000 * alt_buf, 0, 0x6000);
alt_buf = !alt_buf;
Expand Down
3 changes: 2 additions & 1 deletion source/common/drc_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1503,7 +1503,8 @@ int drc_run() {

v810_state->ret = 0;

while (!serviceDisplayInt(clocks, v810_state->PC)) {
while (true) {
serviceDisplayInt(clocks, v810_state->PC);
serviceInt(clocks, v810_state->PC);

v810_state->PC &= V810_ROM1.highaddr;
Expand Down
74 changes: 45 additions & 29 deletions source/common/v810_cpu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,52 +215,60 @@ int serviceInt(unsigned int cycles, WORD PC) {

int serviceDisplayInt(unsigned int cycles, WORD PC) {
static unsigned int lastfb=0;
static int rowcount,tmp1,frames=0;
int gamestart;
static int rowcount,frames=0;
static bool drawing = false;
static bool newframe = true;
int gamestart,framestart;
unsigned int tfb = (cycles-lastfb);
bool pending_int = 0;

v810_state->PC = PC;

//Handle DPSTTS, XPSTTS, and Frame interrupts
if (rowcount < 0x1C) {
if ((rowcount == 0) && (tfb > 0x0210) && (!tmp1)) {
tmp1=1;
tVIPREG.XPSTTS &= 0x000F;
tVIPREG.DPSTTS = ((tVIPREG.DPCTRL&0x0302)|0xC0);
if (++frames > tVIPREG.FRMCYC) {
if (newframe) {
// new frame
newframe = false;
framestart = 0;
gamestart = 0;
if (tVIPREG.DPCTRL & 0x02) {
framestart = 0x0010;
tVIPREG.DPSTTS = ((tVIPREG.DPCTRL&0x0302)|0xC0);
}
if ((tVIPREG.XPCTRL & 0x02) && ++frames > tVIPREG.FRMCYC) {
drawing = true;
frames = 0;
gamestart = 0x0008;
} else {
gamestart = 0;
gamestart = 8;
tVIPREG.tFrame++;
if ((tVIPREG.tFrame < 1) || (tVIPREG.tFrame > 2)) tVIPREG.tFrame = 1;
tVIPREG.XPSTTS = (0x0002|(tVIPREG.tFrame<<2));
}
if (tVIPREG.INTENB&(0x0010|gamestart)) {
if (tVIPREG.INTENB&(framestart|gamestart)) {
v810_int(4, PC);
pending_int = 1;
}
tVIPREG.INTPND |= (0x0010|gamestart);

v810_state->ret = 1;
return 1;
tVIPREG.INTPND |= (framestart|gamestart);
pending_int = 1;
} else if ((tfb > 0x0500) && (!(tVIPREG.XPSTTS&0x8000))) {
tVIPREG.XPSTTS |= 0x8000;
pending_int = 1;
} else if (tfb > 0x0A00) {
tVIPREG.XPSTTS = ((tVIPREG.XPSTTS&0xE0)|(rowcount<<8)|(tVIPREG.XPCTRL & 0x02));
if (drawing) tVIPREG.XPSTTS = ((tVIPREG.XPSTTS&0xE0)|(rowcount<<8)|(tVIPREG.XPCTRL & 0x02));
rowcount++;
lastfb+=0x0A00;
} else if ((rowcount == 0x12) && (tfb > 0x670)) {
tVIPREG.DPSTTS = ((tVIPREG.DPCTRL & 0x0302) | (tVIPREG.tFrame & 1 ? 0xD0 : 0xC4));
pending_int = 1;
}
} else {
if ((rowcount == 0x1C) && (tfb > 0x10000)) { //0x100000
tVIPREG.XPSTTS = (0x1B00 | (tVIPREG.XPCTRL & 0x02));
if (drawing) {
drawing = false;

tVIPREG.XPSTTS = (0x1B00 | (tVIPREG.XPCTRL & 0x02));
pending_int = 1;

if (frames == 0) {
/*if(tVBOpt.VFHACK) //vertical force hack
v810_int(4);
else */if (tVIPREG.INTENB & 0x4000) {
if (tVIPREG.INTENB & 0x4000) {
v810_int(4, PC); //XPEND
pending_int = 1;
}

tVIPREG.INTPND |= 0x4000; //(tVIPREG.INTENB&0x4000);
Expand All @@ -273,34 +281,42 @@ int serviceDisplayInt(unsigned int cycles, WORD PC) {
pending_int = 1;
}
tVIPREG.INTPND |= 0x0002; //(tVIPREG.INTENB&0x0002);
pending_int = 1;
rowcount++;
} else if ((rowcount == 0x1E) && (tfb > 0x20000)) { //0x15E70
tVIPREG.DPSTTS = ((tVIPREG.DPCTRL&0x0302)|0x40);
if (tVIPREG.INTENB&0x0004) {
v810_int(4, PC); //RFBEND
pending_int = 1;
}
tVIPREG.INTPND |= 0x0004; //(tVIPREG.INTENB&0x0004);
pending_int = 1;
rowcount++;
} else if ((rowcount == 0x1F) && (tfb > 0x28000)) { //0x1FAD8
//tVIPREG.DPSTTS = ((tVIPREG.DPCTRL&0x0302)|((tVIPREG.tFrame&1)?0x48:0x60));
tVIPREG.DPSTTS = ((tVIPREG.DPCTRL&0x0302)|((tVIPREG.tFrame&1)?0x60:0x48)); //if editing FB0, shouldn't be drawing FB0
if (tVIPREG.INTENB&0x2000) {
v810_int(4, PC); //SBHIT
pending_int = 1;
}
tVIPREG.INTPND |= 0x2000;
pending_int = 1;
rowcount++;
} else if ((rowcount == 0x20) && (tfb > 0x38000)) { //0x33FD8
tVIPREG.DPSTTS = ((tVIPREG.DPCTRL&0x0302)|0x40);
rowcount++;
} else if ((rowcount == 0x21) && (tfb > 0x50280)) {
tmp1=0;
// frame end
rowcount=0;
tVIPREG.tFrame++;
if ((tVIPREG.tFrame < 1) || (tVIPREG.tFrame > 2)) tVIPREG.tFrame = 1;
tVIPREG.XPSTTS = (0x1B00|(tVIPREG.tFrame<<2)|(tVIPREG.XPCTRL & 0x02));
v810_state->ret = 1;
lastfb+=0x50280;
newframe = true;
pending_int = 1;
}
}

if (!pending_int) {
if (tVIPREG.INTENB & tVIPREG.INTPND) {
v810_int(4, PC);
pending_int = 1;
}
}

Expand Down
2 changes: 2 additions & 0 deletions source/common/v810_mem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -782,6 +782,8 @@ void vipcreg_whword(WORD addr, HWORD data) {
if(data & 0x0001) {
tVIPREG.INTPND &= 0x001F;
tVIPREG.INTENB &= 0x001F;
tVIPREG.XPCTRL &= ~0x0002;
tVIPREG.XPSTTS &= ~0x0002;
}
break;
case 0x0005F844: //VER
Expand Down

0 comments on commit 0e9e730

Please sign in to comment.