notaz.gp2x.de
/
fceu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
continue with pandora port
[fceu.git]
/
fce.c
diff --git
a/fce.c
b/fce.c
index
a21e5f5
..
78a75b6
100644
(file)
--- a/
fce.c
+++ b/
fce.c
@@
-56,8
+56,8
@@
#include "dprintf.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)
@@
-112,7
+112,9
@@
static writefunc *BWriteG;
static int RWWrap=0;
#ifdef ASM_6502
static int RWWrap=0;
#ifdef ASM_6502
-#ifndef DEBUG_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
@@
-158,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)
@@
-184,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);
}
@@
-624,7
+631,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();
@@
-633,17
+647,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)
@@
-653,7
+657,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)
@@
-1541,6
+1545,7
@@
void PowerNES(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();
#endif
ResetMapping();
PowerSound();