ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more cleanup

This commit is contained in:
CaH4e3 2012-12-15 21:53:01 +00:00
parent 723e01148c
commit c550c9623e
5 changed files with 412 additions and 536 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/fceu.cpp
View File

@ -314,19 +314,16 @@ void SetWriteHandler(int32 start, int32 end, writefunc func) {
BWrite[x] = func; BWrite[x] = func;
} }
uint8 *GameMemBlock;
uint8 *RAM; uint8 *RAM;
//--------- //---------
//windows might need to allocate these differently, so we have some special code //windows might need to allocate these differently, so we have some special code
static void AllocBuffers() { static void AllocBuffers() {
GameMemBlock = (uint8*)FCEU_gmalloc(GAME_MEM_BLOCK_SIZE);
RAM = (uint8*)FCEU_gmalloc(0x800); RAM = (uint8*)FCEU_gmalloc(0x800);
} }
static void FreeBuffers() { static void FreeBuffers() {
FCEU_free(GameMemBlock);
FCEU_free(RAM); FCEU_free(RAM);
} }
//------ //------

1
src/fceu.h
View File

@ -49,7 +49,6 @@ extern uint8 MMC5HackSPPage;
#define GAME_MEM_BLOCK_SIZE 131072 #define GAME_MEM_BLOCK_SIZE 131072
extern uint8 *RAM; //shared memory modifications extern uint8 *RAM; //shared memory modifications
extern uint8 *GameMemBlock; //shared memory modifications
extern int EmulationPaused; extern int EmulationPaused;
uint8 FCEU_ReadRomByte(uint32 i); uint8 FCEU_ReadRomByte(uint32 i);

483
src/fds.cpp
View File

@ -57,21 +57,22 @@ static DECLFR(FDSWaveRead);
static DECLFR(FDSSRead); static DECLFR(FDSSRead);
static DECLFW(FDSSWrite); static DECLFW(FDSSWrite);
static DECLFR(FDSBIOSRead);
static DECLFR(FDSRAMRead);
static DECLFW(FDSRAMWrite);
static void FDSInit(void);
static void FDSFix(int a);
#define FDSRAM GameMemBlock static void FDSInit(void);
#define CHRRAM (GameMemBlock+32768) static void FDSClose(void);
static void FDSFix(int a);
static uint8 FDSRegs[6]; static uint8 FDSRegs[6];
static int32 IRQLatch, IRQCount; static int32 IRQLatch, IRQCount;
static uint8 IRQa; static uint8 IRQa;
static void FDSClose(void);
static uint8 FDSBIOS[8192]; static uint8 *FDSRAM = NULL;
static uint32 FDSRAMSize;
static uint8 *FDSBIOS = NULL;
static uint32 FDSBIOSsize;
static uint8 *CHRRAM = NULL;
static uint32 CHRRAMSize;
/* Original disk data backup, to help in creating save states. */ /* Original disk data backup, to help in creating save states. */
static uint8 *diskdatao[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; static uint8 *diskdatao[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
@ -87,29 +88,24 @@ static uint8 SelectDisk,InDisk;
#define DC_INC 1 #define DC_INC 1
void FDSGI(GI h) void FDSGI(GI h) {
{ switch (h) {
switch(h)
{
case GI_CLOSE: FDSClose(); break; case GI_CLOSE: FDSClose(); break;
case GI_POWER: FDSInit(); break; case GI_POWER: FDSInit(); break;
} }
} }
static void FDSStateRestore(int version) static void FDSStateRestore(int version) {
{
int x; int x;
setmirror(((FDSRegs[5] & 8) >> 3) ^ 1); setmirror(((FDSRegs[5] & 8) >> 3) ^ 1);
if (version >= 9810) if (version >= 9810)
for(x=0;x<TotalSides;x++) for (x = 0; x < TotalSides; x++) {
{
int b; int b;
for (b = 0; b < 65500; b++) for (b = 0; b < 65500; b++)
diskdata[x][b] ^= diskdatao[x][b]; diskdata[x][b] ^= diskdatao[x][b];
} }
} }
void FDSSound(); void FDSSound();
@ -118,13 +114,12 @@ void FDSSoundStateAdd(void);
static void RenderSound(void); static void RenderSound(void);
static void RenderSoundHQ(void); static void RenderSoundHQ(void);
static void FDSInit(void) static void FDSInit(void) {
{
memset(FDSRegs, 0, sizeof(FDSRegs)); memset(FDSRegs, 0, sizeof(FDSRegs));
writeskip = DiskPtr = DiskSeekIRQ = 0; writeskip = DiskPtr = DiskSeekIRQ = 0;
setmirror(1);
setprg8r(0,0xe000,0); // BIOS setmirror(1);
setprg8(0xE000, 0); // BIOS
setprg32r(1, 0x6000, 0); // 32KB RAM setprg32r(1, 0x6000, 0); // 32KB RAM
setchr8(0); // 8KB CHR RAM setchr8(0); // 8KB CHR RAM
@ -138,9 +133,9 @@ static void FDSInit(void)
SetWriteHandler(0x4020, 0x4025, FDSWrite); SetWriteHandler(0x4020, 0x4025, FDSWrite);
SetWriteHandler(0x6000,0xdfff,FDSRAMWrite); SetWriteHandler(0x6000, 0xDFFF, CartBW);
SetReadHandler(0x6000,0xdfff,FDSRAMRead); SetReadHandler(0x6000, 0xFFFF, CartBR);
SetReadHandler(0xE000,0xFFFF,FDSBIOSRead);
IRQCount = IRQLatch = IRQa = 0; IRQCount = IRQLatch = IRQa = 0;
FDSSoundReset(); FDSSoundReset();
@ -148,25 +143,20 @@ static void FDSInit(void)
SelectDisk = 0; SelectDisk = 0;
} }
void FCEU_FDSInsert(void) void FCEU_FDSInsert(void) {
{
if (FCEUI_EmulationPaused()) EmulationPaused |= 2; if (FCEUI_EmulationPaused()) EmulationPaused |= 2;
if (FCEUMOV_Mode(MOVIEMODE_RECORD)) if (FCEUMOV_Mode(MOVIEMODE_RECORD))
FCEUMOV_AddCommand(FCEUNPCMD_FDSINSERT); FCEUMOV_AddCommand(FCEUNPCMD_FDSINSERT);
if(TotalSides==0) if (TotalSides == 0) {
{
FCEU_DispMessage("Not FDS; can't eject disk.", 0); FCEU_DispMessage("Not FDS; can't eject disk.", 0);
return; return;
} }
if(InDisk==255) if (InDisk == 255) {
{
FCEU_DispMessage("Disk %d Side %s Inserted", 0, SelectDisk >> 1, (SelectDisk & 1) ? "B" : "A"); FCEU_DispMessage("Disk %d Side %s Inserted", 0, SelectDisk >> 1, (SelectDisk & 1) ? "B" : "A");
InDisk = SelectDisk; InDisk = SelectDisk;
} } else {
else
{
FCEU_DispMessage("Disk %d Side %s Ejected", 0, SelectDisk >> 1, (SelectDisk & 1) ? "B" : "A"); FCEU_DispMessage("Disk %d Side %s Ejected", 0, SelectDisk >> 1, (SelectDisk & 1) ? "B" : "A");
InDisk = 255; InDisk = 255;
} }
@ -177,20 +167,17 @@ void FCEU_FDSEject(void)
InDisk=255; InDisk=255;
} }
*/ */
void FCEU_FDSSelect(void) void FCEU_FDSSelect(void) {
{
if (FCEUI_EmulationPaused()) EmulationPaused |= 2; if (FCEUI_EmulationPaused()) EmulationPaused |= 2;
if (FCEUMOV_Mode(MOVIEMODE_RECORD)) if (FCEUMOV_Mode(MOVIEMODE_RECORD))
FCEUMOV_AddCommand(FCEUNPCMD_FDSSELECT); FCEUMOV_AddCommand(FCEUNPCMD_FDSSELECT);
if(TotalSides==0) if (TotalSides == 0) {
{
FCEU_DispMessage("Not FDS; can't select disk.", 0); FCEU_DispMessage("Not FDS; can't select disk.", 0);
return; return;
} }
if(InDisk!=255) if (InDisk != 255) {
{
FCEU_DispMessage("Eject disk before selecting.", 0); FCEU_DispMessage("Eject disk before selecting.", 0);
return; return;
} }
@ -198,63 +185,47 @@ void FCEU_FDSSelect(void)
FCEU_DispMessage("Disk %d Side %c Selected", 0, SelectDisk >> 1, (SelectDisk & 1) ? 'B' : 'A'); FCEU_DispMessage("Disk %d Side %c Selected", 0, SelectDisk >> 1, (SelectDisk & 1) ? 'B' : 'A');
} }
static void FDSFix(int a) static void FDSFix(int a) {
{ if ((IRQa & 2) && IRQCount) {
if((IRQa&2) && IRQCount)
{
IRQCount -= a; IRQCount -= a;
if(IRQCount<=0) if (IRQCount <= 0) {
{ if (!(IRQa & 1)) {
if(!(IRQa&1))
{
IRQa &= ~2; IRQa &= ~2;
IRQCount = IRQLatch = 0; IRQCount = IRQLatch = 0;
} } else
else
IRQCount = IRQLatch; IRQCount = IRQLatch;
//IRQCount=IRQLatch; //0xFFFF;
X6502_IRQBegin(FCEU_IQEXT); X6502_IRQBegin(FCEU_IQEXT);
//printf("IRQ: %d\n",timestamp);
// printf("IRQ: %d\n",scanline);
} }
} }
if(DiskSeekIRQ>0) if (DiskSeekIRQ > 0) {
{
DiskSeekIRQ -= a; DiskSeekIRQ -= a;
if(DiskSeekIRQ<=0) if (DiskSeekIRQ <= 0) {
{ if (FDSRegs[5] & 0x80) {
if(FDSRegs[5]&0x80)
{
X6502_IRQBegin(FCEU_IQEXT2); X6502_IRQBegin(FCEU_IQEXT2);
} }
} }
} }
} }
static DECLFR(FDSRead4030) static DECLFR(FDSRead4030) {
{
uint8 ret = 0; uint8 ret = 0;
/* Cheap hack. */ /* Cheap hack. */
if (X.IRQlow & FCEU_IQEXT) ret |= 1; if (X.IRQlow & FCEU_IQEXT) ret |= 1;
if (X.IRQlow & FCEU_IQEXT2) ret |= 2; if (X.IRQlow & FCEU_IQEXT2) ret |= 2;
if(!fceuindbg) if (!fceuindbg) {
{
X6502_IRQEnd(FCEU_IQEXT); X6502_IRQEnd(FCEU_IQEXT);
X6502_IRQEnd(FCEU_IQEXT2); X6502_IRQEnd(FCEU_IQEXT2);
} }
return ret; return ret;
} }
static DECLFR(FDSRead4031) static DECLFR(FDSRead4031) {
{
static uint8 z = 0; static uint8 z = 0;
if(InDisk!=255) if (InDisk != 255) {
{
z = diskdata[InDisk][DiskPtr]; z = diskdata[InDisk][DiskPtr];
if(!fceuindbg) if (!fceuindbg) {
{
if (DiskPtr < 64999) DiskPtr++; if (DiskPtr < 64999) DiskPtr++;
DiskSeekIRQ = 150; DiskSeekIRQ = 150;
X6502_IRQEnd(FCEU_IQEXT2); X6502_IRQEnd(FCEU_IQEXT2);
@ -262,8 +233,7 @@ static DECLFR(FDSRead4031)
} }
return z; return z;
} }
static DECLFR(FDSRead4032) static DECLFR(FDSRead4032) {
{
uint8 ret; uint8 ret;
ret = X.DB & ~7; ret = X.DB & ~7;
@ -275,26 +245,10 @@ static DECLFR(FDSRead4032)
return ret; return ret;
} }
static DECLFR(FDSRead4033) static DECLFR(FDSRead4033) {
{
return 0x80; // battery return 0x80; // battery
} }
static DECLFW(FDSRAMWrite)
{
(FDSRAM-0x6000)[A]=V;
}
static DECLFR(FDSBIOSRead)
{
return (FDSBIOS-0xE000)[A];
}
static DECLFR(FDSRAMRead)
{
return (FDSRAM-0x6000)[A];
}
/* Begin FDS sound */ /* Begin FDS sound */
#define FDSClock (1789772.7272727272727272 / 2) #define FDSClock (1789772.7272727272727272 / 2)
@ -330,8 +284,7 @@ static FDSSOUND fdso;
#define amplitude fdso.amplitude #define amplitude fdso.amplitude
#define speedo fdso.speedo #define speedo fdso.speedo
void FDSSoundStateAdd(void) void FDSSoundStateAdd(void) {
{
AddExState(fdso.cwave, 64, 0, "WAVE"); AddExState(fdso.cwave, 64, 0, "WAVE");
AddExState(fdso.mwave, 32, 0, "MWAV"); AddExState(fdso.mwave, 32, 0, "MWAV");
AddExState(amplitude, 2, 0, "AMPL"); AddExState(amplitude, 2, 0, "AMPL");
@ -344,49 +297,40 @@ void FDSSoundStateAdd(void)
AddExState(&b24adder66, 4, 1, "B66"); AddExState(&b24adder66, 4, 1, "B66");
AddExState(&b24latch68, 4, 1, "B68"); AddExState(&b24latch68, 4, 1, "B68");
AddExState(&b17latch76, 4, 1, "B76"); AddExState(&b17latch76, 4, 1, "B76");
} }
static DECLFR(FDSSRead) static DECLFR(FDSSRead) {
{ switch (A & 0xF) {
switch(A&0xF)
{
case 0x0: return(amplitude[0] | (X.DB & 0xC0)); case 0x0: return(amplitude[0] | (X.DB & 0xC0));
case 0x2: return(amplitude[1] | (X.DB & 0xC0)); case 0x2: return(amplitude[1] | (X.DB & 0xC0));
} }
return(X.DB); return(X.DB);
} }
static DECLFW(FDSSWrite) static DECLFW(FDSSWrite) {
{ if (FSettings.SndRate) {
if(FSettings.SndRate)
{
if (FSettings.soundq >= 1) if (FSettings.soundq >= 1)
RenderSoundHQ(); RenderSoundHQ();
else else
RenderSound(); RenderSound();
} }
A -= 0x4080; A -= 0x4080;
switch(A) switch (A) {
{
case 0x0: case 0x0:
case 0x4: if(V&0x80) case 0x4:
amplitude[(A&0xF)>>2]=V&0x3F; //)>0x20?0x20:(V&0x3F); if (V & 0x80)
amplitude[(A & 0xF) >> 2] = V & 0x3F;
break; break;
case 0x5://printf("$%04x:$%02x\n",A,V); case 0x7:
break; b17latch76 = 0;
case 0x7: b17latch76=0;SPSG[0x5]=0;//printf("$%04x:$%02x\n",A,V); SPSG[0x5] = 0;
break; break;
case 0x8: case 0x8:
b17latch76 = 0; b17latch76 = 0;
// printf("%d:$%02x, $%02x\n",SPSG[0x5],V,b17latch76);
fdso.mwave[SPSG[0x5] & 0x1F] = V & 0x7; fdso.mwave[SPSG[0x5] & 0x1F] = V & 0x7;
SPSG[0x5] = (SPSG[0x5] + 1) & 0x1F; SPSG[0x5] = (SPSG[0x5] + 1) & 0x1F;
break; break;
} }
//if(A>=0x7 && A!=0x8 && A<=0xF)
//if(A==0xA || A==0x9)
//printf("$%04x:$%02x\n",A,V);
SPSG[A] = V; SPSG[A] = V;
} }
@ -399,67 +343,52 @@ static DECLFW(FDSSWrite)
// $4087 - Same as $4086($4087 is the upper 4 bits) // $4087 - Same as $4086($4087 is the upper 4 bits)
static void DoEnv() static void DoEnv() {
{
int x; int x;
for (x = 0; x < 2; x++) for (x = 0; x < 2; x++)
if(!(SPSG[x<<2]&0x80) && !(SPSG[0x3]&0x40)) if (!(SPSG[x << 2] & 0x80) && !(SPSG[0x3] & 0x40)) {
{
static int counto[2] = { 0, 0 }; static int counto[2] = { 0, 0 };
if(counto[x]<=0) if (counto[x] <= 0) {
{ if (!(SPSG[x << 2] & 0x80)) {
if(!(SPSG[x<<2]&0x80)) if (SPSG[x << 2] & 0x40) {
{
if(SPSG[x<<2]&0x40)
{
if (amplitude[x] < 0x3F) if (amplitude[x] < 0x3F)
amplitude[x]++; amplitude[x]++;
} } else {
else
{
if (amplitude[x] > 0) if (amplitude[x] > 0)
amplitude[x]--; amplitude[x]--;
} }
} }
counto[x] = (SPSG[x << 2] & 0x3F); counto[x] = (SPSG[x << 2] & 0x3F);
} } else
else
counto[x]--; counto[x]--;
} }
} }
static DECLFR(FDSWaveRead) static DECLFR(FDSWaveRead) {
{
return(fdso.cwave[A & 0x3f] | (X.DB & 0xC0)); return(fdso.cwave[A & 0x3f] | (X.DB & 0xC0));
} }
static DECLFW(FDSWaveWrite) static DECLFW(FDSWaveWrite) {
{
//printf("$%04x:$%02x, %d\n",A,V,SPSG[0x9]&0x80);
if (SPSG[0x9] & 0x80) if (SPSG[0x9] & 0x80)
fdso.cwave[A & 0x3f] = V & 0x3F; fdso.cwave[A & 0x3f] = V & 0x3F;
} }
static int ta; static int ta;
static INLINE void ClockRise(void) static INLINE void ClockRise(void) {
{ if (!clockcount) {
if(!clockcount)
{
ta++; ta++;
b19shiftreg60 = (SPSG[0x2] | ((SPSG[0x3] & 0xF) << 8)); b19shiftreg60 = (SPSG[0x2] | ((SPSG[0x3] & 0xF) << 8));
b17latch76 = (SPSG[0x6] | ((SPSG[0x07] & 0xF) << 8)) + b17latch76; b17latch76 = (SPSG[0x6] | ((SPSG[0x07] & 0xF) << 8)) + b17latch76;
if(!(SPSG[0x7]&0x80)) if (!(SPSG[0x7] & 0x80)) {
{
int t = fdso.mwave[(b17latch76 >> 13) & 0x1F] & 7; int t = fdso.mwave[(b17latch76 >> 13) & 0x1F] & 7;
int t2 = amplitude[1]; int t2 = amplitude[1];
int adj = 0; int adj = 0;
if((t&3)) if ((t & 3)) {
{
if ((t & 4)) if ((t & 4))
adj -= (t2 * ((4 - (t & 3)))); adj -= (t2 * ((4 - (t & 3))));
else else
@ -468,45 +397,32 @@ static INLINE void ClockRise(void)
adj *= 2; adj *= 2;
if (adj > 0x7F) adj = 0x7F; if (adj > 0x7F) adj = 0x7F;
if (adj < -0x80) adj = -0x80; if (adj < -0x80) adj = -0x80;
//if(adj) printf("%d ",adj);
b8shiftreg88 = 0x80 + adj; b8shiftreg88 = 0x80 + adj;
} } else {
else
{
b8shiftreg88 = 0x80; b8shiftreg88 = 0x80;
} }
} } else {
else
{
b19shiftreg60 <<= 1; b19shiftreg60 <<= 1;
b8shiftreg88 >>= 1; b8shiftreg88 >>= 1;
} }
// b24adder66=(b24latch68+b19shiftreg60)&0x3FFFFFF;
b24adder66 = (b24latch68 + b19shiftreg60) & 0x1FFFFFF; b24adder66 = (b24latch68 + b19shiftreg60) & 0x1FFFFFF;
} }
static INLINE void ClockFall(void) static INLINE void ClockFall(void) {
{ if ((b8shiftreg88 & 1))
//if(!(SPSG[0x7]&0x80))
{
if((b8shiftreg88&1)) // || clockcount==7)
b24latch68 = b24adder66; b24latch68 = b24adder66;
}
clockcount = (clockcount + 1) & 7; clockcount = (clockcount + 1) & 7;
} }
static INLINE int32 FDSDoSound(void) static INLINE int32 FDSDoSound(void) {
{
fdso.count += fdso.cycles; fdso.count += fdso.cycles;
if(fdso.count>=((int64)1<<40)) if (fdso.count >= ((int64)1 << 40)) {
{
dogk: dogk:
fdso.count -= (int64)1 << 40; fdso.count -= (int64)1 << 40;
ClockRise(); ClockRise();
ClockFall(); ClockFall();
fdso.envcount--; fdso.envcount--;
if(fdso.envcount<=0) if (fdso.envcount <= 0) {
{
fdso.envcount += SPSG[0xA] * 3; fdso.envcount += SPSG[0xA] * 3;
DoEnv(); DoEnv();
} }
@ -523,8 +439,7 @@ dogk:
static int32 FBC = 0; static int32 FBC = 0;
static void RenderSound(void) static void RenderSound(void) {
{
int32 end, start; int32 end, start;
int32 x; int32 x;
@ -535,8 +450,7 @@ static void RenderSound(void)
FBC = end; FBC = end;
if (!(SPSG[0x9] & 0x80)) if (!(SPSG[0x9] & 0x80))
for(x=start;x<end;x++) for (x = start; x < end; x++) {
{
uint32 t = FDSDoSound(); uint32 t = FDSDoSound();
t += t >> 1; t += t >> 1;
t >>= 4; t >>= 4;
@ -544,13 +458,11 @@ static void RenderSound(void)
} }
} }
static void RenderSoundHQ(void) static void RenderSoundHQ(void) {
{
uint32 x; //mbg merge 7/17/06 - made this unsigned uint32 x; //mbg merge 7/17/06 - made this unsigned
if (!(SPSG[0x9] & 0x80)) if (!(SPSG[0x9] & 0x80))
for(x=FBC;x<SOUNDTS;x++) for (x = FBC; x < SOUNDTS; x++) {
{
uint32 t = FDSDoSound(); uint32 t = FDSDoSound();
t += t >> 1; t += t >> 1;
WaveHi[x] += t; //(t<<2)-(t<<1); WaveHi[x] += t; //(t<<2)-(t<<1);
@ -558,60 +470,31 @@ static void RenderSoundHQ(void)
FBC = SOUNDTS; FBC = SOUNDTS;
} }
static void HQSync(int32 ts) static void HQSync(int32 ts) {
{
FBC = ts; FBC = ts;
} }
void FDSSound(int c) void FDSSound(int c) {
{
RenderSound(); RenderSound();
FBC = c; FBC = c;
} }
/* static void FDS_ESI(void) {
static DECLFR(FDSBIOSPatch) if (FSettings.SndRate) {
{ if (FSettings.soundq >= 1) {
if(FDSRegs[5]&0x4)
{
X.X=FDSRead4031(0x4031);
FDSWrite(0x4024,X.A);
X.A=X.X;
return(0x60);
}
else
{
return(0x58);
//puts("Write");
}
}
*/
static void FDS_ESI(void)
{
if(FSettings.SndRate)
{
if(FSettings.soundq>=1)
{
fdso.cycles = (int64)1 << 39; fdso.cycles = (int64)1 << 39;
} } else {
else
{
fdso.cycles = ((int64)1 << 40) * FDSClock; fdso.cycles = ((int64)1 << 40) * FDSClock;
fdso.cycles /= FSettings.SndRate * 16; fdso.cycles /= FSettings.SndRate * 16;
} }
} }
// fdso.cycles=(int64)32768*FDSClock/(FSettings.SndRate *16);
SetReadHandler(0x4040, 0x407f, FDSWaveRead); SetReadHandler(0x4040, 0x407f, FDSWaveRead);
SetWriteHandler(0x4040, 0x407f, FDSWaveWrite); SetWriteHandler(0x4040, 0x407f, FDSWaveWrite);
SetWriteHandler(0x4080, 0x408A, FDSSWrite); SetWriteHandler(0x4080, 0x408A, FDSSWrite);
SetReadHandler(0x4090, 0x4092, FDSSRead); SetReadHandler(0x4090, 0x4092, FDSSRead);
//SetReadHandler(0xE7A3,0xE7A3,FDSBIOSPatch);
} }
void FDSSoundReset(void) void FDSSoundReset(void) {
{
memset(&fdso, 0, sizeof(fdso)); memset(&fdso, 0, sizeof(fdso));
FDS_ESI(); FDS_ESI();
GameExpSound.HiSync = HQSync; GameExpSound.HiSync = HQSync;
@ -620,39 +503,30 @@ void FDSSoundReset(void)
GameExpSound.RChange = FDS_ESI; GameExpSound.RChange = FDS_ESI;
} }
static DECLFW(FDSWrite) static DECLFW(FDSWrite) {
{ switch (A) {
//extern int scanline;
//FCEU_printf("$%04x:$%02x, %d\n",A,V,scanline);
switch(A)
{
case 0x4020: case 0x4020:
X6502_IRQEnd(FCEU_IQEXT); X6502_IRQEnd(FCEU_IQEXT);
IRQLatch &= 0xFF00; IRQLatch &= 0xFF00;
IRQLatch |= V; IRQLatch |= V;
// printf("$%04x:$%02x\n",A,V);
break; break;
case 0x4021: case 0x4021:
X6502_IRQEnd(FCEU_IQEXT); X6502_IRQEnd(FCEU_IQEXT);
IRQLatch &= 0xFF; IRQLatch &= 0xFF;
IRQLatch |= V << 8; IRQLatch |= V << 8;
// printf("$%04x:$%02x\n",A,V);
break; break;
case 0x4022: case 0x4022:
X6502_IRQEnd(FCEU_IQEXT); X6502_IRQEnd(FCEU_IQEXT);
IRQCount = IRQLatch; IRQCount = IRQLatch;
IRQa = V & 3; IRQa = V & 3;
// printf("$%04x:$%02x\n",A,V);
break; break;
case 0x4023: break; case 0x4023: break;
case 0x4024: case 0x4024:
if(InDisk!=255 && !(FDSRegs[5]&0x4) && (FDSRegs[3]&0x1)) if ((InDisk != 255) && !(FDSRegs[5] & 0x4) && (FDSRegs[3] & 0x1)) {
{ if (DiskPtr >= 0 && DiskPtr < 65500) {
if(DiskPtr>=0 && DiskPtr<65500) if (writeskip)
{ writeskip--;
if(writeskip) writeskip--; else if (DiskPtr >= 2) {
else if(DiskPtr>=2)
{
DiskWritten = 1; DiskWritten = 1;
diskdata[InDisk][DiskPtr - 2] = V; diskdata[InDisk][DiskPtr - 2] = V;
} }
@ -661,19 +535,18 @@ static DECLFW(FDSWrite)
break; break;
case 0x4025: case 0x4025:
X6502_IRQEnd(FCEU_IQEXT2); X6502_IRQEnd(FCEU_IQEXT2);
if(InDisk!=255) if (InDisk != 255) {
{ if (!(V & 0x40)) {
if(!(V&0x40)) if ((FDSRegs[5] & 0x40) && !(V & 0x10)) {
{
if(FDSRegs[5]&0x40 && !(V&0x10))
{
DiskSeekIRQ = 200; DiskSeekIRQ = 200;
DiskPtr -= 2; DiskPtr -= 2;
} }
if (DiskPtr < 0) DiskPtr = 0; if (DiskPtr < 0) DiskPtr = 0;
} }
if (!(V & 0x4)) writeskip = 2; if (!(V & 0x4)) writeskip = 2;
if(V&2) {DiskPtr=0;DiskSeekIRQ=200;} if (V & 2) {
DiskPtr = 0; DiskSeekIRQ = 200;
}
if (V & 0x40) DiskSeekIRQ = 200; if (V & 0x40) DiskSeekIRQ = 200;
} }
setmirror(((V >> 3) & 1) ^ 1); setmirror(((V >> 3) & 1) ^ 1);
@ -682,41 +555,34 @@ static DECLFW(FDSWrite)
FDSRegs[A & 7] = V; FDSRegs[A & 7] = V;
} }
static void FreeFDSMemory(void) static void FreeFDSMemory(void) {
{
int x; int x;
for (x = 0; x < TotalSides; x++) for (x = 0; x < TotalSides; x++)
if(diskdata[x]) if (diskdata[x]) {
{
free(diskdata[x]); free(diskdata[x]);
diskdata[x] = 0; diskdata[x] = 0;
} }
} }
static int SubLoad(FCEUFILE *fp) static int SubLoad(FCEUFILE *fp) {
{
struct md5_context md5; struct md5_context md5;
uint8 header[16]; uint8 header[16];
int x; int x;
FCEU_fread(header, 16, 1, fp); FCEU_fread(header, 16, 1, fp);
if(memcmp(header,"FDS\x1a",4)) if (memcmp(header, "FDS\x1a", 4)) {
{ if (!(memcmp(header + 1, "*NINTENDO-HVC*", 14))) {
if(!(memcmp(header+1,"*NINTENDO-HVC*",14)))
{
long t; long t;
t = FCEU_fgetsize(fp); t = FCEU_fgetsize(fp);
if (t < 65500) if (t < 65500)
t = 65500; t = 65500;
TotalSides = t / 65500; TotalSides = t / 65500;
FCEU_fseek(fp, 0, SEEK_SET); FCEU_fseek(fp, 0, SEEK_SET);
} } else
else
return(0); return(0);
} } else
else
TotalSides = header[4]; TotalSides = header[4];
md5_starts(&md5); md5_starts(&md5);
@ -724,11 +590,9 @@ static int SubLoad(FCEUFILE *fp)
if (TotalSides > 8) TotalSides = 8; if (TotalSides > 8) TotalSides = 8;
if (TotalSides < 1) TotalSides = 1; if (TotalSides < 1) TotalSides = 1;
for(x=0;x<TotalSides;x++) for (x = 0; x < TotalSides; x++) {
{
diskdata[x] = (uint8*)FCEU_malloc(65500); diskdata[x] = (uint8*)FCEU_malloc(65500);
if(!diskdata[x]) if (!diskdata[x]) {
{
int zol; int zol;
for (zol = 0; zol < x; zol++) for (zol = 0; zol < x; zol++)
free(diskdata[zol]); free(diskdata[zol]);
@ -741,52 +605,32 @@ static int SubLoad(FCEUFILE *fp)
return(1); return(1);
} }
static void PreSave(void) static void PreSave(void) {
{
int x; int x;
for (x = 0; x < TotalSides; x++) {
//if(DiskWritten)
for(x=0;x<TotalSides;x++)
{
int b; int b;
for (b = 0; b < 65500; b++) for (b = 0; b < 65500; b++)
diskdata[x][b] ^= diskdatao[x][b]; diskdata[x][b] ^= diskdatao[x][b];
} }
} }
static void PostSave(void) static void PostSave(void) {
{
int x; int x;
for (x = 0; x < TotalSides; x++) {
//if(DiskWritten)
for(x=0;x<TotalSides;x++)
{
int b; int b;
for (b = 0; b < 65500; b++) for (b = 0; b < 65500; b++)
diskdata[x][b] ^= diskdatao[x][b]; diskdata[x][b] ^= diskdatao[x][b];
} }
} }
int FDSLoad(const char *name, FCEUFILE *fp) int FDSLoad(const char *name, FCEUFILE *fp) {
{
FILE *zp; FILE *zp;
int x; int x;
char *fn;
FCEU_fseek(fp,0,SEEK_SET); char *fn = strdup(FCEU_MakeFName(FCEUMKF_FDSROM, 0, 0).c_str());
if(!SubLoad(fp)) if (!(zp = FCEUD_UTF8fopen(fn, "rb"))) {
return(0);
fn = strdup(FCEU_MakeFName(FCEUMKF_FDSROM,0,0).c_str());
if(!(zp=FCEUD_UTF8fopen(fn,"rb")))
{
FCEU_PrintError("FDS BIOS ROM image missing: %s", FCEU_MakeFName(FCEUMKF_FDSROM, 0, 0).c_str()); FCEU_PrintError("FDS BIOS ROM image missing: %s", FCEU_MakeFName(FCEUMKF_FDSROM, 0, 0).c_str());
FreeFDSMemory();
free(fn); free(fn);
return 0; return 0;
} }
@ -796,40 +640,66 @@ int FDSLoad(const char *name, FCEUFILE *fp)
fseek(zp, 0L, SEEK_END); fseek(zp, 0L, SEEK_END);
if (ftell(zp) != 8192) { if (ftell(zp) != 8192) {
fclose(zp); fclose(zp);
FreeFDSMemory();
FCEU_PrintError("FDS BIOS ROM image incompatible: %s", FCEU_MakeFName(FCEUMKF_FDSROM, 0, 0).c_str()); FCEU_PrintError("FDS BIOS ROM image incompatible: %s", FCEU_MakeFName(FCEUMKF_FDSROM, 0, 0).c_str());
return 0; return 0;
} }
fseek(zp, 0L, SEEK_SET); fseek(zp, 0L, SEEK_SET);
if(fread(FDSBIOS,1,8192,zp)!=8192) ResetCartMapping();
{
if(FDSBIOS)
free(FDSBIOS);
FDSBIOS = NULL;
if(FDSRAM)
free(FDSRAM);
FDSRAM = NULL;
if(CHRRAM)
free(CHRRAM);
CHRRAM = NULL;
FDSBIOSsize = 8192;
FDSBIOS = (uint8*)FCEU_gmalloc(FDSBIOSsize);
SetupCartPRGMapping(0, FDSBIOS, FDSBIOSsize, 0);
if (fread(FDSBIOS, 1, FDSBIOSsize, zp) != FDSBIOSsize) {
if(FDSBIOS)
free(FDSBIOS);
FDSBIOS = NULL;
fclose(zp); fclose(zp);
FreeFDSMemory();
FCEU_PrintError("Error reading FDS BIOS ROM image."); FCEU_PrintError("Error reading FDS BIOS ROM image.");
return 0; return 0;
} }
fclose(zp); fclose(zp);
if (!disableBatteryLoading) FCEU_fseek(fp, 0, SEEK_SET);
{
FreeFDSMemory();
if (!SubLoad(fp)) {
if(FDSBIOS)
free(FDSBIOS);
FDSBIOS = NULL;
return(0);
}
if (!disableBatteryLoading) {
FCEUFILE *tp; FCEUFILE *tp;
char *fn = strdup(FCEU_MakeFName(FCEUMKF_FDS, 0, 0).c_str()); char *fn = strdup(FCEU_MakeFName(FCEUMKF_FDS, 0, 0).c_str());
int x; int x;
for(x=0;x<TotalSides;x++) for (x = 0; x < TotalSides; x++) {
{
diskdatao[x] = (uint8*)FCEU_malloc(65500); diskdatao[x] = (uint8*)FCEU_malloc(65500);
memcpy(diskdatao[x], diskdata[x], 65500); memcpy(diskdatao[x], diskdata[x], 65500);
} }
if((tp=FCEU_fopen(fn,0,"wb",0))) if ((tp = FCEU_fopen(fn, 0, "rb", 0))) {
{ FCEU_printf("Disk was written. Auxillary FDS file open \"%s\".\n",fn);
FreeFDSMemory(); FreeFDSMemory();
if(!SubLoad(tp)) if (!SubLoad(tp)) {
{
FCEU_PrintError("Error reading auxillary FDS file."); FCEU_PrintError("Error reading auxillary FDS file.");
if(FDSBIOS)
free(FDSBIOS);
FDSBIOS = NULL;
free(fn); free(fn);
return(0); return(0);
} }
@ -852,16 +722,13 @@ int FDSLoad(const char *name, FCEUFILE *fp)
ResetExState(PreSave, PostSave); ResetExState(PreSave, PostSave);
FDSSoundStateAdd(); FDSSoundStateAdd();
for(x=0;x<TotalSides;x++) for (x = 0; x < TotalSides; x++) {
{
char temp[5]; char temp[5];
sprintf(temp, "DDT%d", x); sprintf(temp, "DDT%d", x);
AddExState(diskdata[x], 65500, 0, temp); AddExState(diskdata[x], 65500, 0, temp);
} }
AddExState(FDSRAM,32768,0,"FDSR");
AddExState(FDSRegs, sizeof(FDSRegs), 0, "FREG"); AddExState(FDSRegs, sizeof(FDSRegs), 0, "FREG");
AddExState(CHRRAM,8192,0,"CHRR");
AddExState(&IRQCount, 4, 1, "IRQC"); AddExState(&IRQCount, 4, 1, "IRQC");
AddExState(&IRQLatch, 4, 1, "IQL1"); AddExState(&IRQLatch, 4, 1, "IQL1");
AddExState(&IRQa, 1, 0, "IRQA"); AddExState(&IRQa, 1, 0, "IRQA");
@ -872,11 +739,19 @@ int FDSLoad(const char *name, FCEUFILE *fp)
AddExState(&InDisk, 1, 0, "INDI"); AddExState(&InDisk, 1, 0, "INDI");
AddExState(&DiskWritten, 1, 0, "DSKW"); AddExState(&DiskWritten, 1, 0, "DSKW");
ResetCartMapping(); CHRRAMSize = 8192;
SetupCartCHRMapping(0,CHRRAM,8192,1); CHRRAM = (uint8*)FCEU_gmalloc(CHRRAMSize);
memset(CHRRAM, 0, CHRRAMSize);
SetupCartCHRMapping(0, CHRRAM, CHRRAMSize, 1);
AddExState(CHRRAM, CHRRAMSize, 0, "CHRR");
FDSRAMSize = 32768;
FDSRAM = (uint8*)FCEU_gmalloc(FDSRAMSize);
memset(FDSRAM, 0, FDSRAMSize);
SetupCartPRGMapping(1, FDSRAM, FDSRAMSize, 1);
AddExState(FDSRAM, FDSRAMSize, 0, "FDSR");
SetupCartMirroring(0, 0, 0); SetupCartMirroring(0, 0, 0);
memset(CHRRAM,0,8192);
memset(FDSRAM,0,32768);
FCEU_printf(" Sides: %d\n\n", TotalSides); FCEU_printf(" Sides: %d\n\n", TotalSides);
@ -885,8 +760,7 @@ int FDSLoad(const char *name, FCEUFILE *fp)
return 1; return 1;
} }
void FDSClose(void) void FDSClose(void) {
{
FILE *fp; FILE *fp;
int x; int x;
isFDS = false; isFDS = false;
@ -894,20 +768,33 @@ void FDSClose(void)
if (!DiskWritten) return; if (!DiskWritten) return;
const std::string &fn = FCEU_MakeFName(FCEUMKF_FDS, 0, 0); const std::string &fn = FCEU_MakeFName(FCEUMKF_FDS, 0, 0);
if(!(fp=FCEUD_UTF8fopen(fn.c_str(),"wb"))) if (!(fp = FCEUD_UTF8fopen(fn.c_str(), "wb"))) {
{
return; return;
} }
for(x=0;x<TotalSides;x++) for (x = 0; x < TotalSides; x++) {
{ if (fwrite(diskdata[x], 1, 65500, fp) != 65500) {
if(fwrite(diskdata[x],1,65500,fp)!=65500)
{
FCEU_PrintError("Error saving FDS image!"); FCEU_PrintError("Error saving FDS image!");
fclose(fp); fclose(fp);
return; return;
} }
} }
for (x = 0; x < TotalSides; x++)
if (diskdatao[x]) {
free(diskdatao[x]);
diskdatao[x] = 0;
}
FreeFDSMemory(); FreeFDSMemory();
if(FDSBIOS)
free(FDSBIOS);
FDSBIOS = NULL;
if(FDSRAM)
free(FDSRAM);
FDSRAM = NULL;
if(CHRRAM)
free(CHRRAM);
CHRRAM = NULL;
fclose(fp); fclose(fp);
} }

13
src/ines.cpp
View File

@ -29,7 +29,6 @@
#include "cart.h" #include "cart.h"
#include "ppu.h" #include "ppu.h"
#define INESPRIV
#include "ines.h" #include "ines.h"
#include "unif.h" #include "unif.h"
#include "state.h" #include "state.h"
@ -49,6 +48,7 @@ extern SFORMAT FCEUVSUNI_STATEINFO[];
uint8 *trainerpoo = 0; uint8 *trainerpoo = 0;
uint8 *ROM = NULL; uint8 *ROM = NULL;
uint8 *VROM = NULL; uint8 *VROM = NULL;
uint8 *ExtraNTARAM = NULL;
iNES_HEADER head; iNES_HEADER head;
static CartInfo iNESCart; static CartInfo iNESCart;
@ -113,9 +113,13 @@ void iNESGI(GI h) { //bbit edited: removed static keyword
VROM = NULL; VROM = NULL;
} }
if (trainerpoo) { if (trainerpoo) {
FCEU_gfree(trainerpoo); free(trainerpoo);
trainerpoo = NULL; trainerpoo = NULL;
} }
if (ExtraNTARAM) {
free(ExtraNTARAM);
ExtraNTARAM = NULL;
}
} }
break; break;
} }
@ -737,7 +741,10 @@ int iNESLoad(const char *name, FCEUFILE *fp, int OverwriteVidMode) {
} }
} }
if (head.ROM_type & 8) Mirroring = 2; if (head.ROM_type & 8) {
Mirroring = 2;
ExtraNTARAM = (uint8*)FCEU_gmalloc(2048);
}
if ((ROM = (uint8*)FCEU_malloc(ROM_size << 14)) == NULL) if ((ROM = (uint8*)FCEU_malloc(ROM_size << 14)) == NULL)
return 0; return 0;

16
src/ines.h
View File

@ -24,21 +24,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <map> #include <map>
#ifdef INESPRIV
/* This order is necessary */
#define WRAM (GameMemBlock)
#define sizeofWRAM 8192
/* for the MMC5 code to work properly. It might be fixed later... */
#define CHRRAM (GameMemBlock + sizeofWRAM)
#define sizeofCHRRAM 8192
#define ExtraNTARAM (GameMemBlock + sizeofWRAM + sizeofCHRRAM)
#define sizeofExtraNTARAM 2048
#else
#endif
struct TMasterRomInfo struct TMasterRomInfo
{ {
@ -57,6 +42,7 @@ extern uint8 *ROM;
extern uint8 *VROM; extern uint8 *VROM;
extern uint32 VROM_size; extern uint32 VROM_size;
extern uint32 ROM_size; extern uint32 ROM_size;
extern uint8 *ExtraNTARAM;
extern int iNesSave(); //bbit Edited: line added extern int iNesSave(); //bbit Edited: line added
extern int iNesSaveAs(char* name); extern int iNesSaveAs(char* name);
extern char LoadedRomFName[2048]; //bbit Edited: line added extern char LoadedRomFName[2048]; //bbit Edited: line added