X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FMemory.c;h=b1faacdfa25b5a69468a85fa8af60ef07fe7d60e;hb=dca310c413517d278898b967cfe610574310acd8;hp=2d08fd464ae75845f2d221800bc6c35a4ddd6b94;hpb=d4ca252d929395352f581b532e9d3726da31d718;p=picodrive.git diff --git a/Pico/cd/Memory.c b/Pico/cd/Memory.c index 2d08fd4..b1faacd 100644 --- a/Pico/cd/Memory.c +++ b/Pico/cd/Memory.c @@ -18,10 +18,15 @@ typedef unsigned int u32; #define UTYPES_DEFINED #endif +#ifdef _MSC_VER +#define rdprintf +#define wrdprintf +#else //#define rdprintf dprintf #define rdprintf(...) //#define wrdprintf dprintf #define wrdprintf(...) +#endif #ifdef EMU_CORE_DEBUG extern u32 lastread_a, lastread_d[16], lastwrite_cyc_d[16]; @@ -1158,11 +1163,12 @@ static u32 PicoReadS68k32(u32 a) // word RAM (1M area) if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff int bank; + u16 *pm; wrdprintf("s68k_wram1M r32: [%06x] @%06x", a, SekPcS68k); // if (!(Pico_mcd->s68k_regs[3]&4)) // dprintf("s68k_wram1M FIXME: wrong mode"); bank = (Pico_mcd->s68k_regs[3]&1)^1; - u16 *pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); d = (pm[0]<<16)|pm[1]; + pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); d = (pm[0]<<16)|pm[1]; wrdprintf("ret = %08x", d); goto end; }