X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=fce.c;h=d3a0f6104d57a58c3b07c5478da7dfb0685d290b;hp=1d5b4937e3c58f54089919e7550e35abc7983d68;hb=6587f34612d28a36fede21bd6293c4e0e383b343;hpb=c0bf6f9f02a2b6afb961a7e9195e2168d7e9cecf diff --git a/fce.c b/fce.c index 1d5b493..d3a0f61 100644 --- a/fce.c +++ b/fce.c @@ -48,16 +48,18 @@ #include "crc32.h" #include "ppu.h" +#include "palette.h" #include "movie.h" -#define Pal (PALRAM) - +#include "dprintf.h" -#ifdef DEBUG_ASM_6502 -extern int cpu_repeat; -extern int cpu_lastval; +#ifdef GP2X +#include "drivers/gp2x/asmutils.h" #endif +#define Pal (PALRAM) + + static void (*RefreshLine)(uint8 *P, uint32 vofs) = NULL; static void PRefreshLine(void); @@ -66,6 +68,9 @@ static void PowerPPU(void); uint64 timestampbase=0; +static int ppudead=1; +static int kook=0; + int MMC5Hack; uint32 MMC5HackVROMMask; uint8 *MMC5HackExNTARAMPtr; @@ -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]; @@ -108,9 +113,6 @@ static int RWWrap=0; #ifdef ASM_6502 static void asmcpu_update(int32 cycles) { - // timestamp.. - timestamp += ((cycles >> 4) * 43) >> 7; // aproximating /= 48 - // some code from x6502.c fhcnt-=cycles; if(fhcnt<=0) @@ -145,7 +147,7 @@ void asmcpu_unpack(void) X6502_Rebase_a(); nes_registers[4] = X.S << 24; nes_registers[4]|= X.IRQlow << 8; - nes_registers[7] = (uint32)X.count; + nes_registers[7] = (uint32)X.count << 16; // NVUB DIZC nes_registers[4]|= X.P & 0x5d; @@ -161,7 +163,7 @@ void asmcpu_pack(void) X.PC= nes_registers[3] - pc_base; X.S = nes_registers[4] >> 24; X.IRQlow = nes_registers[4] >> 8; - X.count = (int32) nes_registers[7]; + X.count = (int32) nes_registers[7] >> 16; // NVUB DIZC X.P = nes_registers[4] & 0x5d; @@ -292,6 +294,38 @@ uint8 PAL=0; #define MMC5BGVRAMADR(V) &MMC5BGVPage[(V)>>10][(V)] #define VRAMADR(V) &VPage[(V)>>10][(V)] +static int linestartts; +static int tofix=0; + +static void ResetRL(void) +{ + linestartts=timestamp*48+X6502_GetCycleCount(); + tofix=1; +} + +static INLINE void Fixit1(void); + +static void TryFixit1(void) +{ + #define TOFIXNUM (272-0x4) + int lastpixel; + + if (scanline < 240 && tofix) + { + lastpixel = (timestamp*48-linestartts)>>4; + if (PAL) lastpixel += lastpixel>>4; + + //printf("lastpixel: %i\n", lastpixel); + + if(lastpixel>=TOFIXNUM) + { + Fixit1(); + tofix=0; + } + } +} + + static DECLFW(BRAML) { RAM[A]=V; @@ -315,34 +349,38 @@ static DECLFR(ARAMH) static DECLFR(A2002) { + /* merged */ uint8 ret; -#ifdef DEBUG_ASM_6502 - if (cpu_repeat) return cpu_lastval; -#endif + + TryFixit1(); ret = PPU_status; + ret|=PPUGenLatch&0x1F; vtoggle=0; PPU_status&=0x7F; -#ifdef DEBUG_ASM_6502 -// cpu_lastval=ret|(PPUGenLatch&0x1F); -#endif - return ret|(PPUGenLatch&0x1F); + PPUGenLatch=ret; + //dprintf("r [2002] %02x",ret); + return ret; } static DECLFR(A200x) { + /* merged */ + TryFixit1(); return PPUGenLatch; } static DECLFR(A2007) { + /* merged */ uint8 ret; uint32 tmp=RefreshAddr&0x3FFF; -#ifdef DEBUG_ASM_6502 - if (cpu_repeat) return cpu_lastval; -#endif - PPUGenLatch=ret=VRAMBuffer; + TryFixit1(); + + ret=VRAMBuffer; + if(PPU_hook) PPU_hook(tmp); + PPUGenLatch=VRAMBuffer; if(tmp<0x2000) { VRAMBuffer=VPage[tmp>>10][tmp]; @@ -355,14 +393,14 @@ static DECLFR(A2007) if (INC32) RefreshAddr+=32; else RefreshAddr++; if(PPU_hook) PPU_hook(RefreshAddr&0x3fff); -#ifdef DEBUG_ASM_6502 -// cpu_lastval=ret; -#endif + dprintf("r [2007] %02x",ret); return ret; } static DECLFW(B2000) { + /* NMI2? */ + TryFixit1(); PPUGenLatch=V; PPU[0]=V; TempAddr&=0xF3FF; @@ -371,6 +409,8 @@ static DECLFW(B2000) static DECLFW(B2001) { + /* merged */ + TryFixit1(); PPUGenLatch=V; PPU[1]=V; if(V&0xE0) @@ -380,11 +420,13 @@ static DECLFW(B2001) static DECLFW(B2002) { + /* merged */ PPUGenLatch=V; } static DECLFW(B2003) { + /* merged */ PPUGenLatch=V; PPU[3]=V; PPUSPL=V&0x7; @@ -392,9 +434,9 @@ static DECLFW(B2003) static DECLFW(B2004) { + /* merged */ PPUGenLatch=V; - //SPRAM[PPU[3]++]=V; - if(PPUSPL&8) + if(PPUSPL>=8) { if(PPU[3]>=8) SPRAM[PPU[3]]=V; @@ -403,16 +445,17 @@ static DECLFW(B2004) { //printf("$%02x:$%02x\n",PPUSPL,V); SPRAM[PPUSPL]=V; - PPUSPL++; } PPU[3]++; + PPUSPL++; } static DECLFW(B2005) { + /* merged */ uint32 tmp=TempAddr; - + TryFixit1(); PPUGenLatch=V; if (!vtoggle) { @@ -433,6 +476,9 @@ static DECLFW(B2005) static DECLFW(B2006) { + /* merged */ + TryFixit1(); + PPUGenLatch=V; if(!vtoggle) { @@ -443,8 +489,8 @@ static DECLFW(B2006) { TempAddr&=0xFF00; TempAddr|=V; - RefreshAddr=TempAddr; + RefreshAddr=TempAddr; if(PPU_hook) PPU_hook(RefreshAddr); } @@ -453,16 +499,15 @@ static DECLFW(B2006) static DECLFW(B2007) { + /* merged */ uint32 tmp=RefreshAddr&0x3FFF; - PPUGenLatch=V; if(tmp>=0x3F00) { - // hmmm.... - if(!(tmp&0xf)) - PALRAM[0x00]=PALRAM[0x04]=PALRAM[0x08]=PALRAM[0x0C]= - PALRAM[0x10]=PALRAM[0x14]=PALRAM[0x18]=PALRAM[0x1c]=V&0x3f; - else if(tmp&3) PALRAM[(tmp&0x1f)]=V&0x3f; + // hmmm.... + if(!(tmp&0xf)) + PALRAM[0x00]=PALRAM[0x04]=PALRAM[0x08]=PALRAM[0x0C]=V&0x3f; + else if(tmp&3) PALRAM[(tmp&0x1f)]=V&0x3f; } else if(tmp<0x2000) { @@ -483,6 +528,7 @@ static DECLFW(B4014) { uint32 t=V<<8; int x; + for(x=0;x<256;x++) B2004(0x2004,X.DB=ARead[t+x](t+x)); X6502_AddCycles(512); @@ -540,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 { @@ -568,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 @@ -870,7 +923,7 @@ static void SetRefreshLine(void) } } -//static INLINE +static INLINE void Fixit2(void) { if(ScreenON || SpriteON) @@ -883,7 +936,7 @@ void Fixit2(void) } } -//static INLINE +static INLINE void Fixit1(void) { if(ScreenON || SpriteON) @@ -912,32 +965,35 @@ void Fixit1(void) } } -//#define NEW_TRY /* This is called at the beginning of all h-blanks on visible lines. */ -#ifndef NEW_TRY static void DoHBlank(void) { if(ScreenON || SpriteON) FetchSpriteData(); - if(GameHBIRQHook && (ScreenON || SpriteON)) + if(GameHBIRQHook && (ScreenON || SpriteON) && ((PPU[0]&0x38)!=0x18)) { - X6502_Run(12); - GameHBIRQHook(); - X6502_Run(25-12); + X6502_Run(6); Fixit2(); - X6502_Run(85-25); + X6502_Run(4); + GameHBIRQHook(); + X6502_Run(85-16-10); } else { - X6502_Run(25); // Tried 65, caused problems with Slalom(maybe others) + X6502_Run(6); // Tried 65, caused problems with Slalom(maybe others) Fixit2(); - X6502_Run(85-25); + X6502_Run(85-6-16); } + if(GameHBIRQHook2 && (ScreenON || SpriteON)) + GameHBIRQHook2(); //PPU_hook(0,-1); //fprintf(stderr,"%3d: $%04x\n",scanline,RefreshAddr); + scanline++; + if (scanline<240) + ResetRL(); + X6502_Run(16); } -#endif // ============================// @@ -988,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 @@ -1003,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) @@ -1022,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) { @@ -1091,8 +1151,8 @@ FCEUGI *FCEUI_LoadGame(char *name) SaveStateRefresh(); if(FCEUGameInfo.type!=GIT_NSF) { - LoadGamePalette(); - LoadGameCheats(); + FCEU_LoadGamePalette(); + FCEU_LoadGameCheats(0); } FCEU_ResetPalette(); @@ -1139,58 +1199,52 @@ 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; } -#define harko 0xe //0x9 +void MMC5_hb(int); /* Ugh ugh ugh. */ static INLINE void Thingo(void) { Loop6502(); -#ifndef NEW_TRY + if(MMC5Hack && (ScreenON || SpriteON)) MMC5_hb(scanline); + + // check: Battletoads & Double Dragon if(tosprite>=256) { - X6502_Run(256-harko); - Fixit1(); - X6502_Run(harko); + X6502_Run(256); } else { - if(tosprite<=240) - { + // sky glitches in SMB1 if done wrong X6502_Run(tosprite); PPU[2]|=0x40; - X6502_Run(256-tosprite-harko); - Fixit1(); - X6502_Run(harko); - } - else - { - X6502_Run(256-harko); - Fixit1(); - X6502_Run(tosprite-(256-harko)); - PPU[2]|=0x40; X6502_Run(256-tosprite); - } - tosprite=256; + tosprite = 256; } + TryFixit1(); DoHBlank(); -#else - X6502_Run_scanline(); -#endif } -#undef harko void EmLoop(void) { for(;;) { + int x; uint32 scanlines_per_frame = PAL ? 312 : 262; - //extern int asdc; - //printf("asdc: %i\n", asdc); - //asdc=0; - ApplyPeriodicCheats(); + UpdateInput(); + FCEU_ApplyPeriodicCheats(); + + // FCEUPPU_Loop: + if(ppudead) /* Needed for Knight Rider, possibly others. */ + { + //memset(XBuf, 0, 320*240); + X6502_Run(scanlines_per_frame*(256+85)); + ppudead--; + goto update; + } + X6502_Run(256+85); PPU[2]|=0x80; @@ -1203,35 +1257,51 @@ void EmLoop(void) of this delay. */ if(FCEUGameInfo.type==GIT_NSF) - TriggerNMINSF(); + DoNSFFrame(); else if(VBlankON) TriggerNMI(); - X6502_Run(256+85-12); - for(scanline=242+1;scanline>5; SetRefreshLine(); - for(scanline=0;scanline<240;scanline++) + for(scanline=0;scanline<240;) // scanline is incremented in DoLine. Evil. :/ { deempcnt[deemp]++; Thingo(); } + if(MMC5Hack && (ScreenON || SpriteON)) MMC5_hb(scanline); for(x=1,max=0,maxref=0;x<7;x++) { if(deempcnt[x]>max) @@ -1253,16 +1324,18 @@ 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); } +update: { int ssize; ssize=FlushEmulateSound(); + timestampbase += timestamp; + timestamp = 0; + #ifdef FRAMESKIP if(FSkip) { @@ -1276,7 +1349,6 @@ void EmLoop(void) FCEU_PutImage(); FCEUD_Update(XBuf+8,WaveFinalMono,ssize); } - UpdateInput(); } if(Exit) @@ -1285,7 +1357,7 @@ void EmLoop(void) break; } - } + } // for } #ifdef FPS @@ -1332,6 +1404,8 @@ static void ResetPPU(void) PPUGenLatch=0; RefreshAddr=TempAddr=0; vtoggle = 0; + ppudead = 2; + kook = 0; } static void PowerPPU(void) @@ -1344,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(); @@ -1369,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 } + }; + +