X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=fce.c;h=3cb063204ed2c34466114dbf2501e6c9e3effe40;hp=687b686ebf8b8bac8a71d739d087f4cd93d3fc95;hb=8fa5eb3371d902b8d58dba6e6bf62726d7ed8dbc;hpb=4a1bf31bcd80812fe491d3255646e43c304116b9 diff --git a/fce.c b/fce.c index 687b686..3cb0632 100644 --- a/fce.c +++ b/fce.c @@ -48,6 +48,8 @@ #include "crc32.h" #include "ppu.h" +#include "movie.h" + #define Pal (PALRAM) @@ -98,6 +100,71 @@ static readfunc *AReadG; static writefunc *BWriteG; 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) + { + FrameSoundUpdate(); + fhcnt+=fhinc; + } + + if(PCMIRQCount>0) + { + PCMIRQCount-=cycles; + if(PCMIRQCount<=0) + { + vdis=1; + if((PSG[0x10]&0x80) && !(PSG[0x10]&0x40)) + { + extern uint8 SIRQStat; + SIRQStat|=0x80; + X6502_IRQBegin(FCEU_IQDPCM); + } + } + } +} + +void asmcpu_unpack(void) +{ + nes_registers[0] = X.A << 24; + nes_registers[1] = X.X; + nes_registers[2] = X.Y; + pc_base = 0; + nes_registers[3] = X.PC; + X6502_Rebase_a(); + nes_registers[4] = X.S << 24; + nes_registers[4]|= X.IRQlow << 8; + nes_registers[7] = (uint32)X.count << 16; + + // NVUB DIZC + nes_registers[4]|= X.P & 0x5d; + nes_registers[5] = X.P << 24; // N + if (!(X.P&0x02)) nes_registers[5] |= 1; // Z +} + +void asmcpu_pack(void) +{ + X.A = nes_registers[0] >> 24; + X.X = nes_registers[1]; + X.Y = nes_registers[2]; + 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] >> 16; + + // NVUB DIZC + X.P = nes_registers[4] & 0x5d; + if ( nes_registers[5]&0x80000000) X.P |= 0x80; // N + if (!(nes_registers[5]&0x000000ff)) X.P |= 0x02; // Z +} +#endif + DECLFW(BNull) { @@ -203,15 +270,17 @@ uint32 TempAddr,RefreshAddr; /* scanline is equal to the current visible scanline we're on. */ 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))); +#if !defined(ASM_6502) || defined(DEBUG_ASM_6502) +uint8 RAM[0x800] __attribute__ ((aligned (4))); +#endif uint8 PPU[4]; uint8 PPUSPL; -uint8 GameMemBlock[131072]; -uint8 NTARAM[0x800],PALRAM[0x20]; -uint8 RAM[0x800]; - uint8 PAL=0; @@ -419,8 +488,9 @@ void BGRender(uint8 *target) 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; } } @@ -439,7 +509,7 @@ static void Loop6502(void) { uint32 tem; int x; - uint8 *target=XBuf+(scanline<<8)+(scanline<<4)+8; + uint8 *target=XBuf+scanline*320+32; if(ScreenON || SpriteON) { @@ -479,18 +549,19 @@ static void Loop6502(void) if(PPU[1]&0x01) { for(x=63;x>=0;x--) - *(uint32 *)&target[x<<2]=(*(uint32*)&target[x<<2])&0xF0F0F0F0; + ((uint32 *)target)[x]=((uint32*)target)[x]&0xF0F0F0F0; } if((PPU[1]>>5)==0x7) for(x=63;x>=0;x--) - *(uint32 *)&target[x<<2]=((*(uint32*)&target[x<<2])&0x3f3f3f3f)|0x40404040; + ((uint32 *)target)[x]=(((uint32*)target)[x]&0x3f3f3f3f)|0x40404040; else if(PPU[1]&0xE0) for(x=63;x>=0;x--) - *(uint32 *)&target[x<<2]=(*(uint32*)&target[x<<2])|0xC0C0C0C0; + ((uint32 *)target)[x]=((uint32*)target)[x]|0xC0C0C0C0; else for(x=63;x>=0;x--) - *(uint32 *)&target[x<<2]=(*(uint32*)&target[x<<2])&0x3f3f3f3f; - + ((uint32 *)target)[x]=((uint32*)target)[x]&0x3f3f3f3f; + FCEU_dwmemset(target- 8,0x3f3f3f3f,8); + FCEU_dwmemset(target+256,0x3f3f3f3f,8); #ifdef FRAMESKIP } #endif @@ -713,45 +784,36 @@ static void RefreshLine_PPU_hook(uint8 *P, uint32 vofs) } } -static void RefreshLine_normal(uint8 *P, uint32 vofs) +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; - for(X1=33;X1;X1--,P+=8) + 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; - { - uint8 *S=PALRAM+cc; - uint8 c1,c2; + 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; - 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]; - } + #include "fceline.h" - if((RefreshAddr&0x1f)==0x1f) - RefreshAddr^=0x41F; - else - RefreshAddr++; + if((rfraddr&0x1f)==0x1f) { + rfraddr^=0x41F; + page = vnapage[(rfraddr>>10)&3]; + } else + rfraddr++; } + RefreshAddr = rfraddr; } static void SetRefreshLine(void) @@ -791,7 +853,8 @@ static void SetRefreshLine(void) } } -static INLINE void Fixit2(void) +//static INLINE +void Fixit2(void) { if(ScreenON || SpriteON) { @@ -803,7 +866,8 @@ static INLINE void Fixit2(void) } } -static INLINE void Fixit1(void) +//static INLINE +void Fixit1(void) { if(ScreenON || SpriteON) { @@ -831,7 +895,10 @@ static INLINE 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) @@ -853,21 +920,7 @@ static void DoHBlank(void) //PPU_hook(0,-1); //fprintf(stderr,"%3d: $%04x\n",scanline,RefreshAddr); } - - - - - - - - - - - - - - - +#endif // ============================// @@ -951,28 +1004,54 @@ void ResetGameLoaded(void) FCEUGameInfo.inputfc=-1; } +char lastLoadedGameName [2048]; + FCEUGI *FCEUI_LoadGame(char *name) { + char name2[512]; + int have_movie = 0; int fp; Exit=1; ResetGameLoaded(); - fp=FCEU_fopen(name,"rb"); + strncpy(name2, name, sizeof(name2)); + name2[sizeof(name2)-1] = 0; + + fp=FCEU_fopen(name2,"rb"); if(!fp) { FCEU_PrintError("Error opening \"%s\"!",name); return 0; } - GetFileBase(name); - if(iNESLoad(name,fp)) + { + char *p = name2 + strlen(name2) - 4; + if (strcmp(p, ".fcm") == 0) + { + // movie detected + printf("movie detected\n"); + FCEU_fclose(fp); + *p = 0; + fp=FCEU_fopen(name2,"rb"); + if (!fp) { + printf("no ROM for movie\n"); + return 0; + } + have_movie = 1; + } + } + + strcpy(lastLoadedGameName, name2); + + GetFileBase(name2); + if(iNESLoad(name2,fp)) goto endlseq; if(NSFLoad(fp)) goto endlseq; - if(FDSLoad(name,fp)) + if(FDSLoad(name2,fp)) goto endlseq; - if(UNIFLoad(name,fp)) + if(UNIFLoad(name2,fp)) goto endlseq; FCEU_PrintError("An error occurred while loading the file."); @@ -1001,6 +1080,9 @@ FCEUGI *FCEUI_LoadGame(char *name) FCEU_ResetPalette(); Exit=0; + + if (have_movie) + FCEUI_LoadMovie(name, 1); return(&FCEUGameInfo); } @@ -1019,14 +1101,12 @@ void FCEU_ResetVidSys(void) if(w) { PAL=1; - scanlines_per_frame=312; FSettings.FirstSLine=FSettings.UsrFirstSLine[1]; FSettings.LastSLine=FSettings.UsrLastSLine[1]; } else { PAL=0; - scanlines_per_frame=262; FSettings.FirstSLine=FSettings.UsrFirstSLine[0]; FSettings.LastSLine=FSettings.UsrLastSLine[0]; } @@ -1050,6 +1130,7 @@ int FCEUI_Initialize(void) static INLINE void Thingo(void) { Loop6502(); +#ifndef NEW_TRY if(tosprite>=256) { @@ -1078,6 +1159,9 @@ static INLINE void Thingo(void) tosprite=256; } DoHBlank(); +#else + X6502_Run_scanline(); +#endif } #undef harko @@ -1085,6 +1169,10 @@ void EmLoop(void) { for(;;) { + uint32 scanlines_per_frame = PAL ? 312 : 262; + //extern int asdc; + //printf("asdc: %i\n", asdc); + //asdc=0; ApplyPeriodicCheats(); X6502_Run(256+85); @@ -1102,7 +1190,15 @@ void EmLoop(void) else if(VBlankON) TriggerNMI(); - X6502_Run((scanlines_per_frame-242)*(256+85)-12); + // Note: this is needed for asm core + // Warning: using 'scanline' var here breaks Castlevania III + { + int lines; + X6502_Run(256+85-12); + for (lines=scanlines_per_frame-242-1;lines;lines--) + X6502_Run(256+85); + } + // X6502_Run((scanlines_per_frame-242)*(256+85)-12); PPU_status&=0x1f; @@ -1123,7 +1219,9 @@ void EmLoop(void) if(PPU_hook) PPU_hook(RefreshAddr&0x3fff); } if(FCEUGameInfo.type==GIT_NSF) + { X6502_Run((256+85)*240); + } else { int x,max,maxref;