X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=fce.c;h=687b686ebf8b8bac8a71d739d087f4cd93d3fc95;hp=5b72b3b5be1619dd45091d094ca63ea25ba00b92;hb=4a1bf31bcd80812fe491d3255646e43c304116b9;hpb=5232c20c0fa2c80964fe1d3f597c239bcf93d6fc diff --git a/fce.c b/fce.c index 5b72b3b..687b686 100644 --- a/fce.c +++ b/fce.c @@ -1,7 +1,7 @@ /* FCE Ultra - NES/Famicom Emulator * * Copyright notice for this file: - * Copyright (C) 1998 BERO + * Copyright (C) 1998 BERO * Copyright (C) 2002 Ben Parnell * * This program is free software; you can redistribute it and/or modify @@ -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); @@ -63,7 +63,7 @@ int MMC5Hack; uint32 MMC5HackVROMMask; uint8 *MMC5HackExNTARAMPtr; uint8 *MMC5HackVROMPTR; -uint8 MMC5HackCHRMode=0; +uint8 MMC5HackCHRMode=0; uint8 MMC5HackSPMode; uint8 MMC5HackSPScroll; uint8 MMC5HackSPPage; @@ -217,9 +217,9 @@ uint8 PAL=0; #define MMC5BGVRAMADR(V) &MMC5BGVPage[(V)>>10][(V)] #define VRAMADR(V) &VPage[(V)>>10][(V)] - + static DECLFW(BRAML) -{ +{ RAM[A]=V; } @@ -238,7 +238,7 @@ static DECLFR(ARAMH) return RAM[A&0x7FF]; } - + static DECLFR(A2002) { uint8 ret; @@ -260,11 +260,11 @@ static DECLFR(A2007) PPUGenLatch=ret=VRAMBuffer; if(PPU_hook) PPU_hook(tmp); - if(tmp<0x2000) + if(tmp<0x2000) { VRAMBuffer=VPage[tmp>>10][tmp]; } - else + else { VRAMBuffer=vnapage[(tmp>>10)&0x3][tmp&0x3FF]; } @@ -366,7 +366,7 @@ static DECLFW(B2006) } static DECLFW(B2007) -{ +{ uint32 tmp=RefreshAddr&0x3FFF; PPUGenLatch=V; @@ -384,7 +384,7 @@ static DECLFW(B2007) VPage[tmp>>10][tmp]=V; } else - { + { if(PPUNTARAM&(1<<((tmp&0xF00)>>10))) vnapage[((tmp&0xF00)>>10)][tmp&0x3FF]=V; } @@ -394,7 +394,7 @@ static DECLFW(B2007) } static DECLFW(B4014) -{ +{ uint32 t=V<<8; int x; for(x=0;x<256;x++) @@ -404,8 +404,19 @@ 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); @@ -415,7 +426,7 @@ void BGRender(uint8 *target) } #ifdef FRAMESKIP -extern int framesRendered; +int FSkip_setting=-1; // auto int FSkip=0; void FCEUI_FrameSkip(int x) { @@ -466,7 +477,7 @@ static void Loop6502(void) { #endif if(PPU[1]&0x01) - { + { for(x=63;x>=0;x--) *(uint32 *)&target[x<<2]=(*(uint32*)&target[x<<2])&0xF0F0F0F0; } @@ -488,7 +499,7 @@ static void Loop6502(void) { tem=Pal[0]|(Pal[0]<<8)|(Pal[0]<<16)|(Pal[0]<<24); FCEU_dwmemset(target,tem,256); - } + } if(InputScanlineHook) InputScanlineHook(target, scanline); } @@ -521,32 +532,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; @@ -556,12 +548,12 @@ static void FASTAPASS(1) RefreshLine(uint8 *target) uint8 cc,zz,zz2; uint32 vadr; - if((tochange<=0 && MMC5HackSPMode&0x40) || + if((tochange<=0 && MMC5HackSPMode&0x40) || (tochange>0 && !(MMC5HackSPMode&0x40))) { uint8 xs,ys; - xs=33-X1; + xs=33-X1; ys=((scanline>>3)+MMC5HackSPScroll)&0x1F; if(ys>=0x1E) ys-=0x1E; vadr=(MMC5HackExNTARAMPtr[xs|(ys<<5)]<<4)+(vofs&7); @@ -589,10 +581,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; @@ -608,7 +601,7 @@ static void FASTAPASS(1) RefreshLine(uint8 *target) { uint8 xs,ys; - xs=33-X1; + xs=33-X1; ys=((scanline>>3)+MMC5HackSPScroll)&0x1F; if(ys>=0x1E) ys-=0x1E; vadr=(MMC5HackExNTARAMPtr[xs|(ys<<5)]<<4)+(vofs&7); @@ -636,21 +629,23 @@ 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; + uint8 *C; uint8 cc; uint8 zz2; - uint32 vadr; + uint32 vadr; C=MMC5HackVROMPTR; zz2=(RefreshAddr>>10)&3; vadr = (vnapage[zz2][RefreshAddr & 0x3ff] << 4) + vofs; - C += (((MMC5HackExNTARAMPtr[RefreshAddr & 0x3ff]) & 0x3f & + C += (((MMC5HackExNTARAMPtr[RefreshAddr & 0x3ff]) & 0x3f & MMC5HackVROMMask) << 12) + (vadr & 0xfff); vadr = (MMC5HackExNTARAMPtr[RefreshAddr & 0x3ff] & 0xC0)>> 4; cc = vadr; @@ -661,9 +656,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; @@ -678,22 +676,23 @@ static void FASTAPASS(1) RefreshLine(uint8 *target) cc=((cc >> ((zz&2) + ((RefreshAddr&0x40)>>4))) &3) <<2; #include "fceline.h" - + if((RefreshAddr&0x1f)==0x1f) RefreshAddr^=0x41F; 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; + uint8 *C; uint8 cc,zz,zz2; - uint32 vadr; + uint32 vadr; zz=RefreshAddr&0x1F; zz2=(RefreshAddr>>10)&3; @@ -712,9 +711,12 @@ static void FASTAPASS(1) RefreshLine(uint8 *target) else RefreshAddr++; } - } - else - { +} + +static void RefreshLine_normal(uint8 *P, uint32 vofs) +{ + int8 X1; + for(X1=33;X1;X1--,P+=8) { uint8 *C; @@ -727,21 +729,66 @@ static void FASTAPASS(1) RefreshLine(uint8 *target) C = VRAMADR(vadr); cc=vnapage[zz2][0x3c0+(zz>>2)+((RefreshAddr&0x380)>>4)]; cc=((cc >> ((zz&2) + ((RefreshAddr&0x40)>>4))) &3) <<2; - #include "fceline.h" - + { + uint8 *S=PALRAM+cc; + uint8 c1,c2; + + c1=((C[0]>>1)&0x55)|(C[8]&0xAA); + c2=(C[0]&0x55)|((C[8]<<1)&0xAA); + + P[6]=S[c1&3]; + P[7]=S[c2&3]; + P[4]=S[(c1>>2)&3]; + P[5]=S[(c2>>2)&3]; + P[2]=S[(c1>>4)&3]; + P[3]=S[(c2>>4)&3]; + + P[0]=S[c1>>6]; + P[1]=S[c2>>6]; + } + if((RefreshAddr&0x1f)==0x1f) RefreshAddr^=0x41F; else RefreshAddr++; } - } - - #undef vofs +} - 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) @@ -874,7 +921,7 @@ void CloseGame(void) FlushGameCheats(); #ifdef NETWORK if(FSettings.NetworkPlay) KillNetplay(); - #endif + #endif GameInterface(GI_CLOSE); CloseGenie(); GameLoaded=0; @@ -934,7 +981,7 @@ FCEUGI *FCEUI_LoadGame(char *name) endlseq: FCEU_fclose(fp); - GameLoaded=1; + GameLoaded=1; FCEU_ResetVidSys(); if(FCEUGameInfo.type!=GIT_NSF) @@ -951,7 +998,7 @@ FCEUGI *FCEUI_LoadGame(char *name) LoadGamePalette(); LoadGameCheats(); } - + FCEU_ResetPalette(); Exit=0; return(&FCEUGameInfo); @@ -983,6 +1030,7 @@ void FCEU_ResetVidSys(void) FSettings.FirstSLine=FSettings.UsrFirstSLine[0]; FSettings.LastSLine=FSettings.UsrLastSLine[0]; } + printf("PAL = %i\n", PAL); SetSoundVariables(); } @@ -1004,7 +1052,7 @@ static INLINE void Thingo(void) Loop6502(); if(tosprite>=256) - { + { X6502_Run(256-harko); Fixit1(); X6502_Run(harko); @@ -1047,14 +1095,14 @@ void EmLoop(void) breaks a Super Donkey Kong game. */ X6502_Run(12); /* I need to figure out the true nature and length - of this delay. + of this delay. */ if(FCEUGameInfo.type==GIT_NSF) TriggerNMINSF(); else if(VBlankON) TriggerNMI(); - X6502_Run((scanlines_per_frame-242)*(256+85)-12); + X6502_Run((scanlines_per_frame-242)*(256+85)-12); PPU_status&=0x1f; @@ -1081,6 +1129,7 @@ void EmLoop(void) int x,max,maxref; deemp=PPU[1]>>5; + SetRefreshLine(); for(scanline=0;scanline<240;scanline++) { deempcnt[deemp]++; @@ -1110,7 +1159,6 @@ void EmLoop(void) { FCEU_PutImageDummy(); FSkip--; - framesRendered++; FCEUD_Update(0,WaveFinalMono,ssize); } else @@ -1194,7 +1242,7 @@ void ResetNES(void) X6502_Reset(); } -void PowerNES(void) +void PowerNES(void) { if(!GameLoaded) return;