asm cpu works, added sync()s
[fceu.git] / fce.c
diff --git a/fce.c b/fce.c
index 5b72b3b..64bb8dc 100644 (file)
--- a/fce.c
+++ b/fce.c
@@ -1,7 +1,7 @@
 /* FCE Ultra - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 1998 BERO 
+ *  Copyright (C) 1998 BERO
  *  Copyright (C) 2002 Ben Parnell
  *
  * This program is free software; you can redistribute it and/or modify
 #define Pal     (PALRAM)
 
 
-static void FASTAPASS(1) RefreshLine(uint8 *target);
+#ifdef DEBUG_ASM_6502
+extern int cpu_repeat;
+extern int cpu_lastval;
+#endif
+
+static void (*RefreshLine)(uint8 *P, uint32 vofs) = NULL;
 static void PRefreshLine(void);
 
 static void ResetPPU(void);
@@ -63,7 +68,7 @@ int MMC5Hack;
 uint32 MMC5HackVROMMask;
 uint8 *MMC5HackExNTARAMPtr;
 uint8 *MMC5HackVROMPTR;
-uint8 MMC5HackCHRMode=0; 
+uint8 MMC5HackCHRMode=0;
 uint8 MMC5HackSPMode;
 uint8 MMC5HackSPScroll;
 uint8 MMC5HackSPPage;
@@ -98,6 +103,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;
+
+       // 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];
+
+       // 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,23 +273,25 @@ 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;
 
 
 #define MMC5BGVRAMADR(V)      &MMC5BGVPage[(V)>>10][(V)]
 #define        VRAMADR(V)      &VPage[(V)>>10][(V)]
+
 static DECLFW(BRAML)
-{  
+{
         RAM[A]=V;
 }
 
@@ -238,13 +310,19 @@ static DECLFR(ARAMH)
         return RAM[A&0x7FF];
 }
 
-           
+
 static DECLFR(A2002)
 {
                         uint8 ret;
+#ifdef DEBUG_ASM_6502
+       if (cpu_repeat) return cpu_lastval;
+#endif
                         ret = PPU_status;
                         vtoggle=0;
                         PPU_status&=0x7F;
+#ifdef DEBUG_ASM_6502
+       cpu_lastval=ret|(PPUGenLatch&0x1F);
+#endif
                         return ret|(PPUGenLatch&0x1F);
 }
 
@@ -257,14 +335,17 @@ static DECLFR(A2007)
 {
                         uint8 ret;
                        uint32 tmp=RefreshAddr&0x3FFF;
+#ifdef DEBUG_ASM_6502
+       if (cpu_repeat) return cpu_lastval;
+#endif
 
                         PPUGenLatch=ret=VRAMBuffer;
                        if(PPU_hook) PPU_hook(tmp);
-                        if(tmp<0x2000) 
+                        if(tmp<0x2000)
                        {
                         VRAMBuffer=VPage[tmp>>10][tmp];
                        }
-                        else 
+                        else
                        {
                         VRAMBuffer=vnapage[(tmp>>10)&0x3][tmp&0x3FF];
                        }
@@ -272,6 +353,9 @@ static DECLFR(A2007)
                         if (INC32) RefreshAddr+=32;
                         else RefreshAddr++;
                        if(PPU_hook) PPU_hook(RefreshAddr&0x3fff);
+#ifdef DEBUG_ASM_6502
+       cpu_lastval=ret;
+#endif
                         return ret;
 }
 
@@ -366,7 +450,7 @@ static DECLFW(B2006)
 }
 
 static DECLFW(B2007)
-{  
+{
                        uint32 tmp=RefreshAddr&0x3FFF;
 
                         PPUGenLatch=V;
@@ -384,7 +468,7 @@ static DECLFW(B2007)
                             VPage[tmp>>10][tmp]=V;
                         }
                         else
-                       {                                               
+                       {
                          if(PPUNTARAM&(1<<((tmp&0xF00)>>10)))
                           vnapage[((tmp&0xF00)>>10)][tmp&0x3FF]=V;
                         }
@@ -394,28 +478,47 @@ static DECLFW(B2007)
 }
 
 static DECLFW(B4014)
-{                        
+{
        uint32 t=V<<8;
        int x;
+#ifdef DEBUG_ASM_6502
+  if (cpu_repeat) { X6502_AddCycles_a(512); return; }
+       for(x=0;x<256;x++)
+        B2004(0x2004,X.DB=ARead[t+x](t+x));
+       X6502_AddCycles_c(512);
+#else
        for(x=0;x<256;x++)
         B2004(0x2004,X.DB=ARead[t+x](t+x));
        X6502_AddCycles(512);
+#endif
 }
 
 void BGRender(uint8 *target)
 {
-       uint32 tem;
-        RefreshLine(target);
+       uint32 tem, vofs;
+       vofs=((PPU[0]&0x10)<<8) | ((RefreshAddr>>12)&7);
+
+        Pal[0]|=64;
+        Pal[4]|=64;
+        Pal[8]|=64;
+        Pal[0xC]|=64;
+        RefreshLine(target-XOffset, vofs);
+        Pal[0]&=63;
+        Pal[4]&=63;
+        Pal[8]&=63;
+        Pal[0xC]&=63;
+
         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;
         }
 }
 
 #ifdef FRAMESKIP
-extern int framesRendered;
+int FSkip_setting=-1; // auto
 int FSkip=0;
 void FCEUI_FrameSkip(int x)
 {
@@ -428,7 +531,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)
         {
@@ -466,20 +569,21 @@ static void Loop6502(void)
         {
         #endif
          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
@@ -488,7 +592,7 @@ static void Loop6502(void)
        {
         tem=Pal[0]|(Pal[0]<<8)|(Pal[0]<<16)|(Pal[0]<<24);
         FCEU_dwmemset(target,tem,256);
-       }               
+       }
         if(InputScanlineHook)
          InputScanlineHook(target, scanline);
 }
@@ -521,32 +625,13 @@ static void PRefreshLine(void)
         }
 }
 
-/*              Total of 33 tiles(32 + 1 extra) */
-static void FASTAPASS(1) RefreshLine(uint8 *target)
+/* This high-level graphics MMC5 emulation code was written
+   for MMC5 carts in "CL" mode.  It's probably not totally
+   correct for carts in "SL" mode.
+   */
+static void RefreshLine_MMC5Hack1(uint8 *P, uint32 vofs)
 {
-       uint32 vofs;
-        int X1;
-        uint8 *P=target; 
-
-       vofs=0;
-       
-        Pal[0]|=64;
-        Pal[4]|=64;
-        Pal[8]|=64;
-        Pal[0xC]|=64;
-
-       vofs=((PPU[0]&0x10)<<8) | ((RefreshAddr>>12)&7);
-        P-=XOffset;
-
-       /* This high-level graphics MMC5 emulation code was written
-          for MMC5 carts in "CL" mode.  It's probably not totally
-          correct for carts in "SL" mode.
-       */
-        if(MMC5Hack && geniestage!=1)
-        {
-        if(MMC5HackCHRMode==0 && (MMC5HackSPMode&0x80))
-        {
-         int8 tochange;
+         int8 tochange, X1;
 
           tochange=MMC5HackSPMode&0x1F;
 
@@ -556,12 +641,12 @@ static void FASTAPASS(1) RefreshLine(uint8 *target)
                 uint8 cc,zz,zz2;
                 uint32 vadr;
 
-                if((tochange<=0 && MMC5HackSPMode&0x40) || 
+                if((tochange<=0 && MMC5HackSPMode&0x40) ||
                   (tochange>0 && !(MMC5HackSPMode&0x40)))
                 {
                  uint8 xs,ys;
 
-                 xs=33-X1; 
+                 xs=33-X1;
                  ys=((scanline>>3)+MMC5HackSPScroll)&0x1F;
                  if(ys>=0x1E) ys-=0x1E;
                  vadr=(MMC5HackExNTARAMPtr[xs|(ys<<5)]<<4)+(vofs&7);
@@ -589,10 +674,11 @@ static void FASTAPASS(1) RefreshLine(uint8 *target)
                  RefreshAddr++;
                 tochange--;
           }
-        }
-        else if(MMC5HackCHRMode==1 && (MMC5HackSPMode&0x80))
-        {
-          int8 tochange;
+}
+
+static void RefreshLine_MMC5Hack2(uint8 *P, uint32 vofs)
+{
+          int8 tochange, X1;
 
           tochange=MMC5HackSPMode&0x1F;
 
@@ -608,7 +694,7 @@ static void FASTAPASS(1) RefreshLine(uint8 *target)
                 {
                  uint8 xs,ys;
 
-                 xs=33-X1; 
+                 xs=33-X1;
                  ys=((scanline>>3)+MMC5HackSPScroll)&0x1F;
                  if(ys>=0x1E) ys-=0x1E;
                  vadr=(MMC5HackExNTARAMPtr[xs|(ys<<5)]<<4)+(vofs&7);
@@ -636,21 +722,23 @@ static void FASTAPASS(1) RefreshLine(uint8 *target)
                  RefreshAddr++;
                tochange--;
           }
-        }
+}
+
+static void RefreshLine_MMC5Hack3(uint8 *P, uint32 vofs)
+{
+          int8 X1;
 
-         else if(MMC5HackCHRMode==1)
-         {
           for(X1=33;X1;X1--,P+=8)
           {
-                uint8 *C;                                   
+                uint8 *C;
                 uint8 cc;
                 uint8 zz2;
-                uint32 vadr;  
+                uint32 vadr;
 
                 C=MMC5HackVROMPTR;
                 zz2=(RefreshAddr>>10)&3;
                 vadr = (vnapage[zz2][RefreshAddr & 0x3ff] << 4) + vofs;
-                C += (((MMC5HackExNTARAMPtr[RefreshAddr & 0x3ff]) & 0x3f & 
+                C += (((MMC5HackExNTARAMPtr[RefreshAddr & 0x3ff]) & 0x3f &
                        MMC5HackVROMMask) << 12) + (vadr & 0xfff);
                 vadr = (MMC5HackExNTARAMPtr[RefreshAddr & 0x3ff] & 0xC0)>> 4;
                 cc = vadr;
@@ -661,9 +749,12 @@ static void FASTAPASS(1) RefreshLine(uint8 *target)
                 else
                  RefreshAddr++;
           }
-         }
-         else
-         {
+}
+
+static void RefreshLine_MMC5Hack4(uint8 *P, uint32 vofs)
+{
+          int8 X1;
+
           for(X1=33;X1;X1--,P+=8)
           {
                 uint8 *C;
@@ -678,22 +769,23 @@ static void FASTAPASS(1) RefreshLine(uint8 *target)
                 cc=((cc >> ((zz&2) + ((RefreshAddr&0x40)>>4))) &3) <<2;
 
                #include "fceline.h"
-                
+
                if((RefreshAddr&0x1f)==0x1f)
                  RefreshAddr^=0x41F;
                 else
                  RefreshAddr++;
-          }          
-         }
-        }       // End if(MMC5Hack) 
+          }
+}
+
+static void RefreshLine_PPU_hook(uint8 *P, uint32 vofs)
+{
+         int8 X1;
 
-        else if(PPU_hook)
-        {
          for(X1=33;X1;X1--,P+=8)
          {
-                uint8 *C;                                   
+                uint8 *C;
                 uint8 cc,zz,zz2;
-                uint32 vadr;  
+                uint32 vadr;
 
                 zz=RefreshAddr&0x1F;
                 zz2=(RefreshAddr>>10)&3;
@@ -712,39 +804,79 @@ static void FASTAPASS(1) RefreshLine(uint8 *target)
                 else
                  RefreshAddr++;
          }
-        }
-        else
-        {      
-         for(X1=33;X1;X1--,P+=8)
+}
+
+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;
+
+        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;
-               #include "fceline.h"
-                
-                if((RefreshAddr&0x1f)==0x1f)
-                 RefreshAddr^=0x41F;
-                else
-                 RefreshAddr++;
-         }
-        }
+               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;
 
-        #undef vofs
+               #include "fceline.h"
 
-        Pal[0]&=63;
-        Pal[4]&=63;
-        Pal[8]&=63;
-        Pal[0xC]&=63;
+                if((rfraddr&0x1f)==0x1f) {
+                 rfraddr^=0x41F;
+                page = vnapage[(rfraddr>>10)&3];
+                } else
+                 rfraddr++;
+         }
+        RefreshAddr = rfraddr;
+}
+
+static void SetRefreshLine(void)
+{
+        if(MMC5Hack && geniestage!=1)
+        {
+        if(MMC5HackCHRMode==0 && (MMC5HackSPMode&0x80))
+        {
+                if (RefreshLine != RefreshLine_MMC5Hack1) printf("set refr RefreshLine_MMC5Hack1\n");
+                RefreshLine = RefreshLine_MMC5Hack1;
+        }
+        else if(MMC5HackCHRMode==1 && (MMC5HackSPMode&0x80))
+        {
+               if (RefreshLine != RefreshLine_MMC5Hack2) printf("set refr RefreshLine_MMC5Hack2\n");
+                RefreshLine = RefreshLine_MMC5Hack2;
+        }
+         else if(MMC5HackCHRMode==1)
+         {
+               if (RefreshLine != RefreshLine_MMC5Hack3) printf("set refr RefreshLine_MMC5Hack3\n");
+                RefreshLine = RefreshLine_MMC5Hack3;
+         }
+         else
+         {
+               if (RefreshLine != RefreshLine_MMC5Hack4) printf("set refr RefreshLine_MMC5Hack4\n");
+                RefreshLine = RefreshLine_MMC5Hack4;
+         }
+        }       // End if(MMC5Hack)
+        else if(PPU_hook)
+        {
+               if (RefreshLine != RefreshLine_PPU_hook) printf("set refr RefreshLine_PPU_hook\n");
+               RefreshLine = RefreshLine_PPU_hook;
+        }
+        else
+        {
+               if (RefreshLine != RefreshLine_normal) printf("set refr RefreshLine_normal\n");
+               RefreshLine = RefreshLine_normal;
+        }
 }
 
-static INLINE void Fixit2(void)
+//static INLINE
+void Fixit2(void)
 {
    if(ScreenON || SpriteON)
    {
@@ -756,7 +888,8 @@ static INLINE void Fixit2(void)
    }
 }
 
-static INLINE void Fixit1(void)
+//static INLINE
+void Fixit1(void)
 {
    if(ScreenON || SpriteON)
    {
@@ -784,7 +917,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)
@@ -806,21 +942,7 @@ static void DoHBlank(void)
  //PPU_hook(0,-1);
  //fprintf(stderr,"%3d: $%04x\n",scanline,RefreshAddr);
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+#endif
 
 
 // ============================//
@@ -874,7 +996,7 @@ void CloseGame(void)
    FlushGameCheats();
   #ifdef NETWORK
   if(FSettings.NetworkPlay) KillNetplay();
-  #endif       
+  #endif
   GameInterface(GI_CLOSE);
   CloseGenie();
   GameLoaded=0;
@@ -934,7 +1056,7 @@ FCEUGI *FCEUI_LoadGame(char *name)
 
         endlseq:
         FCEU_fclose(fp);
-        GameLoaded=1;        
+        GameLoaded=1;
 
         FCEU_ResetVidSys();
         if(FCEUGameInfo.type!=GIT_NSF)
@@ -951,7 +1073,7 @@ FCEUGI *FCEUI_LoadGame(char *name)
          LoadGamePalette();
          LoadGameCheats();
         }
-        
+
        FCEU_ResetPalette();
         Exit=0;
         return(&FCEUGameInfo);
@@ -972,17 +1094,16 @@ 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];
  }
+ printf("PAL = %i\n", PAL);
  SetSoundVariables();
 }
 
@@ -1002,9 +1123,10 @@ int FCEUI_Initialize(void)
 static INLINE void Thingo(void)
 {
    Loop6502();
+#ifndef NEW_TRY
 
    if(tosprite>=256)
-   { 
+   {
     X6502_Run(256-harko);
     Fixit1();
     X6502_Run(harko);
@@ -1030,6 +1152,9 @@ static INLINE void Thingo(void)
     tosprite=256;
    }
    DoHBlank();
+#else
+   X6502_Run_scanline();
+#endif
 }
 #undef harko
 
@@ -1037,6 +1162,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);
 
@@ -1047,14 +1176,16 @@ void EmLoop(void)
                                  breaks a Super Donkey Kong game. */
 
   X6502_Run(12);               /* I need to figure out the true nature and length
-                                  of this delay. 
+                                  of this delay.
                                */
   if(FCEUGameInfo.type==GIT_NSF)
    TriggerNMINSF();
   else if(VBlankON)
    TriggerNMI();
 
-  X6502_Run((scanlines_per_frame-242)*(256+85)-12); 
+  X6502_Run(256+85-12);
+  for(scanline=242+1;scanline<scanlines_per_frame;scanline++)
+    X6502_Run(256+85);
 
   PPU_status&=0x1f;
 
@@ -1075,12 +1206,15 @@ 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;
 
    deemp=PPU[1]>>5;
+   SetRefreshLine();
    for(scanline=0;scanline<240;scanline++)
    {
     deempcnt[deemp]++;
@@ -1110,7 +1244,6 @@ void EmLoop(void)
    {
     FCEU_PutImageDummy();
     FSkip--;
-    framesRendered++;
     FCEUD_Update(0,WaveFinalMono,ssize);
    }
    else
@@ -1194,7 +1327,7 @@ void ResetNES(void)
         X6502_Reset();
 }
 
-void PowerNES(void) 
+void PowerNES(void)
 {
         if(!GameLoaded) return;
 
@@ -1203,6 +1336,8 @@ void PowerNES(void)
 
         GeniePower();
 
+printf("X.DB offs: %02x\n", (int)&X.DB - (int)&X);
+
         memset(RAM,0x00,0x800);
         ResetMapping();
        GameInterface(GI_POWER);