xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

games/snes: address remapping and irq reset bug fix

Browse source
This commit is contained in:
aiju 2014-03-21 12:57:17 +01:00
parent 46168ec503
commit feb800ff7c
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
sys/src/games/snes/mem.c
View file

@ -24,6 +24,17 @@ enum {
extern void calc7(void); extern void calc7(void);
static u16int
vrammap(u16int a)
{
switch(reg[0x2115] & 12){
default: return a << 1;
case 4: return a << 1 & 0xfe00 | a << 4 & 0x01f0 | a >> 4 & 0x000e;
case 8: return a << 1 & 0xfc00 | a << 4 & 0x03f0 | a >> 5 & 0x000e;
case 12: return a << 1 & 0xf800 | a << 4 & 0x07f0 | a >> 6 & 0x000e;
}
}
static void static void
incvram(int i, int r) incvram(int i, int r)
{ {
@ -34,10 +45,8 @@ incvram(int i, int r)
if((c >> 7) != i) if((c >> 7) != i)
return; return;
a = reg[0x2116] | reg[0x2117] << 8; a = reg[0x2116] | reg[0x2117] << 8;
if((c & 0x0c) != 0)
print("address remapping\n");
if(r){ if(r){
b = a<<1; b = vrammap(a);
vramlatch = vram[b++]; vramlatch = vram[b++];
vramlatch |= vram[b] << 8; vramlatch |= vram[b] << 8;
} }
@ -254,12 +263,12 @@ regwrite(u16int p, u8int v)
v &= 0x7f; v &= 0x7f;
break; break;
case 0x2118: case 0x2118:
a = reg[0x2116] << 1 | reg[0x2117] << 9; a = vrammap(reg[0x2116] | reg[0x2117] << 8);
vram[a] = v; vram[a] = v;
incvram(0, 0); incvram(0, 0);
return; return;
case 0x2119: case 0x2119:
a = reg[0x2116] << 1 | reg[0x2117] << 9; a = vrammap(reg[0x2116] | reg[0x2117] << 8);
vram[a|1] = v; vram[a|1] = v;
incvram(1, 0); incvram(1, 0);
return; return;
@ -306,6 +315,8 @@ regwrite(u16int p, u8int v)
case 0x4200: case 0x4200:
if((reg[0x4200] & 0x80) == 0 && (v & 0x80) != 0 && (reg[RDNMI] & 0x80) != 0) if((reg[0x4200] & 0x80) == 0 && (v & 0x80) != 0 && (reg[RDNMI] & 0x80) != 0)
nmi = 2; nmi = 2;
if((v & (HCNTIRQ|VCNTIRQ)) == 0)
irq &= ~IRQPPU;
break; break;
case 0x4201: case 0x4201:
if((reg[0x4201] & 0x80) == 0 && (v & 0x80) != 0) if((reg[0x4201] & 0x80) == 0 && (v & 0x80) != 0)