X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=fce.c;h=4c7ffc63ab0fc60b7399fb01d09eb9ce2532dbc3;hp=687b686ebf8b8bac8a71d739d087f4cd93d3fc95;hb=937bf65b1c80e9394547e5f105664bd26f3671de;hpb=4a1bf31bcd80812fe491d3255646e43c304116b9

diff --git a/fce.c b/fce.c
index 687b686..4c7ffc6 100644
--- a/fce.c
+++ b/fce.c
@@ -205,13 +205,14 @@ uint32 TempAddr,RefreshAddr;
 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)));
+uint8 RAM[0x800] __attribute__ ((aligned (4)));
+
 uint8 PPU[4];
 uint8 PPUSPL;
 
-uint8 GameMemBlock[131072];
-uint8 NTARAM[0x800],PALRAM[0x20];
-uint8 RAM[0x800];
-
 uint8 PAL=0;
 
 
@@ -419,8 +420,9 @@ void BGRender(uint8 *target)
 
         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;
         }
 }
@@ -439,7 +441,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)
         {
@@ -479,18 +481,19 @@ static void Loop6502(void)
 	  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
@@ -713,45 +716,36 @@ static void RefreshLine_PPU_hook(uint8 *P, uint32 vofs)
          }
 }
 
-static void RefreshLine_normal(uint8 *P, uint32 vofs)
+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;
 
-         for(X1=33;X1;X1--,P+=8)
+	 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;
-        {
-	 uint8 *S=PALRAM+cc;
-	 uint8 c1,c2;
+		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;
 
-	 c1=((C[0]>>1)&0x55)|(C[8]&0xAA);
-         c2=(C[0]&0x55)|((C[8]<<1)&0xAA);
-
-         P[6]=S[c1&3];
-         P[7]=S[c2&3];
-         P[4]=S[(c1>>2)&3];
-         P[5]=S[(c2>>2)&3];
-         P[2]=S[(c1>>4)&3];
-         P[3]=S[(c2>>4)&3];
-
-         P[0]=S[c1>>6];
-         P[1]=S[c2>>6];
-        }
+	        #include "fceline.h"
 
-                if((RefreshAddr&0x1f)==0x1f)
-                 RefreshAddr^=0x41F;
-                else
-                 RefreshAddr++;
+                if((rfraddr&0x1f)==0x1f) {
+                 rfraddr^=0x41F;
+	         page = vnapage[(rfraddr>>10)&3];
+                } else
+                 rfraddr++;
          }
+	 RefreshAddr = rfraddr;
 }
 
 static void SetRefreshLine(void)
@@ -791,7 +785,8 @@ static void SetRefreshLine(void)
         }
 }
 
-static INLINE void Fixit2(void)
+//static INLINE
+void Fixit2(void)
 {
    if(ScreenON || SpriteON)
    {
@@ -803,7 +798,8 @@ static INLINE void Fixit2(void)
    }
 }
 
-static INLINE void Fixit1(void)
+//static INLINE
+void Fixit1(void)
 {
    if(ScreenON || SpriteON)
    {
@@ -831,7 +827,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)
@@ -853,21 +852,7 @@ static void DoHBlank(void)
  //PPU_hook(0,-1);
  //fprintf(stderr,"%3d: $%04x\n",scanline,RefreshAddr);
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+#endif
 
 
 // ============================//
@@ -1050,6 +1035,7 @@ int FCEUI_Initialize(void)
 static INLINE void Thingo(void)
 {
    Loop6502();
+#ifndef NEW_TRY
 
    if(tosprite>=256)
    {
@@ -1078,6 +1064,9 @@ static INLINE void Thingo(void)
     tosprite=256;
    }
    DoHBlank();
+#else
+   X6502_Run_scanline();
+#endif
 }
 #undef harko
 
@@ -1085,6 +1074,9 @@ void EmLoop(void)
 {
  for(;;)
  {
+	//extern int asdc;
+	//printf("asdc: %i\n", asdc);
+	//asdc=0;
   ApplyPeriodicCheats();
   X6502_Run(256+85);
 
@@ -1123,7 +1115,9 @@ 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;