X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=fce.c;h=d540affa8add8064861077dda7363a2170a25818;hp=814c80e7d2723333b906fd3526e5f8c46ca43dca;hb=7b356ee3dc5d7e54d9dc06c413f84380d1044441;hpb=e328100eecae3adfce1c3b57364bee5d166217ef

diff --git a/fce.c b/fce.c
index 814c80e..d540aff 100644
--- a/fce.c
+++ b/fce.c
@@ -39,6 +39,7 @@
 #include	"fds.h"
 #include	"ines.h"
 #include	"unif.h"
+#include	"vsuni.h"
 #include        "cheat.h"
 
 #include	"state.h"
@@ -95,7 +96,7 @@ static uint8 deemp=0;
 static int deempcnt[8];
 
 FCEUGI FCEUGameInfo;
-void (*GameInterface)(int h);
+void (*GameInterface)(int h, void *param);
 
 void FP_FASTAPASS(1) (*PPU_hook)(uint32 A);
 
@@ -145,6 +146,8 @@ void asmcpu_unpack(void)
 	X6502_Rebase_a();
 	nes_registers[4] = X.S << 24;
 	nes_registers[4]|= X.IRQlow << 8;
+	if (MapIRQHook)
+		nes_registers[4] |= 1<<16; // MapIRQHook set bit
 	nes_registers[7] = (uint32)X.count << 16;
 
 	// NVUB DIZC
@@ -604,23 +607,31 @@ void FCEUI_FrameSkip(int x)
 static void LineUpdate(uint8 *target)
 {
 	uint32 tem;
+	int y;
 
+	/* PRefreshLine() will not get called on skipped frames.  This
+	 * could cause a problem, but the solution would be rather complex,
+	 * due to the current sprite 0 hit code.
+	 */
 	if(FSkip)
+	{
+	 y=(int)SPRAM[0] + 1;
+	 if(scanline==y && SpriteON) PPU_status|=0x40; // hack
+	 return;
+	}
+
+	if(scanline < FSettings.FirstSLine || scanline > FSettings.LastSLine)
 	{
 	   if(PPU_hook)
  	    PRefreshLine();
+	   y=(int)SPRAM[0] + 1;
+	   if(scanline==y && SpriteON) PPU_status|=0x40;
 	}
 	else
 	{
 	 if(ScreenON)
 	 {
-  	   if(scanline>=FSettings.FirstSLine && scanline<=FSettings.LastSLine)
-	    BGRender(target);
-	   else
-	   {
-	    if(PPU_hook)
- 	     PRefreshLine();
-   	   }
+	   BGRender(target);
 	 }
 	 else
 	 {
@@ -684,27 +695,29 @@ static void LineUpdateEnd(uint8 *target)
 
 static void PRefreshLine(void)
 {
-        uint32 vofs;
-        uint8 X1;
+         uint32 vofs;
+	 int X1;
+	 vofs=((PPU[0]&0x10)<<8) | ((RefreshAddr>>12)&7);
+	 void (*PPU_hook_)(uint32 A) = PPU_hook;
 
-        vofs = 0;
-        if (BGAdrHI) vofs = 0x1000;
 
-        vofs+=(RefreshAddr>>12)&7;
+         for(X1=33;X1;X1--)
+         {
+                uint32 zz2;
+                uint32 vadr;
+
+                zz2=(RefreshAddr>>10)&3;
+                PPU_hook_(0x2000|(RefreshAddr&0xFFF));
+
+                vadr=(vnapage[zz2][RefreshAddr&0x3ff]<<4)+vofs;
+
+	        PPU_hook_(vadr);
 
-        for(X1=33;X1;X1--)
-        {
-                register uint8 no;
-                register uint8 zz2;
-                zz2=(uint8)((RefreshAddr>>10)&3);
-		PPU_hook(0x2000|(RefreshAddr&0xFFF));
-                no  = vnapage[zz2][(RefreshAddr&0x3ff)];
-                PPU_hook((no<<4)+vofs);
                 if((RefreshAddr&0x1f)==0x1f)
                  RefreshAddr^=0x41F;
                 else
                  RefreshAddr++;
-        }
+         }
 }
 
 /* This high-level graphics MMC5 emulation code was written
@@ -862,30 +875,34 @@ static void RefreshLine_MMC5Hack4(uint8 *P, uint32 vofs)
 static void RefreshLine_PPU_hook(uint8 *P, uint32 vofs)
 {
          int8 X1;
+	 void (*PPU_hook_)(uint32 A) = PPU_hook;
+	 uint32 rfraddr = RefreshAddr;
+	 uint8 *page = vnapage[(rfraddr>>10)&3];
 
          for(X1=33;X1;X1--,P+=8)
          {
                 uint8 *C;
-                uint8 cc,zz,zz2;
+                uint8 cc,zz;
                 uint32 vadr;
 
-                zz=RefreshAddr&0x1F;
-                zz2=(RefreshAddr>>10)&3;
-                PPU_hook(0x2000|(RefreshAddr&0xFFF));
-                cc=vnapage[zz2][0x3c0+(zz>>2)+((RefreshAddr&0x380)>>4)];
-                cc=((cc >> ((zz&2) + ((RefreshAddr&0x40)>>4))) &3) <<2;
-                vadr=(vnapage[zz2][RefreshAddr&0x3ff]<<4)+vofs;
+                zz=rfraddr&0x1F;
+                PPU_hook_(0x2000|(rfraddr&0xFFF));
+                cc=page[0x3c0+(zz>>2)+((rfraddr&0x380)>>4)];
+                cc=((cc >> ((zz&2) + ((rfraddr&0x40)>>4))) &3) <<2;
+                vadr=(page[rfraddr&0x3ff]<<4)+vofs;
                 C = VRAMADR(vadr);
 
 	        #include "fceline.h"
 
-	        PPU_hook(vadr);
+	        PPU_hook_(vadr);
 
-                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 RefreshLine_normal(uint8 *P, uint32 vofs) // vofs is 0x107 max
@@ -1045,6 +1062,7 @@ void ResetMapping(void)
 int GameLoaded=0;
 void CloseGame(void)
 {
+ FCEUI_StopMovie();
  if(GameLoaded)
  {
   if(FCEUGameInfo.type!=GIT_NSF)
@@ -1052,7 +1070,7 @@ void CloseGame(void)
   #ifdef NETWORK
   if(FSettings.NetworkPlay) KillNetplay();
   #endif
-  GameInterface(GI_CLOSE);
+  GameInterface(GI_CLOSE, 0);
   CloseGenie();
   GameLoaded=0;
  }
@@ -1234,13 +1252,13 @@ static void DoLine(void)
 #ifdef FRAMESKIP
    if(!FSkip)
 #endif
-   if(SpriteON && spork)
-    CopySprites(target);
+   if(scanline>=FSettings.FirstSLine && scanline<=FSettings.LastSLine)
+   {
+    if(SpriteON && spork)
+     CopySprites(target);
 
-#ifdef FRAMESKIP
-   if(!FSkip)
-#endif
-   LineUpdateEnd(target);
+    LineUpdateEnd(target);
+   }
    sphitx=0x100;
 
    if(ScreenON || SpriteON)
@@ -1375,6 +1393,12 @@ void EmLoop(void)
   }
 
 update:
+  if(Exit)
+  {
+   //CloseGame();
+   break;
+  }
+
   {
    int ssize;
 
@@ -1398,12 +1422,6 @@ update:
    }
   }
 
-  if(Exit)
-  {
-   //CloseGame();
-   break;
-  }
-
  } // for
 }
 
@@ -1466,7 +1484,7 @@ static void PowerPPU(void)
 void ResetNES(void)
 {
         if(!GameLoaded) return;
-        GameInterface(GI_RESETM2);
+        GameInterface(GI_RESETM2, 0);
         ResetSound();
         ResetPPU();
         X6502_Reset();
@@ -1499,15 +1517,18 @@ void PowerNES(void)
         memset(RAM,0x00,0x800);
 #endif
         ResetMapping();
-	GameInterface(GI_POWER);
         PowerSound();
 	PowerPPU();
-	timestampbase=0;
+	GameInterface(GI_POWER, 0);
+        if(FCEUGameInfo.type==GIT_VSUNI)
+         FCEU_VSUniPower();
 #ifdef ASM_6502
 	if (geniestage)
 	 GenieSetPages(0);
 #endif
+	timestampbase=0;
 	X6502_Power();
+	FCEU_PowerCheats();
 }