bugfixes, r171 release

[fceu.git] / fce.c

diff --git a/fce.c b/fce.c
index 89a54a3..a21e5f5 100644 (file)
--- a/fce.c
+++ b/fce.c
@@ -26,8 +26,9 @@
 #include       "types.h"
 #include       "x6502.h"
 #include       "fce.h"
+#include       "fceu098.h"
 #include       "sound.h"
-#include        "svga.h"
+#include       "svga.h"
 #include       "netplay.h"
 #include       "general.h"
 #include       "endian.h"
@@ -48,6 +49,7 @@
 #include       "file.h"
 #include       "crc32.h"
 #include        "ppu.h"
+#include        "ppu098.h"
 
 #include        "palette.h"
 #include        "movie.h"
@@ -69,8 +71,8 @@ static void PowerPPU(void);
 
 uint64 timestampbase=0;
 
-static int ppudead=1;
-static int kook=0;
+int ppudead=1;
+int kook=0;
 
 int MMC5Hack;
 uint32 MMC5HackVROMMask;
@@ -110,6 +112,7 @@ static writefunc *BWriteG;
 static int RWWrap=0;
 
 #ifdef ASM_6502
+#ifndef DEBUG_ASM_6502
 static void asmcpu_update(int32 cycles)
 {
  // some code from x6502.c
@@ -135,6 +138,7 @@ static void asmcpu_update(int32 cycles)
   }
  }
 }
+#endif
 
 void asmcpu_unpack(void)
 {
@@ -1097,6 +1101,10 @@ void ResetGameLoaded(void)
        FCEUGameInfo.vidsys=GIV_USER;
        FCEUGameInfo.input[0]=FCEUGameInfo.input[1]=-1;
        FCEUGameInfo.inputfc=-1;
+
+       FCEUGameInfo.soundchan=0;
+       FCEUGameInfo.soundrate=0;
+        FCEUGameInfo.cspecial=0;
 }
 
 char lastLoadedGameName [2048];
@@ -1246,9 +1254,39 @@ int FCEUI_Initialize(void)
        FSettings.UsrFirstSLine[1]=0;
         FSettings.UsrLastSLine[0]=FSettings.UsrLastSLine[1]=239;
        FSettings.SoundVolume=100;
+
+       FCEUI_Initialize098();
+       FCEUI_SetEmuMode(0);
+
         return 1;
 }
 
+void FCEUI_Kill(void)
+{
+ FCEU_KillGenie();
+}
+
+static void EmLoop(void);
+
+int use098code = 0;
+void (*ResetNES)(void) = 0;
+void (*FCEUI_Emulate)(void) = 0;
+
+void FCEUI_SetEmuMode(int is_new)
+{
+   use098code = is_new;
+   if (is_new)
+   {
+    ResetNES=ResetNES098;
+    FCEUI_Emulate=FCEUI_Emulate098;
+   }
+   else
+   {
+    ResetNES=ResetNES081;
+    FCEUI_Emulate=EmLoop;
+   }
+}
+
 void MMC5_hb(int);     /* Ugh ugh ugh. */
 static void DoLine(void)
 {
@@ -1306,7 +1344,7 @@ static void DoLine(void)
 }
 
 
-void EmLoop(void)
+static void EmLoop(void)
 {
  for(;;)
  {
@@ -1319,7 +1357,10 @@ void EmLoop(void)
   if(ppudead) /* Needed for Knight Rider, possibly others. */
   {
    //memset(XBuf, 0, 320*240);
-   X6502_Run(scanlines_per_frame*(256+85));
+   //X6502_Run(scanlines_per_frame*(256+85));
+   int lines;
+   for (lines=scanlines_per_frame;lines;lines--)
+     X6502_Run(256+85);
    ppudead--;
    goto update;
   }
@@ -1440,38 +1481,6 @@ update:
  } // for
 }
 
-#ifdef FPS
-#include <sys/time.h>
-uint64 frcount;
-#endif
-void FCEUI_Emulate(void)
-{
-       #ifdef FPS
-        uint64 starttime,end;
-        struct timeval tv;
-       frcount=0;
-        gettimeofday(&tv,0);
-        starttime=((uint64)tv.tv_sec*1000000)+tv.tv_usec;
-       #endif
-       EmLoop();
-
-        #ifdef FPS
-        // Probably won't work well on Windows port; for
-       // debugging/speed testing.
-       {
-        uint64 w;
-        int i,frac;
-         gettimeofday(&tv,0);
-         end=((uint64)tv.tv_sec*1000000)+tv.tv_usec;
-        w=frcount*10000000000LL/(end-starttime);
-        i=w/10000;
-        frac=w-i*10000;
-         printf("Average FPS: %d.%04d\n",i,frac);
-       }
-        #endif
-
-}
-
 void FCEUI_CloseGame(void)
 {
         Exit=1;
@@ -1496,7 +1505,7 @@ static void PowerPPU(void)
        ResetPPU();
 }
 
-void ResetNES(void)
+void ResetNES081(void)
 {
         if(!GameLoaded) return;
         GameInterface(GI_RESETM2, 0);
@@ -1505,6 +1514,7 @@ void ResetNES(void)
         X6502_Reset();
 }
 
+#ifndef DEBUG_ASM_6502
 static void FCEU_MemoryRand(uint8 *ptr, uint32 size)
 {
  int x=0;
@@ -1516,6 +1526,7 @@ static void FCEU_MemoryRand(uint8 *ptr, uint32 size)
   ptr++;
  }
 }
+#endif
 
 void PowerNES(void)
 {
@@ -1534,6 +1545,13 @@ void PowerNES(void)
         ResetMapping();
         PowerSound();
        PowerPPU();
+
+       if (use098code)
+        FCEUPPU_Power();
+
+       /* Have the external game hardware "powered" after the internal NES stuff.
+          Needed for the NSF code and VS System code.
+       */
        GameInterface(GI_POWER, 0);
         if(FCEUGameInfo.type==GIT_VSUNI)
          FCEU_VSUniPower();