X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FMisc.c;h=944e4c864f2800bed425ea10941cf6f289fb761f;hb=2aa27095f2dbf5b38950fcb1f856d5ffc6a70361;hp=2a0e56997811c0e5b8d2b74dbfb329b2ebd54a37;hpb=eff55556cff77fd64cff4be32e449e0a58aed6fe;p=picodrive.git

diff --git a/Pico/Misc.c b/Pico/Misc.c
index 2a0e569..944e4c8 100644
--- a/Pico/Misc.c
+++ b/Pico/Misc.c
@@ -85,141 +85,97 @@ const unsigned char hcounts_32[] = {
 0x0a,0x0b,0x0b,0x0b,0x0c,0x0c,0x0c,0x0d,
 };
 
-// vcounter values for PicoFrameSimple
-const unsigned short vcounts[] = {
-  0,  0,  1,  1,  2,  2,  3,  3,  4,  4,  5,  5,  6,  6,  7,  7,
-  8,  8,  9,  9, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16,
- 16, 17, 17, 18, 18, 19, 19, 20, 21, 21, 22, 22, 23, 23, 24, 24,
- 25, 25, 26, 26, 27, 27, 28, 28, 29, 29, 30, 31, 31, 32, 32, 33,
- 33, 34, 34, 35, 35, 36, 36, 37, 37, 38, 38, 39, 39, 40, 40, 41,
- 42, 42, 43, 43, 44, 44, 45, 45, 46, 46, 47, 47, 48, 48, 49, 49,
- 50, 50, 51, 52, 52, 53, 53, 54, 54, 55, 55, 56, 56, 57, 57, 58,
- 58, 59, 59, 60, 60, 61, 62, 62, 63, 63, 64, 64, 65, 65, 66, 66,
- 67, 67, 68, 68, 69, 69, 70, 70, 71, 71, 72, 73, 73, 74, 74, 75,
- 75, 76, 76, 77, 77, 78, 78, 79, 79, 80, 80, 81, 81, 82, 83, 83,
- 84, 84, 85, 85, 86, 86, 87, 87, 88, 88, 89, 89, 90, 90, 91, 91,
- 92, 93, 93, 94, 94, 95, 95, 96, 96, 97, 97, 98, 98, 99, 99,100,
-100,101,101,102,102,103,104,104,105,105,106,106,107,107,108,108,
-109,109,110,110,111,111,112,112,113,114,114,115,115,116,116,117,
-117,118,118,119,119,120,120,121,121,122,122,123,124,124,125,125,
-126,126,127,127,128,128,129,129,130,130,131,131,132,132,133,133,
-134,135,135,136,136,137,137,138,138,139,139,140,140,141,141,142,
-142,143,143,144,145,145,146,146,147,147,148,148,149,149,150,150,
-151,151,152,152,153,153,154,155,155,156,156,157,157,158,158,159,
-159,160,160,161,161,162,162,163,163,164,164,165,166,166,167,167,
-168,168,169,169,170,170,171,171,172,172,173,173,174,174,175,176,
-176,177,177,178,178,179,179,180,180,181,181,182,182,183,183,184,
-184,185,186,186,187,187,188,188,189,189,190,190,191,191,192,192,
-193,193,194,194,195,195,196,197,197,198,198,199,199,200,200,201,
-201,202,202,203,203,204,204,205,205,206,207,207,208,208,209,209,
-210,210,211,211,212,212,213,213,214,214,215,215,216,217,217,218,
-218,219,219,220,220,221,221,222,222,223,223,224,224,225,225,226,
-226,227,228,228,229,229,230,230,231,231,232,232,233,233,234,234,
-235,235,236,236,237,238,238,239,239,240,240,241,241,242,242,243,
-243,244,244,245,245,246,246,247,248,248,249,249,250,250,251,251,
-252,252,253,253,254,254,255,255,256,256,257,257,258,259,259,260,
-260,261,261,262,262,263,263,264,264,265,265,266,266,267,267,268,
-269,269,270,270,271,271,272,272,273,273,274,274,275,275,276,276,
-277,277,278,279,279,280,280,281,281,282,282,283,283,284,284,285,
-285,286,286,287,287,288,288,289,290,290,291,291,292,292,293,293,
-294,294,295,295,296,296,297,297,298,298,299,300,300,301,301,302,
-302,303,303,304,304,305,305,306,306,307,307,308,308,309,310,310,
-311,311,311,311,
-};
-
 
 // rarely used EEPROM SRAM code
 // known games which use this:
 // Wonder Boy in Monster World, Megaman - The Wily Wars (X24C01, 128 bytes)
-// NFL Quarterback Club*, Frank Thomas Big Hurt Baseball (X24C04?)
-// College Slam, Blockbuster World Video Game Championship II, NBA Jam (X24C04?)
-// HardBall '95
 
-// the above sports games use addr 0x200000 for SCL line (handled in Memory.c)
+// (see Genesis Plus for Wii/GC code and docs for info,
+//  full game list and better code).
 
 unsigned int lastSSRamWrite = 0xffff0000;
 
-// sram_reg: LAtd sela (L=pending SCL, A=pending SDA, t=type(1==uses 0x200000 for SCL and 2K bytes),
+// sram_reg: LAtd sela (L=pending SCL, A=pending SDA, t=(unused),
 //                      d=SRAM was detected (header or by access), s=started, e=save is EEPROM, l=old SCL, a=old SDA)
 PICO_INTERNAL void SRAMWriteEEPROM(unsigned int d) // ???? ??la (l=SCL, a=SDA)
 {
-  unsigned int sreg = Pico.m.sram_reg, saddr = Pico.m.sram_addr, scyc = Pico.m.sram_cycle, ssa = Pico.m.sram_slave;
+  unsigned int sreg = Pico.m.sram_reg, saddr = Pico.m.eeprom_addr, scyc = Pico.m.eeprom_cycle, ssa = Pico.m.eeprom_slave;
 
-  //dprintf("[%02x]", d);
-  sreg |= saddr&0xc000; // we store word count in add reg: dw?a aaaa ...  (d=word count detected, w=words(0==use 2 words, else 1))
+  elprintf(EL_EEPROM, "eeprom: scl/sda: %i/%i -> %i/%i, newtime=%i", (sreg&2)>>1, sreg&1,
+    (d&2)>>1, d&1, SekCyclesDoneT()-lastSSRamWrite);
   saddr&=0x1fff;
 
   if(sreg & d & 2) {
     // SCL was and is still high..
     if((sreg & 1) && !(d&1)) {
       // ..and SDA went low, means it's a start command, so clear internal addr reg and clock counter
-      //dprintf("-start-");
-	  if(!(sreg&0x8000) && scyc >= 9) {
-	    if(scyc != 28) sreg |= 0x4000; // 1 word
-        //dprintf("detected word count: %i", scyc==28 ? 2 : 1);
-		sreg |= 0x8000;
-	  }
+      elprintf(EL_EEPROM, "eeprom: -start-");
       //saddr = 0;
       scyc = 0;
       sreg |= 8;
     } else if(!(sreg & 1) && (d&1)) {
       // SDA went high == stop command
-      //dprintf("-stop-");
+      elprintf(EL_EEPROM, "eeprom: -stop-");
       sreg &= ~8;
     }
   }
-  else if((sreg & 8) && !(sreg & 2) && (d&2)) {
+  else if((sreg & 8) && !(sreg & 2) && (d&2))
+  {
     // we are started and SCL went high - next cycle
     scyc++; // pre-increment
-	if(sreg & 0x20) {
+    if(SRam.eeprom_type) {
       // X24C02+
-	  if((ssa&1) && scyc == 18) {
-	    scyc = 9;
-		saddr++; // next address in read mode
-		if(sreg&0x4000) saddr&=0xff; else saddr&=0x1fff; // mask
-	  }
-	  else if((sreg&0x4000) && scyc == 27) scyc = 18;
-	  else if(scyc == 36) scyc = 27;
-	} else {
-	  // X24C01
+      if((ssa&1) && scyc == 18) {
+        scyc = 9;
+        saddr++; // next address in read mode
+        /*if(SRam.eeprom_type==2) saddr&=0xff; else*/ saddr&=0x1fff; // mask
+      }
+      else if(SRam.eeprom_type == 2 && scyc == 27) scyc = 18;
+      else if(scyc == 36) scyc = 27;
+    } else {
+      // X24C01
       if(scyc == 18) {
         scyc = 9;  // wrap
         if(saddr&1) { saddr+=2; saddr&=0xff; } // next addr in read mode
-	  }
-	}
-	//dprintf("scyc: %i", scyc);
+      }
+    }
+    elprintf(EL_EEPROM, "eeprom: scyc: %i", scyc);
   }
-  else if((sreg & 8) && (sreg & 2) && !(d&2)) {
+  else if((sreg & 8) && (sreg & 2) && !(d&2))
+  {
     // we are started and SCL went low (falling edge)
-    if(sreg & 0x20) {
-	  // X24C02+
-	  if(scyc == 9 || scyc == 18 || scyc == 27); // ACK cycles
-	  else if( (!(sreg&0x4000) && scyc > 27) || ((sreg&0x4000) && scyc > 18) ) {
+    if(SRam.eeprom_type) {
+      // X24C02+
+      if(scyc == 9 || scyc == 18 || scyc == 27); // ACK cycles
+      else if( (SRam.eeprom_type == 3 && scyc > 27) || (SRam.eeprom_type == 2 && scyc > 18) ) {
         if(!(ssa&1)) {
           // data write
           unsigned char *pm=SRam.data+saddr;
           *pm <<= 1; *pm |= d&1;
           if(scyc == 26 || scyc == 35) {
             saddr=(saddr&~0xf)|((saddr+1)&0xf); // only 4 (?) lowest bits are incremented
-            //dprintf("w done: %02x; addr inc: %x", *pm, saddr);
+            elprintf(EL_EEPROM, "eeprom: write done, addr inc to: %x, last byte=%02x", saddr, *pm);
           }
           SRam.changed = 1;
         }
       } else if(scyc > 9) {
         if(!(ssa&1)) {
           // we latch another addr bit
-		  saddr<<=1;
-		  if(sreg&0x4000) saddr&=0xff; else saddr&=0x1fff; // mask
-		  saddr|=d&1;
-          //if(scyc==17||scyc==26) dprintf("addr reg done: %x", saddr);
-		}
+          saddr<<=1;
+          if(SRam.eeprom_type == 2) saddr&=0xff; else saddr&=0x1fff; // mask
+          saddr|=d&1;
+          if(scyc==17||scyc==26) {
+            elprintf(EL_EEPROM, "eeprom: addr reg done: %x", saddr);
+            if(scyc==17&&SRam.eeprom_type==2) { saddr&=0xff; saddr|=(ssa<<7)&0x700; } // add device bits too
+          }
+        }
       } else {
-	    // slave address
-		ssa<<=1; ssa|=d&1;
-        //if(scyc==8) dprintf("slave done: %x", ssa);
+        // slave address
+        ssa<<=1; ssa|=d&1;
+        if(scyc==8) elprintf(EL_EEPROM, "eeprom: slave done: %x", ssa);
       }
-	} else {
-	  // X24C01
+    } else {
+      // X24C01
       if(scyc == 9); // ACK cycle, do nothing
       else if(scyc > 9) {
         if(!(saddr&1)) {
@@ -228,77 +184,89 @@ PICO_INTERNAL void SRAMWriteEEPROM(unsigned int d) // ???? ??la (l=SCL, a=SDA)
           *pm <<= 1; *pm |= d&1;
           if(scyc == 17) {
             saddr=(saddr&0xf9)|((saddr+2)&6); // only 2 lowest bits are incremented
-            //dprintf("addr inc: %x", saddr>>1);
+            elprintf(EL_EEPROM, "eeprom: write done, addr inc to: %x, last byte=%02x", saddr>>1, *pm);
           }
           SRam.changed = 1;
         }
       } else {
         // we latch another addr bit
         saddr<<=1; saddr|=d&1; saddr&=0xff;
-        //if(scyc==8) dprintf("addr done: %x", saddr>>1);
+        if(scyc==8) elprintf(EL_EEPROM, "eeprom: addr done: %x", saddr>>1);
       }
-	}
+    }
   }
 
   sreg &= ~3; sreg |= d&3; // remember SCL and SDA
-  Pico.m.sram_reg  = (unsigned char)  sreg;
-  Pico.m.sram_addr = (unsigned short)(saddr|(sreg&0xc000));
-  Pico.m.sram_cycle= (unsigned char)  scyc;
-  Pico.m.sram_slave= (unsigned char)  ssa;
+  Pico.m.sram_reg    = (unsigned char) sreg;
+  Pico.m.eeprom_cycle= (unsigned char) scyc;
+  Pico.m.eeprom_slave= (unsigned char) ssa;
+  Pico.m.eeprom_addr = (unsigned short)saddr;
 }
 
 PICO_INTERNAL_ASM unsigned int SRAMReadEEPROM(void)
 {
-  unsigned int shift, d=0;
-  unsigned int sreg, saddr, scyc, ssa;
+  unsigned int shift, d;
+  unsigned int sreg, saddr, scyc, ssa, interval;
 
   // flush last pending write
   SRAMWriteEEPROM(Pico.m.sram_reg>>6);
 
-  sreg = Pico.m.sram_reg; saddr = Pico.m.sram_addr&0x1fff; scyc = Pico.m.sram_cycle; ssa = Pico.m.sram_slave;
-//  if(!(sreg & 2) && (sreg&0x80)) scyc++; // take care of raising edge now to compensate lag
+  sreg = Pico.m.sram_reg; saddr = Pico.m.eeprom_addr&0x1fff; scyc = Pico.m.eeprom_cycle; ssa = Pico.m.eeprom_slave;
+  interval = SekCyclesDoneT()-lastSSRamWrite;
+  d = (sreg>>6)&1; // use SDA as "open bus"
 
-  if(SekCyclesDoneT()-lastSSRamWrite < 46) {
-    // data was just written, there was no time to respond (used by sports games)
-    d = (sreg>>6)&1;
-  } else if((sreg & 8) && scyc > 9 && scyc != 18 && scyc != 27) {
+  // NBA Jam is nasty enough to read <before> raising the SCL and starting the new cycle.
+  // this is probably valid because data changes occur while SCL is low and data can be read
+  // before it's actual cycle begins.
+  if (!(sreg&0x80) && interval >= 24) {
+    elprintf(EL_EEPROM, "eeprom: early read, cycles=%i", interval);
+    scyc++;
+  }
+
+  if (!(sreg & 8)); // not started, use open bus
+  else if (scyc == 9 || scyc == 18 || scyc == 27) {
+    elprintf(EL_EEPROM, "eeprom: r ack");
+    d = 0;
+  } else if (scyc > 9 && scyc < 18) {
     // started and first command word received
     shift = 17-scyc;
-    if(sreg & 0x20) {
-	  // X24C02+
-      if(ssa&1) {
-        //dprintf("read: addr %02x, cycle %i, reg %02x", saddr, scyc, sreg);
-	    d = (SRam.data[saddr]>>shift)&1;
-	  }
-	} else {
-	  // X24C01
-      if(saddr&1) {
-		d = (SRam.data[saddr>>1]>>shift)&1;
-	  }
-	}
+    if (SRam.eeprom_type) {
+      // X24C02+
+      if (ssa&1) {
+        elprintf(EL_EEPROM, "eeprom: read: addr %02x, cycle %i, reg %02x", saddr, scyc, sreg);
+	if (shift==0) elprintf(EL_EEPROM, "eeprom: read done, byte %02x", SRam.data[saddr]);
+        d = (SRam.data[saddr]>>shift)&1;
+      }
+    } else {
+      // X24C01
+      if (saddr&1) {
+        elprintf(EL_EEPROM, "eeprom: read: addr %02x, cycle %i, reg %02x", saddr>>1, scyc, sreg);
+	if (shift==0) elprintf(EL_EEPROM, "eeprom: read done, byte %02x", SRam.data[saddr>>1]);
+        d = (SRam.data[saddr>>1]>>shift)&1;
+      }
+    }
   }
-  //else dprintf("r ack");
 
-  return d;
+  return (d << SRam.eeprom_bit_out);
 }
 
 PICO_INTERNAL void SRAMUpdPending(unsigned int a, unsigned int d)
 {
-  unsigned int sreg = Pico.m.sram_reg;
-
-  if(!(a&1)) sreg|=0x20;
-
-  if(sreg&0x20) { // address through 0x200000
-    if(!(a&1)) {
-      sreg&=~0x80;
-      sreg|=d<<7;
-    } else {
-      sreg&=~0x40;
-      sreg|=(d<<6)&0x40;
-    }
-  } else {
-    sreg&=~0xc0;
-    sreg|=d<<6;
+  unsigned int d1, sreg = Pico.m.sram_reg;
+
+  if (!((SRam.eeprom_abits^a)&1))
+  {
+    // SCL
+    sreg &= ~0x80;
+    d1 = (d >> SRam.eeprom_bit_cl) & 1;
+    sreg |= d1<<7;
+  }
+  if (!(((SRam.eeprom_abits>>1)^a)&1))
+  {
+    // SDA in
+    sreg &= ~0x40;
+    d1 = (d >> SRam.eeprom_bit_in) & 1;
+    sreg |= d1<<6;
   }
 
   Pico.m.sram_reg = (unsigned char) sreg;
@@ -306,8 +274,30 @@ PICO_INTERNAL void SRAMUpdPending(unsigned int a, unsigned int d)
 
 
 #ifndef _ASM_MISC_C
+typedef struct
+{
+	int b0;
+	int b1;
+	int b2;
+	int b3;
+	int b4;
+	int b5;
+	int b6;
+	int b7;
+} intblock;
+
 PICO_INTERNAL_ASM void memcpy16(unsigned short *dest, unsigned short *src, int count)
 {
+	if ((((int)dest | (int)src) & 3) == 0)
+	{
+		if (count >= 32) {
+			memcpy32((int *)dest, (int *)src, count/2);
+			count&=1;
+		} else {
+			for (; count >= 2; count -= 2, dest+=2, src+=2)
+				*(int *)dest = *(int *)src;
+		}
+	}
 	while (count--)
 		*dest++ = *src++;
 }
@@ -321,9 +311,15 @@ PICO_INTERNAL_ASM void memcpy16bswap(unsigned short *dest, void *src, int count)
 		*dest++ = (src_[0] << 8) | src_[1];
 }
 
-
+#ifndef _ASM_MISC_C_AMIPS
 PICO_INTERNAL_ASM void memcpy32(int *dest, int *src, int count)
 {
+	intblock *bd = (intblock *) dest, *bs = (intblock *) src;
+
+	for (; count >= sizeof(*bd)/4; count -= sizeof(*bd)/4)
+		*bd++ = *bs++;
+
+	dest = (int *)bd; src = (int *)bs;
 	while (count--)
 		*dest++ = *src++;
 }
@@ -331,8 +327,14 @@ PICO_INTERNAL_ASM void memcpy32(int *dest, int *src, int count)
 
 PICO_INTERNAL_ASM void memset32(int *dest, int c, int count)
 {
+	for (; count >= 8; count -= 8, dest += 8)
+		dest[0] = dest[1] = dest[2] = dest[3] =
+		dest[4] = dest[5] = dest[6] = dest[7] = c;
+
 	while (count--)
 		*dest++ = c;
 }
+void memset32_uncached(int *dest, int c, int count) { memset32(dest, c, count); }
+#endif
 #endif