X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fce.c;h=42a4d76ef49a0433145acde0470902eaad31ea37;hb=9115e7d2b5e5b8dc00774fe92db97f1d02b2fee1;hp=214a41f7ac337eb6905505debaf8b26ab42ed4b9;hpb=15300263784975ac57355208762caa5ef7906624;p=fceu.git diff --git a/fce.c b/fce.c index 214a41f..42a4d76 100644 --- a/fce.c +++ b/fce.c @@ -51,7 +51,7 @@ #define Pal (PALRAM) -static void FASTAPASS(1) RefreshLine(uint8 *target); +static void (*RefreshLine)(uint8 *P, uint32 vofs) = NULL; static void PRefreshLine(void); static void ResetPPU(void); @@ -205,13 +205,14 @@ uint32 TempAddr,RefreshAddr; int scanline; static uint32 scanlines_per_frame; +uint8 GameMemBlock[131072] __attribute__ ((aligned (4))); +uint8 NTARAM[0x800] __attribute__ ((aligned (4))); +uint8 PALRAM[0x20] __attribute__ ((aligned (4))); +uint8 RAM[0x800] __attribute__ ((aligned (4))); + uint8 PPU[4]; uint8 PPUSPL; -uint8 GameMemBlock[131072]; -uint8 NTARAM[0x800],PALRAM[0x20]; -uint8 RAM[0x800]; - uint8 PAL=0; @@ -404,12 +405,24 @@ static DECLFW(B4014) void BGRender(uint8 *target) { - uint32 tem; - RefreshLine(target); + uint32 tem, vofs; + vofs=((PPU[0]&0x10)<<8) | ((RefreshAddr>>12)&7); + + Pal[0]|=64; + Pal[4]|=64; + Pal[8]|=64; + Pal[0xC]|=64; + RefreshLine(target-XOffset, vofs); + Pal[0]&=63; + Pal[4]&=63; + Pal[8]&=63; + Pal[0xC]&=63; + if(!(PPU[1]&2)) { - tem=Pal[0]|(Pal[0]<<8)|(Pal[0]<<16)|(Pal[0]<<24); - tem|=0x40404040; + tem=Pal[0]|0x40; + tem|=tem<<8; + tem|=tem<<16; *(uint32 *)target=*(uint32 *)(target+4)=tem; } } @@ -521,32 +534,13 @@ static void PRefreshLine(void) } } -/* Total of 33 tiles(32 + 1 extra) */ -static void FASTAPASS(1) RefreshLine(uint8 *target) +/* This high-level graphics MMC5 emulation code was written + for MMC5 carts in "CL" mode. It's probably not totally + correct for carts in "SL" mode. + */ +static void RefreshLine_MMC5Hack1(uint8 *P, uint32 vofs) { - uint32 vofs; - int X1; - uint8 *P=target; - - vofs=0; - - Pal[0]|=64; - Pal[4]|=64; - Pal[8]|=64; - Pal[0xC]|=64; - - vofs=((PPU[0]&0x10)<<8) | ((RefreshAddr>>12)&7); - P-=XOffset; - - /* This high-level graphics MMC5 emulation code was written - for MMC5 carts in "CL" mode. It's probably not totally - correct for carts in "SL" mode. - */ - if(MMC5Hack && geniestage!=1) - { - if(MMC5HackCHRMode==0 && (MMC5HackSPMode&0x80)) - { - int8 tochange; + int8 tochange, X1; tochange=MMC5HackSPMode&0x1F; @@ -589,10 +583,11 @@ static void FASTAPASS(1) RefreshLine(uint8 *target) RefreshAddr++; tochange--; } - } - else if(MMC5HackCHRMode==1 && (MMC5HackSPMode&0x80)) - { - int8 tochange; +} + +static void RefreshLine_MMC5Hack2(uint8 *P, uint32 vofs) +{ + int8 tochange, X1; tochange=MMC5HackSPMode&0x1F; @@ -636,10 +631,12 @@ static void FASTAPASS(1) RefreshLine(uint8 *target) RefreshAddr++; tochange--; } - } +} + +static void RefreshLine_MMC5Hack3(uint8 *P, uint32 vofs) +{ + int8 X1; - else if(MMC5HackCHRMode==1) - { for(X1=33;X1;X1--,P+=8) { uint8 *C; @@ -661,9 +658,12 @@ static void FASTAPASS(1) RefreshLine(uint8 *target) else RefreshAddr++; } - } - else - { +} + +static void RefreshLine_MMC5Hack4(uint8 *P, uint32 vofs) +{ + int8 X1; + for(X1=33;X1;X1--,P+=8) { uint8 *C; @@ -684,11 +684,12 @@ static void FASTAPASS(1) RefreshLine(uint8 *target) else RefreshAddr++; } - } - } // End if(MMC5Hack) +} + +static void RefreshLine_PPU_hook(uint8 *P, uint32 vofs) +{ + int8 X1; - else if(PPU_hook) - { for(X1=33;X1;X1--,P+=8) { uint8 *C; @@ -712,36 +713,75 @@ static void FASTAPASS(1) RefreshLine(uint8 *target) else RefreshAddr++; } - } - else - { - for(X1=33;X1;X1--,P+=8) +} + +static void RefreshLine_normal(uint8 *P, uint32 vofs) // vofs is 0x107 max +{ + int8 X1; + uint32 rfraddr = RefreshAddr; + uint8 *page = vnapage[(rfraddr>>10)&3]; + uint32 cc2=0; + + if ((rfraddr&0xc)!=0) + cc2=*(uint32 *) (page + ((rfraddr&0x380)>>4) + ((rfraddr&0x10)>>2) + 0x3c0); + + for (X1=33;X1;X1--,P+=8) { - uint8 *C; - uint8 cc,zz,zz2; + uint8 cc,*C; uint32 vadr; - zz=RefreshAddr&0x1F; - zz2=(RefreshAddr>>10)&3; - vadr=(vnapage[zz2][RefreshAddr&0x3ff]<<4)+vofs; + vadr=(page[rfraddr&0x3ff]<<4)+vofs; C = VRAMADR(vadr); - cc=vnapage[zz2][0x3c0+(zz>>2)+((RefreshAddr&0x380)>>4)]; - cc=((cc >> ((zz&2) + ((RefreshAddr&0x40)>>4))) &3) <<2; - #include "fceline.h" + if ((rfraddr&0xc)==0) + cc2=*(uint32 *) (page + ((rfraddr&0x380)>>4) + ((rfraddr&0x10)>>2) + 0x3c0); + cc=((cc2 >> ((rfraddr&2) + ((rfraddr&0x40)>>4) + ((rfraddr&0xc)<<1))) & 3) << 2; - if((RefreshAddr&0x1f)==0x1f) - RefreshAddr^=0x41F; - else - RefreshAddr++; - } - } + #include "fceline.h" - #undef vofs + if((rfraddr&0x1f)==0x1f) { + rfraddr^=0x41F; + page = vnapage[(rfraddr>>10)&3]; + } else + rfraddr++; + } + RefreshAddr = rfraddr; +} - Pal[0]&=63; - Pal[4]&=63; - Pal[8]&=63; - Pal[0xC]&=63; +static void SetRefreshLine(void) +{ + if(MMC5Hack && geniestage!=1) + { + if(MMC5HackCHRMode==0 && (MMC5HackSPMode&0x80)) + { + if (RefreshLine != RefreshLine_MMC5Hack1) printf("set refr RefreshLine_MMC5Hack1\n"); + RefreshLine = RefreshLine_MMC5Hack1; + } + else if(MMC5HackCHRMode==1 && (MMC5HackSPMode&0x80)) + { + if (RefreshLine != RefreshLine_MMC5Hack2) printf("set refr RefreshLine_MMC5Hack2\n"); + RefreshLine = RefreshLine_MMC5Hack2; + } + else if(MMC5HackCHRMode==1) + { + if (RefreshLine != RefreshLine_MMC5Hack3) printf("set refr RefreshLine_MMC5Hack3\n"); + RefreshLine = RefreshLine_MMC5Hack3; + } + else + { + if (RefreshLine != RefreshLine_MMC5Hack4) printf("set refr RefreshLine_MMC5Hack4\n"); + RefreshLine = RefreshLine_MMC5Hack4; + } + } // End if(MMC5Hack) + else if(PPU_hook) + { + if (RefreshLine != RefreshLine_PPU_hook) printf("set refr RefreshLine_PPU_hook\n"); + RefreshLine = RefreshLine_PPU_hook; + } + else + { + if (RefreshLine != RefreshLine_normal) printf("set refr RefreshLine_normal\n"); + RefreshLine = RefreshLine_normal; + } } static INLINE void Fixit2(void) @@ -809,20 +849,6 @@ static void DoHBlank(void) - - - - - - - - - - - - - - // ============================// // end of new code // ===========================// @@ -1082,6 +1108,7 @@ void EmLoop(void) int x,max,maxref; deemp=PPU[1]>>5; + SetRefreshLine(); for(scanline=0;scanline<240;scanline++) { deempcnt[deemp]++;