X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=fce.c;h=8483a7b00249beba9620d178a3107a802602260b;hp=19d2be4a9251ff952b2aaa058e1ea51b08fe5578;hb=527b98f6e7965f464c804ee5279855326c78dc6d;hpb=778873069e1caaf3afbe7e99b9cefa4f770959c0

diff --git a/fce.c b/fce.c
index 19d2be4..8483a7b 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)
@@ -97,6 +98,7 @@ static uint8 deemp=0;
 static int deempcnt[8];
 
 FCEUGI FCEUGameInfo;
+FCEUGI *GameInfo = &FCEUGameInfo;
 void (*GameInterface)(int h, void *param);
 
 void FP_FASTAPASS(1) (*PPU_hook)(uint32 A);
@@ -111,31 +113,9 @@ static writefunc *BWriteG;
 static int RWWrap=0;
 
 #ifdef ASM_6502
-static void asmcpu_update(int32 cycles)
-{
- // 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);
-   }
-  }
- }
-}
+#ifdef DEBUG_ASM_6502
+extern uint8  nes_internal_ram[0x800];
+#endif
 
 void asmcpu_unpack(void)
 {
@@ -155,6 +135,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)
@@ -181,6 +165,7 @@ DECLFW(BNull)
 
 DECLFR(ANull)
 {
+ //printf("open [%04x] %02x @ %04x (%04x)\n", A, X.DB, X.PC, X.PC&0x7ff);
  return(X.DB);
 }
 
@@ -621,7 +606,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();
@@ -630,17 +622,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)
@@ -650,7 +632,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)
@@ -1107,7 +1089,7 @@ void ResetGameLoaded(void)
 char lastLoadedGameName [2048];
 int LoadGameLastError = 0;
 int UNIFLoad(const char *name, int fp);
-int iNESLoad(const char *name, int fp);
+int iNESLoad(const char *name, int fp, int OverwriteVidMode);
 int FDSLoad(const char *name, int fp);
 int NSFLoad(int fp);
 
@@ -1168,7 +1150,7 @@ FCEUGI *FCEUI_LoadGame(char *name)
 	}
 
         GetFileBase(name2);
-        if(iNESLoad(name2,fp))
+        if(iNESLoad(name2,fp,1))
          goto endlseq;
         if(NSFLoad(fp))
          goto endlseq;
@@ -1255,6 +1237,8 @@ int FCEUI_Initialize(void)
 	FCEUI_Initialize098();
 	FCEUI_SetEmuMode(0);
 
+	X6502_Init();
+
         return 1;
 }
 
@@ -1267,7 +1251,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)
@@ -1276,13 +1259,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;
    }
 }
@@ -1396,10 +1377,10 @@ static void EmLoop(void)
   {
    if(ScreenON || SpriteON)
    {
-    if(GameHBIRQHook)
+    if(GameHBIRQHook && (PPU[0]&0x38)!=0x18)
      GameHBIRQHook();
-     if(PPU_hook)
-      for(x=0;x<42;x++) {PPU_hook(0x2000); PPU_hook(0);} // ugh
+    if(PPU_hook)
+     for(x=0;x<42;x++) {PPU_hook(0x2000); PPU_hook(0);} // ugh
     if(GameHBIRQHook2)
      GameHBIRQHook2();
    }
@@ -1509,13 +1490,14 @@ void ResetNES081(void)
 {
         if(!GameLoaded) return;
         GameInterface(GI_RESETM2, 0);
-        ResetSound();
+        FCEUSND_Reset();
         ResetPPU();
         X6502_Reset();
 }
 
-static void FCEU_MemoryRand(uint8 *ptr, uint32 size)
+void FCEU_MemoryRand(uint8 *ptr, uint32 size)
 {
+#ifndef DEBUG_ASM_6502
  int x=0;
  while(size)
  {
@@ -1524,9 +1506,10 @@ static void FCEU_MemoryRand(uint8 *ptr, uint32 size)
   size--;
   ptr++;
  }
+#endif
 }
 
-void PowerNES081(void)
+void PowerNES(void)
 {
         if(!GameLoaded) return;
 
@@ -1535,14 +1518,21 @@ void PowerNES081(void)
 
         GeniePower();
 
-#ifndef DEBUG_ASM_6502
         FCEU_MemoryRand(RAM,0x800);
-#else
+#ifdef DEBUG_ASM_6502
         memset(RAM,0x00,0x800);
+	memset(nes_internal_ram,0x00,0x800);
 #endif
         ResetMapping();
-        PowerSound();
+        FCEUSND_Power();
 	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();