notaz.gp2x.de
/
fceu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use picofe menu, move generic code out of gp2x/
[fceu.git]
/
fce.c
diff --git
a/fce.c
b/fce.c
index
2e4af6d
..
098d3b9
100644
(file)
--- a/
fce.c
+++ b/
fce.c
@@
-28,7
+28,7
@@
#include "fce.h"
#include "fceu098.h"
#include "sound.h"
#include "fce.h"
#include "fceu098.h"
#include "sound.h"
-#include
"svga.h"
+#include "svga.h"
#include "netplay.h"
#include "general.h"
#include "endian.h"
#include "netplay.h"
#include "general.h"
#include "endian.h"
@@
-49,6
+49,7
@@
#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 "palette.h"
#include "movie.h"
@@
-111,6
+112,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
+140,7
@@
static void asmcpu_update(int32 cycles)
}
}
}
}
}
}
+#endif
void asmcpu_unpack(void)
{
void asmcpu_unpack(void)
{
@@
-155,6
+160,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
+190,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);
}
@@
-1265,22
+1275,21
@@
void FCEUI_Kill(void)
static void EmLoop(void);
static void EmLoop(void);
+int use098code = 0;
void (*ResetNES)(void) = 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)
{
+ use098code = 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;
}
}
@@
-1355,7
+1364,10
@@
static void EmLoop(void)
if(ppudead) /* Needed for Knight Rider, possibly others. */
{
//memset(XBuf, 0, 320*240);
if(ppudead) /* Needed for Knight Rider, possibly others. */
{
//memset(XBuf, 0, 320*240);
- X6502_Run(scanlines_per_frame*(256+85));
+ //X6502_Run(scanlines_per_frame*(256+85));
+ int lines;
+ for (lines=scanlines_per_frame;lines;lines--)
+ X6502_Run(256+85);
ppudead--;
goto update;
}
ppudead--;
goto update;
}
@@
-1509,6
+1521,7
@@
void ResetNES081(void)
X6502_Reset();
}
X6502_Reset();
}
+#ifndef DEBUG_ASM_6502
static void FCEU_MemoryRand(uint8 *ptr, uint32 size)
{
int x=0;
static void FCEU_MemoryRand(uint8 *ptr, uint32 size)
{
int x=0;
@@
-1520,8
+1533,9
@@
static void FCEU_MemoryRand(uint8 *ptr, uint32 size)
ptr++;
}
}
ptr++;
}
}
+#endif
-void PowerNES
081
(void)
+void PowerNES(void)
{
if(!GameLoaded) return;
{
if(!GameLoaded) return;
@@
-1534,10
+1548,18
@@
void PowerNES081(void)
FCEU_MemoryRand(RAM,0x800);
#else
memset(RAM,0x00,0x800);
FCEU_MemoryRand(RAM,0x800);
#else
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();