X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=fce.c;h=78a75b6336d97503cc3a6e255949cb695107b2f4;hp=eafba1174b07876be134762c838557f67c964342;hb=158d88bade9b4fc038e1c9cee3924f3c89a70caa;hpb=cd9a6b519c9c465d6781d4a6636d715542e6e0f6

diff --git a/fce.c b/fce.c
index eafba11..78a75b6 100644
--- a/fce.c
+++ b/fce.c
@@ -49,14 +49,15 @@
 #include	"file.h"
 #include	"crc32.h"
 #include        "ppu.h"
+#include        "ppu098.h"
 
 #include        "palette.h"
 #include        "movie.h"
 
 #include        "dprintf.h"
 
-#ifdef GP2X
-#include	"drivers/gp2x/asmutils.h"
+#ifdef __arm__
+#include	"drivers/arm/asmutils.h"
 #endif
 
 #define Pal     (PALRAM)
@@ -111,7 +112,9 @@ static writefunc *BWriteG;
 static int RWWrap=0;
 
 #ifdef ASM_6502
-#ifndef DEBUG_ASM_6502
+#ifdef DEBUG_ASM_6502
+extern uint8  nes_internal_ram[0x800];
+#else
 static void asmcpu_update(int32 cycles)
 {
  // some code from x6502.c
@@ -157,6 +160,10 @@ void asmcpu_unpack(void)
 	nes_registers[4]|= X.P & 0x5d;
 	nes_registers[5] = X.P << 24; // N
 	if (!(X.P&0x02)) nes_registers[5] |= 1; // Z
+
+#ifdef DEBUG_ASM_6502
+	memcpy(nes_internal_ram, RAM, 0x800);
+#endif
 }
 
 void asmcpu_pack(void)
@@ -183,6 +190,7 @@ DECLFW(BNull)
 
 DECLFR(ANull)
 {
+ //printf("open [%04x] %02x @ %04x (%04x)\n", A, X.DB, X.PC, X.PC&0x7ff);
  return(X.DB);
 }
 
@@ -623,7 +631,14 @@ static void LineUpdate(uint8 *target)
 	 return;
 	}
 
-	if(scanline < FSettings.FirstSLine || scanline > FSettings.LastSLine)
+	if(!ScreenON)
+	{
+	  tem=Pal[0]|0x40;
+	  tem|=tem << 8;
+	  tem|=tem << 16;
+	  FCEU_dwmemset(target,tem,256);
+	}
+	else if(scanline < FSettings.FirstSLine || scanline > FSettings.LastSLine)
 	{
 	   if(PPU_hook)
  	    PRefreshLine();
@@ -632,17 +647,7 @@ static void LineUpdate(uint8 *target)
 	}
 	else
 	{
-	 if(ScreenON)
-	 {
-	   BGRender(target);
-	 }
-	 else
-	 {
-	   tem=Pal[0]|0x40;
-	   tem|=tem << 8;
-	   tem|=tem << 16;
-	   FCEU_dwmemset(target,tem,256);
-	 }
+	 BGRender(target);
 	}
 
         if(InputScanlineHook)
@@ -652,7 +657,7 @@ static void LineUpdate(uint8 *target)
 
 static void LineUpdateEnd(uint8 *target)
 {
-#ifdef GP2X
+#ifdef __arm__
  if(ScreenON || SpriteON)  // Yes, very el-cheapo.
  {
   if(PPU[1]&0x01)
@@ -1269,7 +1274,6 @@ static void EmLoop(void);
 
 int use098code = 0;
 void (*ResetNES)(void) = 0;
-void (*PowerNES)(void) = 0;
 void (*FCEUI_Emulate)(void) = 0;
 
 void FCEUI_SetEmuMode(int is_new)
@@ -1278,13 +1282,11 @@ void FCEUI_SetEmuMode(int is_new)
    if (is_new)
    {
     ResetNES=ResetNES098;
-    PowerNES=PowerNES098;
     FCEUI_Emulate=FCEUI_Emulate098;
    }
    else
    {
     ResetNES=ResetNES081;
-    PowerNES=PowerNES081;
     FCEUI_Emulate=EmLoop;
    }
 }
@@ -1530,7 +1532,7 @@ static void FCEU_MemoryRand(uint8 *ptr, uint32 size)
 }
 #endif
 
-void PowerNES081(void)
+void PowerNES(void)
 {
         if(!GameLoaded) return;
 
@@ -1543,10 +1545,18 @@ void PowerNES081(void)
         FCEU_MemoryRand(RAM,0x800);
 #else
         memset(RAM,0x00,0x800);
+	memset(nes_internal_ram,0x00,0x800);
 #endif
         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();