X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=fce.c;h=d3a0f6104d57a58c3b07c5478da7dfb0685d290b;hp=561661a8493bc742bc493c487d357b2c23e524a3;hb=6587f34612d28a36fede21bd6293c4e0e383b343;hpb=4fdfab079f3f006ae215ab453072a25588aa951d diff --git a/fce.c b/fce.c index 561661a..d3a0f61 100644 --- a/fce.c +++ b/fce.c @@ -48,10 +48,15 @@ #include "crc32.h" #include "ppu.h" +#include "palette.h" #include "movie.h" #include "dprintf.h" +#ifdef GP2X +#include "drivers/gp2x/asmutils.h" +#endif + #define Pal (PALRAM) @@ -97,7 +102,7 @@ void (*GameInterface)(int h); void FP_FASTAPASS(1) (*PPU_hook)(uint32 A); void (*GameStateRestore)(int version); -void (*GameHBIRQHook)(void); +void (*GameHBIRQHook)(void), (*GameHBIRQHook2)(void); readfunc ARead[0x10000]; writefunc BWrite[0x10000]; @@ -353,7 +358,7 @@ static DECLFR(A2002) vtoggle=0; PPU_status&=0x7F; PPUGenLatch=ret; - dprintf("r [2002] %02x",ret); + //dprintf("r [2002] %02x",ret); return ret; } @@ -581,7 +586,7 @@ static void Loop6502(void) #endif if(ScreenON) { - if(scanline>=FSettings.FirstSLine && scanline<=FSettings.LastSLine) + if(scanline>=FSettings.FirstSLine && scanline<=Settings.LastSLine) BGRender(target); else { @@ -609,17 +614,24 @@ static void Loop6502(void) for(x=63;x>=0;x--) ((uint32 *)target)[x]=((uint32*)target)[x]&0xF0F0F0F0; } +#ifdef GP2X + if((PPU[1]>>5)==0x7) block_or(target, 256, 0xc0); + else if(PPU[1]&0xE0) block_andor(target, 256, 0x3f, 0x40); + else block_andor(target, 256, 0x3f, 0x80); +#else if((PPU[1]>>5)==0x7) for(x=63;x>=0;x--) - ((uint32 *)target)[x]=(((uint32*)target)[x]&0x3f3f3f3f)|0x40404040; + ((uint32 *)target)[x]=(((uint32*)target)[x])|0xc0c0c0c0; else if(PPU[1]&0xE0) for(x=63;x>=0;x--) - ((uint32 *)target)[x]=((uint32*)target)[x]|0xC0C0C0C0; + ((uint32 *)target)[x]=(((uint32*)target)[x]&0x3f3f3f3f)|0x40404040; else for(x=63;x>=0;x--) - ((uint32 *)target)[x]=((uint32*)target)[x]&0x3f3f3f3f; - FCEU_dwmemset(target- 8,0x3f3f3f3f,8); - FCEU_dwmemset(target+256,0x3f3f3f3f,8); + ((uint32 *)target)[x]=(((uint32*)target)[x]&0x3f3f3f3f)|0x80808080; +#endif + // black borders + ((uint32 *)target)[-2]=((uint32 *)target)[-1]=0; + ((uint32 *)target)[64]=((uint32 *)target)[65]=0; #ifdef FRAMESKIP } #endif @@ -959,7 +971,7 @@ static void DoHBlank(void) { if(ScreenON || SpriteON) FetchSpriteData(); - if(GameHBIRQHook && (ScreenON || SpriteON)) + if(GameHBIRQHook && (ScreenON || SpriteON) && ((PPU[0]&0x38)!=0x18)) { X6502_Run(6); Fixit2(); @@ -973,10 +985,13 @@ static void DoHBlank(void) Fixit2(); X6502_Run(85-6-16); } + if(GameHBIRQHook2 && (ScreenON || SpriteON)) + GameHBIRQHook2(); //PPU_hook(0,-1); //fprintf(stderr,"%3d: $%04x\n",scanline,RefreshAddr); scanline++; - ResetRL(); + if (scanline<240) + ResetRL(); X6502_Run(16); } @@ -1029,7 +1044,7 @@ void CloseGame(void) if(GameLoaded) { if(FCEUGameInfo.type!=GIT_NSF) - FlushGameCheats(); + FCEU_FlushGameCheats(0,0); #ifdef NETWORK if(FSettings.NetworkPlay) KillNetplay(); #endif @@ -1044,7 +1059,7 @@ void ResetGameLoaded(void) if(GameLoaded) CloseGame(); GameStateRestore=0; PPU_hook=0; - GameHBIRQHook=0; + GameHBIRQHook=GameHBIRQHook2=0; GameExpSound.Fill=0; GameExpSound.RChange=0; if(GameExpSound.Kill) @@ -1063,6 +1078,10 @@ void ResetGameLoaded(void) } char lastLoadedGameName [2048]; +int UNIFLoad(const char *name, int fp); +int iNESLoad(const char *name, int fp); +int FDSLoad(const char *name, int fp); +int NSFLoad(int fp); FCEUGI *FCEUI_LoadGame(char *name) { @@ -1132,8 +1151,8 @@ FCEUGI *FCEUI_LoadGame(char *name) SaveStateRefresh(); if(FCEUGameInfo.type!=GIT_NSF) { - LoadGamePalette(); - LoadGameCheats(); + FCEU_LoadGamePalette(); + FCEU_LoadGameCheats(0); } FCEU_ResetPalette(); @@ -1180,14 +1199,17 @@ int FCEUI_Initialize(void) FSettings.UsrFirstSLine[0]=8; FSettings.UsrFirstSLine[1]=0; FSettings.UsrLastSLine[0]=FSettings.UsrLastSLine[1]=239; - FSettings.SoundVolume=65535; // 100% + FSettings.SoundVolume=100; return 1; } +void MMC5_hb(int); /* Ugh ugh ugh. */ static INLINE void Thingo(void) { Loop6502(); + if(MMC5Hack && (ScreenON || SpriteON)) MMC5_hb(scanline); + // check: Battletoads & Double Dragon if(tosprite>=256) { @@ -1209,21 +1231,20 @@ void EmLoop(void) { for(;;) { + int x; uint32 scanlines_per_frame = PAL ? 312 : 262; UpdateInput(); - ApplyPeriodicCheats(); + FCEU_ApplyPeriodicCheats(); // FCEUPPU_Loop: if(ppudead) /* Needed for Knight Rider, possibly others. */ { - memset(XBuf, 0x80, 256*240); + //memset(XBuf, 0, 320*240); X6502_Run(scanlines_per_frame*(256+85)); ppudead--; goto update; } - //extern int asdc; - //printf("asdc: %i\n", asdc); - //asdc=0; + X6502_Run(256+85); PPU[2]|=0x80; @@ -1236,7 +1257,7 @@ void EmLoop(void) of this delay. */ if(FCEUGameInfo.type==GIT_NSF) - TriggerNMINSF(); + DoNSFFrame(); else if(VBlankON) TriggerNMI(); @@ -1249,14 +1270,19 @@ void EmLoop(void) X6502_Run(256+85); } // X6502_Run((scanlines_per_frame-242)*(256+85)-12); - PPU_status&=0x1f; - X6502_Run(256); + { if(ScreenON || SpriteON) + { if(GameHBIRQHook) GameHBIRQHook(); + if(PPU_hook) + for(x=0;x<42;x++) {PPU_hook(0x2000); PPU_hook(0);} // ugh + if(GameHBIRQHook2) + GameHBIRQHook2(); + } X6502_Run(85-16); @@ -1273,7 +1299,9 @@ void EmLoop(void) if(FCEUGameInfo.type==GIT_NSF) { - X6502_Run((256+85)*240); + // run scanlines for asm core to fuction + for(scanline=0;scanline<240;scanline++) + X6502_Run(256+85); } else { @@ -1286,6 +1314,7 @@ void EmLoop(void) deempcnt[deemp]++; Thingo(); } + if(MMC5Hack && (ScreenON || SpriteON)) MMC5_hb(scanline); for(x=1,max=0,maxref=0;x<7;x++) { if(deempcnt[x]>max) @@ -1295,8 +1324,6 @@ void EmLoop(void) } deempcnt[x]=0; } - //FCEU_DispMessage("%2x:%2x:%2x:%2x:%2x:%2x:%2x:%2x %d",deempcnt[0],deempcnt[1],deempcnt[2],deempcnt[3],deempcnt[4],deempcnt[5],deempcnt[6],deempcnt[7],maxref); - //memset(deempcnt,0,sizeof(deempcnt)); SetNESDeemph(maxref,0); } @@ -1391,7 +1418,7 @@ static void PowerPPU(void) void ResetNES(void) { - if(!GameLoaded || (FCEUGameInfo.type==GIT_NSF)) return; + if(!GameLoaded) return; GameInterface(GI_RESETM2); ResetSound(); ResetPPU(); @@ -1416,3 +1443,26 @@ void PowerNES(void) X6502_Power(); } + +/* savestate stuff */ +uint16 TempAddrT,RefreshAddrT; + +SFORMAT FCEUPPU_STATEINFO[]={ + { NTARAM, 0x800, "NTAR"}, + { PALRAM, 0x20, "PRAM"}, + { SPRAM, 0x100, "SPRA"}, + { PPU, 0x4, "PPUR"}, + { &XOffset, 1, "XOFF"}, + { &vtoggle, 1, "VTOG"}, + { &RefreshAddrT, 2|RLSB, "RADD"}, + { &TempAddrT, 2|RLSB, "TADD"}, + { &VRAMBuffer, 1, "VBUF"}, + { &PPUGenLatch, 1, "PGEN"}, + // from 0.98.15 + { &kook, 1, "KOOK"}, + { &ppudead, 1, "DEAD"}, + { &PPUSPL, 1, "PSPL"}, + { 0 } + }; + +