X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=fce.c;h=38680f9d5f61e22690a23782392a5bb9aace3f9e;hp=89c428572cde71c49d5375897b7332b9451ff682;hb=b2b95d2e0d1fd5e52d03c2152605b09b024c1d0e;hpb=13624c8f3ac5cd1b255a5078c5401b0f97037964

diff --git a/fce.c b/fce.c
index 89c4285..38680f9 100644
--- a/fce.c
+++ b/fce.c
@@ -53,6 +53,10 @@
 
 #include        "dprintf.h"
 
+#ifdef GP2X
+#include	"drivers/gp2x/asmutils.h"
+#endif
+
 #define Pal     (PALRAM)
 
 
@@ -199,6 +203,9 @@ void FlushGenieRW(void)
    ARead[x+0x8000]=AReadG[x];
    BWrite[x+0x8000]=BWriteG[x];
   }
+#ifdef ASM_6502
+  GenieSetPages(1);
+#endif
   free(AReadG);
   free(BWriteG);
   AReadG=0;
@@ -610,17 +617,24 @@ static void Loop6502(void)
 	   for(x=63;x>=0;x--)
 	    ((uint32 *)target)[x]=((uint32*)target)[x]&0xF0F0F0F0;
 	  }
+#ifdef GP2X
+	   if((PPU[1]>>5)==0x7) block_or(target, 256, 0xc0);
+	   else	if(PPU[1]&0xE0) block_andor(target, 256, 0x3f, 0x40);
+	   else                 block_andor(target, 256, 0x3f, 0x80);
+#else
 	   if((PPU[1]>>5)==0x7)
 	    for(x=63;x>=0;x--)
-	     ((uint32 *)target)[x]=(((uint32*)target)[x]&0x3f3f3f3f)|0x40404040;
+	     ((uint32 *)target)[x]=(((uint32*)target)[x])|0xc0c0c0c0;
 	   else	if(PPU[1]&0xE0)
 	    for(x=63;x>=0;x--)
-	     ((uint32 *)target)[x]=((uint32*)target)[x]|0xC0C0C0C0;
+	     ((uint32 *)target)[x]=(((uint32*)target)[x]&0x3f3f3f3f)|0x40404040;
 	   else
             for(x=63;x>=0;x--)
-             ((uint32 *)target)[x]=((uint32*)target)[x]&0x3f3f3f3f;
-	  FCEU_dwmemset(target-  8,0x3f3f3f3f,8);
-	  FCEU_dwmemset(target+256,0x3f3f3f3f,8);
+             ((uint32 *)target)[x]=(((uint32*)target)[x]&0x3f3f3f3f)|0x80808080;
+#endif
+	  // black borders
+	  ((uint32 *)target)[-2]=((uint32 *)target)[-1]=0;
+	  ((uint32 *)target)[64]=((uint32 *)target)[65]=0;
 	 #ifdef FRAMESKIP
 	 }
 	 #endif
@@ -1078,7 +1092,7 @@ FCEUGI *FCEUI_LoadGame(char *name)
 	int have_movie = 0;
         int fp;
 
-        Exit=1;
+        //Exit=1;
         ResetGameLoaded();
 
 	strncpy(name2, name, sizeof(name2));
@@ -1100,6 +1114,8 @@ FCEUGI *FCEUI_LoadGame(char *name)
 	  FCEU_fclose(fp);
 	  *p = 0;
 	  fp=FCEU_fopen(name2,"rb");
+	  if (!fp && p - name2 > 2)  p[-2] = 0;
+	  fp=FCEU_fopen(name2,"rb");
 	  if (!fp) {
 	   printf("no ROM for movie\n");
 	   return 0;
@@ -1176,7 +1192,7 @@ void FCEU_ResetVidSys(void)
   FSettings.FirstSLine=FSettings.UsrFirstSLine[0];
   FSettings.LastSLine=FSettings.UsrLastSLine[0];
  }
- printf("PAL = %i\n", PAL);
+ printf("ResetVidSys: PAL = %i\n", PAL);
  SetSoundVariables();
 }
 
@@ -1228,7 +1244,7 @@ void EmLoop(void)
   // FCEUPPU_Loop:
   if(ppudead) /* Needed for Knight Rider, possibly others. */
   {
-   memset(XBuf, 0x80, 320*240);
+   //memset(XBuf, 0, 320*240);
    X6502_Run(scanlines_per_frame*(256+85));
    ppudead--;
    goto update;
@@ -1288,40 +1304,10 @@ void EmLoop(void)
 
   if(FCEUGameInfo.type==GIT_NSF)
   {
+   // run scanlines for asm core to fuction
    for(scanline=0;scanline<240;scanline++)
     X6502_Run(256+85);
   }
-  #ifdef FRAMESKIP
-   else if(FSkip)
-   {
-    int y;
-
-    y=SPRAM[0];
-    y++;
-
-    PPU_status|=0x20;       // Fixes "Bee 52".  Does it break anything?
-    if(GameHBIRQHook)
-    {
-     X6502_Run(256);
-     for(scanline=0;scanline<240;scanline++)
-     {
-      if(ScreenON || SpriteON)
-       GameHBIRQHook();
-      if(scanline==y && SpriteON) PPU_status|=0x40;
-      X6502_Run((scanline==239)?85:(256+85));
-      ResetRL(); // ??
-     }
-    }
-    else if(y<240)
-    {
-     X6502_Run((256+85)*y);
-     if(SpriteON) PPU_status|=0x40; // Quick and very dirty hack.
-     X6502_Run((256+85)*(240-y));
-    }
-    else
-     X6502_Run((256+85)*240);
-   }
-  #endif
   else
   {
    int x,max,maxref;
@@ -1372,7 +1358,7 @@ update:
 
   if(Exit)
   {
-   CloseGame();
+   //CloseGame();
    break;
   }
 
@@ -1444,6 +1430,18 @@ void ResetNES(void)
         X6502_Reset();
 }
 
+static void FCEU_MemoryRand(uint8 *ptr, uint32 size)
+{
+ int x=0;
+ while(size)
+ {
+  *ptr=(x&4)?0xFF:0x00;
+  x++;
+  size--;
+  ptr++;
+ }
+}
+
 void PowerNES(void)
 {
         if(!GameLoaded) return;
@@ -1453,12 +1451,20 @@ void PowerNES(void)
 
         GeniePower();
 
+#ifndef DEBUG_ASM_6502
+        FCEU_MemoryRand(RAM,0x800);
+#else
         memset(RAM,0x00,0x800);
+#endif
         ResetMapping();
 	GameInterface(GI_POWER);
         PowerSound();
 	PowerPPU();
 	timestampbase=0;
+#ifdef ASM_6502
+	if (geniestage)
+	 GenieSetPages(0);
+#endif
 	X6502_Power();
 }