notaz.gp2x.de
/
fceu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compat hacks for this old version of fceu
[fceu.git]
/
fce.c
diff --git
a/fce.c
b/fce.c
index
19d2be4
..
282a264
100644
(file)
--- a/
fce.c
+++ b/
fce.c
@@
-49,14
+49,15
@@
#include "file.h"
#include "crc32.h"
#include "ppu.h"
#include "file.h"
#include "crc32.h"
#include "ppu.h"
+#include "ppu098.h"
#include "palette.h"
#include "movie.h"
#include "dprintf.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)
#endif
#define Pal (PALRAM)
@@
-97,6
+98,7
@@
static uint8 deemp=0;
static int deempcnt[8];
FCEUGI FCEUGameInfo;
static int deempcnt[8];
FCEUGI FCEUGameInfo;
+FCEUGI *GameInfo = &FCEUGameInfo;
void (*GameInterface)(int h, void *param);
void FP_FASTAPASS(1) (*PPU_hook)(uint32 A);
void (*GameInterface)(int h, void *param);
void FP_FASTAPASS(1) (*PPU_hook)(uint32 A);
@@
-111,6
+113,9
@@
static writefunc *BWriteG;
static int RWWrap=0;
#ifdef ASM_6502
static int RWWrap=0;
#ifdef ASM_6502
+#ifdef DEBUG_ASM_6502
+extern uint8 nes_internal_ram[0x800];
+#else
static void asmcpu_update(int32 cycles)
{
// some code from x6502.c
static void asmcpu_update(int32 cycles)
{
// some code from x6502.c
@@
-136,6
+141,7
@@
static void asmcpu_update(int32 cycles)
}
}
}
}
}
}
+#endif
void asmcpu_unpack(void)
{
void asmcpu_unpack(void)
{
@@
-155,6
+161,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
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)
}
void asmcpu_pack(void)
@@
-181,6
+191,7
@@
DECLFW(BNull)
DECLFR(ANull)
{
DECLFR(ANull)
{
+ //printf("open [%04x] %02x @ %04x (%04x)\n", A, X.DB, X.PC, X.PC&0x7ff);
return(X.DB);
}
return(X.DB);
}
@@
-621,7
+632,14
@@
static void LineUpdate(uint8 *target)
return;
}
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();
{
if(PPU_hook)
PRefreshLine();
@@
-630,17
+648,7
@@
static void LineUpdate(uint8 *target)
}
else
{
}
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)
}
if(InputScanlineHook)
@@
-650,7
+658,7
@@
static void LineUpdate(uint8 *target)
static void LineUpdateEnd(uint8 *target)
{
static void LineUpdateEnd(uint8 *target)
{
-#ifdef
GP2X
+#ifdef
__arm__
if(ScreenON || SpriteON) // Yes, very el-cheapo.
{
if(PPU[1]&0x01)
if(ScreenON || SpriteON) // Yes, very el-cheapo.
{
if(PPU[1]&0x01)
@@
-1107,7
+1115,7
@@
void ResetGameLoaded(void)
char lastLoadedGameName [2048];
int LoadGameLastError = 0;
int UNIFLoad(const char *name, int fp);
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);
int FDSLoad(const char *name, int fp);
int NSFLoad(int fp);
@@
-1168,7
+1176,7
@@
FCEUGI *FCEUI_LoadGame(char *name)
}
GetFileBase(name2);
}
GetFileBase(name2);
- if(iNESLoad(name2,fp))
+ if(iNESLoad(name2,fp
,1
))
goto endlseq;
if(NSFLoad(fp))
goto endlseq;
goto endlseq;
if(NSFLoad(fp))
goto endlseq;
@@
-1267,7
+1275,6
@@
static void EmLoop(void);
int use098code = 0;
void (*ResetNES)(void) = 0;
int use098code = 0;
void (*ResetNES)(void) = 0;
-void (*PowerNES)(void) = 0;
void (*FCEUI_Emulate)(void) = 0;
void FCEUI_SetEmuMode(int is_new)
void (*FCEUI_Emulate)(void) = 0;
void FCEUI_SetEmuMode(int is_new)
@@
-1276,13
+1283,11
@@
void FCEUI_SetEmuMode(int is_new)
if (is_new)
{
ResetNES=ResetNES098;
if (is_new)
{
ResetNES=ResetNES098;
- PowerNES=PowerNES098;
FCEUI_Emulate=FCEUI_Emulate098;
}
else
{
ResetNES=ResetNES081;
FCEUI_Emulate=FCEUI_Emulate098;
}
else
{
ResetNES=ResetNES081;
- PowerNES=PowerNES081;
FCEUI_Emulate=EmLoop;
}
}
FCEUI_Emulate=EmLoop;
}
}
@@
-1514,8
+1519,9
@@
void ResetNES081(void)
X6502_Reset();
}
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)
{
int x=0;
while(size)
{
@@
-1524,9
+1530,10
@@
static void FCEU_MemoryRand(uint8 *ptr, uint32 size)
size--;
ptr++;
}
size--;
ptr++;
}
+#endif
}
}
-void PowerNES
081
(void)
+void PowerNES(void)
{
if(!GameLoaded) return;
{
if(!GameLoaded) return;
@@
-1535,14
+1542,21
@@
void PowerNES081(void)
GeniePower();
GeniePower();
-#ifndef DEBUG_ASM_6502
FCEU_MemoryRand(RAM,0x800);
FCEU_MemoryRand(RAM,0x800);
-#
else
+#
ifdef DEBUG_ASM_6502
memset(RAM,0x00,0x800);
memset(RAM,0x00,0x800);
+ memset(nes_internal_ram,0x00,0x800);
#endif
ResetMapping();
PowerSound();
PowerPPU();
#endif
ResetMapping();
PowerSound();
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();
GameInterface(GI_POWER, 0);
if(FCEUGameInfo.type==GIT_VSUNI)
FCEU_VSUniPower();