X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=fce.c;h=e83085eb56cc960e7334eef677940df9a3eda101;hp=a21e5f53ed9992750d400fd47c4469ac9d1e6583;hb=c8c88d89f9bb0df71360b3b68327300f686a1c20;hpb=642070a99a18726024c5b214263221a0340e6987 diff --git a/fce.c b/fce.c index a21e5f5..e83085e 100644 --- a/fce.c +++ b/fce.c @@ -56,8 +56,8 @@ #include "dprintf.h" -#ifdef GP2X -#include "drivers/gp2x/asmutils.h" +#ifdef __arm__ +#include "drivers/arm/asmutils.h" #endif #define Pal (PALRAM) @@ -112,7 +112,9 @@ static writefunc *BWriteG; 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 @@ -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 + +#ifdef DEBUG_ASM_6502 + memcpy(nes_internal_ram, RAM, 0x800); +#endif } void asmcpu_pack(void) @@ -184,6 +190,7 @@ DECLFW(BNull) DECLFR(ANull) { + //printf("open [%04x] %02x @ %04x (%04x)\n", A, X.DB, X.PC, X.PC&0x7ff); return(X.DB); } @@ -653,7 +660,7 @@ static void LineUpdate(uint8 *target) static void LineUpdateEnd(uint8 *target) { -#ifdef GP2X +#ifdef __arm__ if(ScreenON || SpriteON) // Yes, very el-cheapo. { if(PPU[1]&0x01) @@ -1541,6 +1548,7 @@ void PowerNES(void) FCEU_MemoryRand(RAM,0x800); #else memset(RAM,0x00,0x800); + memset(nes_internal_ram,0x00,0x800); #endif ResetMapping(); PowerSound();