X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=fce.c;h=78a75b6336d97503cc3a6e255949cb695107b2f4;hp=73e884535139aae631bb7d13e456d7bfdf1aa1f1;hb=e4434f79e73411f4d069831cb813f7db1b1f933b;hpb=a384bf449483e62637ce05a60ff4b06730a19934 diff --git a/fce.c b/fce.c index 73e8845..78a75b6 100644 --- a/fce.c +++ b/fce.c @@ -28,8 +28,7 @@ #include "fce.h" #include "fceu098.h" #include "sound.h" -#include "sound098.h" -#include "svga.h" +#include "svga.h" #include "netplay.h" #include "general.h" #include "endian.h" @@ -50,14 +49,15 @@ #include "file.h" #include "crc32.h" #include "ppu.h" +#include "ppu098.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) @@ -112,6 +112,9 @@ static writefunc *BWriteG; 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 @@ -137,6 +140,7 @@ static void asmcpu_update(int32 cycles) } } } +#endif void asmcpu_unpack(void) { @@ -156,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) @@ -182,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); } @@ -622,7 +631,14 @@ static void LineUpdate(uint8 *target) 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(); @@ -631,17 +647,7 @@ static void LineUpdate(uint8 *target) } 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) @@ -651,7 +657,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) @@ -1268,7 +1274,6 @@ static void EmLoop(void); int use098code = 0; void (*ResetNES)(void) = 0; -void (*PowerNES)(void) = 0; void (*FCEUI_Emulate)(void) = 0; void FCEUI_SetEmuMode(int is_new) @@ -1277,15 +1282,11 @@ void FCEUI_SetEmuMode(int is_new) if (is_new) { ResetNES=ResetNES098; - PowerNES=PowerNES098; - SetSoundVariables=SetSoundVariables098; FCEUI_Emulate=FCEUI_Emulate098; } else { ResetNES=ResetNES081; - PowerNES=PowerNES081; - SetSoundVariables=SetSoundVariables081; FCEUI_Emulate=EmLoop; } } @@ -1517,6 +1518,7 @@ void ResetNES081(void) X6502_Reset(); } +#ifndef DEBUG_ASM_6502 static void FCEU_MemoryRand(uint8 *ptr, uint32 size) { int x=0; @@ -1528,8 +1530,9 @@ static void FCEU_MemoryRand(uint8 *ptr, uint32 size) ptr++; } } +#endif -void PowerNES081(void) +void PowerNES(void) { if(!GameLoaded) return; @@ -1542,10 +1545,18 @@ void PowerNES081(void) FCEU_MemoryRand(RAM,0x800); #else memset(RAM,0x00,0x800); + memset(nes_internal_ram,0x00,0x800); #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();