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

reverted r1342

This commit is contained in:
shinydoofy 2009-06-19 14:13:01 +00:00
parent dbf5319806
commit fb1e6fa613
1 changed files with 26 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
src/ppu.cpp
View File

@ -49,7 +49,6 @@
#define SpriteON (PPU[1]&0x10) //Show Sprite #define SpriteON (PPU[1]&0x10) //Show Sprite
#define ScreenON (PPU[1]&0x08) //Show screen #define ScreenON (PPU[1]&0x08) //Show screen
#define PPUON (PPU[1]&0x18) //PPU should operate #define PPUON (PPU[1]&0x18) //PPU should operate
#define GRAYSCALE (PPU[1]&0x01) //Grayscale (AND palette entries with 0x30)
#define SpriteLeft8 (PPU[1]&0x04) #define SpriteLeft8 (PPU[1]&0x04)
#define BGLeft8 (PPU[1]&0x02) #define BGLeft8 (PPU[1]&0x02)
@ -342,41 +341,24 @@ int FCEUPPU_GetAttr(int ntnum, int xt, int yt) {
//new ppu----- //new ppu-----
inline void FFCEUX_PPUWrite_Default(uint32 A, uint8 V) { inline void FFCEUX_PPUWrite_Default(uint32 A, uint8 V) {
uint32 tmp = A; uint32 tmp = A;
if(tmp>=0x3F00) if(tmp>=0x3F00)
{ {
// hmmm.... // hmmm....
switch (tmp & 0x1F) if(!(tmp&0xf))
{
case 0x10: case 0x14: case 0x18: case 0x1C:
PALRAM[tmp & 0x0C] =
PALRAM[tmp & 0x1C] = V & 0x3F;
break;
case 0x0: case 0x4: case 0x8: case 0xC:
PALRAM[tmp & 0x1F] =
PALRAM[(tmp & 0x1F) | 0x10] = V & 0x3F;
break;
default:
PALRAM[tmp & 0x1F] = V & 0x3F;
}
/* if(!(tmp&0xf))
PALRAM[0x00]=PALRAM[0x04]=PALRAM[0x08]=PALRAM[0x0C]=V&0x3F; PALRAM[0x00]=PALRAM[0x04]=PALRAM[0x08]=PALRAM[0x0C]=V&0x3F;
else if(tmp&3) PALRAM[(tmp&0x1f)]=V&0x3f;*/ else if(tmp&3) PALRAM[(tmp&0x1f)]=V&0x3f;
} }
else if(tmp<0x2000)
else if(tmp<0x2000) {
{ if(PPUCHRRAM&(1<<(tmp>>10)))
if(PPUCHRRAM&(1<<(tmp>>10))) VPage[tmp>>10][tmp]=V;
VPage[tmp>>10][tmp]=V; }
} else
else {
{ if(PPUNTARAM&(1<<((tmp&0xF00)>>10)))
if(PPUNTARAM&(1<<((tmp&0xF00)>>10))) vnapage[((tmp&0xF00)>>10)][tmp&0x3FF]=V;
vnapage[((tmp&0xF00)>>10)][tmp&0x3FF]=V; }
}
} }
uint8 FFCEUX_PPURead_Default(uint32 A) { uint8 FFCEUX_PPURead_Default(uint32 A) {
@ -473,27 +455,14 @@ static DECLFR(A2007)
uint32 tmp=RefreshAddr&0x3FFF; uint32 tmp=RefreshAddr&0x3FFF;
if(newppu) { if(newppu) {
//mbg //mbg
ret = VRAMBuffer; ret = VRAMBuffer;
RefreshAddr = ppur.get_2007access() & 0x3FFF; RefreshAddr = ppur.get_2007access();
if ((RefreshAddr & 0x3F00) == 0x3F00) VRAMBuffer = CALL_PPUREAD(RefreshAddr);
{
//if it is in the palette range bypass the
//delayed read, and what gets filled in the temp
//buffer is the address - 0x1000, also
//if grayscale is set then the return is AND with 0x30
//to get a gray color reading
ret = PALRAM[RefreshAddr & 0x1F];
if (GRAYSCALE)
ret &= 0x30;
VRAMBuffer = CALL_PPUREAD(RefreshAddr - 0x1000);
}
else
VRAMBuffer = CALL_PPUREAD(RefreshAddr);
ppur.increment2007(INC32!=0); ppur.increment2007(INC32!=0);
RefreshAddr = ppur.get_2007access(); RefreshAddr = ppur.get_2007access();
return ret; return ret;
} else { } else {
FCEUPPU_LineUpdate(); FCEUPPU_LineUpdate();
ret=VRAMBuffer; ret=VRAMBuffer;
@ -508,18 +477,10 @@ static DECLFR(A2007)
{ {
VRAMBuffer=VPage[tmp>>10][tmp]; VRAMBuffer=VPage[tmp>>10][tmp];
} }
else if (tmp < 0x3F00) else
{ {
VRAMBuffer=vnapage[(tmp>>10)&0x3][tmp&0x3FF]; VRAMBuffer=vnapage[(tmp>>10)&0x3][tmp&0x3FF];
} }
else
{
ret = PALRAM[RefreshAddr & 0x1F];
if (GRAYSCALE)
ret &= 0x30;
VRAMBuffer = vnapage[(tmp>>10)&0x3][tmp&0x3FF];
}
} }
#ifdef FCEUDEF_DEBUGGER #ifdef FCEUDEF_DEBUGGER
if(!fceuindbg) if(!fceuindbg)
@ -666,7 +627,7 @@ static DECLFW(B2007)
uint32 tmp=RefreshAddr&0x3FFF; uint32 tmp=RefreshAddr&0x3FFF;
if(newppu) { if(newppu) {
RefreshAddr = ppur.get_2007access() & 0x3FFF; RefreshAddr = ppur.get_2007access();
CALL_PPUWRITE(RefreshAddr,V); CALL_PPUWRITE(RefreshAddr,V);
//printf("%04x ",RefreshAddr); //printf("%04x ",RefreshAddr);
ppur.increment2007(INC32!=0); ppur.increment2007(INC32!=0);
@ -676,28 +637,13 @@ static DECLFW(B2007)
{ {
//printf("%04x ",tmp); //printf("%04x ",tmp);
PPUGenLatch=V; PPUGenLatch=V;
if(tmp>=0x3F00) if(tmp>=0x3F00)
{ {
switch (tmp & 0x1F)
{
case 0x10: case 0x14: case 0x18: case 0x1C:
PALRAM[tmp & 0x0C] =
PALRAM[tmp & 0x1C] = V & 0x3F;
break;
case 0x0: case 0x4: case 0x8: case 0xC:
PALRAM[tmp & 0x1F] =
PALRAM[(tmp & 0x1F) | 0x10] = V & 0x3F;
break;
default:
PALRAM[tmp & 0x1F] = V & 0x3F;
}
/*
// hmmm.... // hmmm....
if(!(tmp&0xf)) if(!(tmp&0xf))
PALRAM[0x00]=PALRAM[0x04]=PALRAM[0x08]=PALRAM[0x0C]=V&0x3F; PALRAM[0x00]=PALRAM[0x04]=PALRAM[0x08]=PALRAM[0x0C]=V&0x3F;
else if(tmp&3) PALRAM[(tmp&0x1f)]=V&0x3f;*/ else if(tmp&3) PALRAM[(tmp&0x1f)]=V&0x3f;
} }
else if(tmp<0x2000) else if(tmp<0x2000)
{ {
if(PPUCHRRAM&(1<<(tmp>>10))) if(PPUCHRRAM&(1<<(tmp>>10)))