X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fcarthw%2Fsvp%2Fmemory.c;h=b37985e91cdedf0bb4444220e93045ce86e56584;hb=cff531af94bd9c9c89ae162e80f48ddc26a4e504;hp=7f182fe02ad6dd8a3ffd5918fd592f617188371f;hpb=1cfc5cc4ce06642b9bc45ca3b9d32793718e9455;p=picodrive.git diff --git a/pico/carthw/svp/memory.c b/pico/carthw/svp/memory.c index 7f182fe..b37985e 100644 --- a/pico/carthw/svp/memory.c +++ b/pico/carthw/svp/memory.c @@ -1,56 +1,73 @@ -// The SVP chip emulator, mem I/O stuff - -// (c) Copyright 2008, Grazvydas "notaz" Ignotas -// Free for non-commercial use. - -// For commercial use, separate licencing terms must be obtained. - +/* + * The SVP chip emulator, mem I/O stuff + * + * Copyright (c) Gražvydas "notaz" Ignotas, 2008 + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the organization nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #include "../../pico_int.h" +#include "../../memory.h" -#ifndef UTYPES_DEFINED -typedef unsigned char u8; -typedef unsigned short u16; -typedef unsigned int u32; -#define UTYPES_DEFINED -#endif +// for wait loop det +static void PicoWrite16_dram(u32 a, u32 d) +{ + a &= ~0xfe0000; -#define CLEAR_DETECT(pc_start,pc_end,text) \ - if (d == 0 && SekPc >= pc_start && SekPc < pc_end) \ - { \ - if (!clearing_ram) \ - elprintf(EL_SVP, text); \ - clearing_ram = 1; \ - return; \ + if (d != 0) { + if (a == 0xfe06) // 30fe06 + svp->ssp1601.emu_status &= ~SSP_WAIT_30FE06; + else if (a == 0xfe08) + svp->ssp1601.emu_status &= ~SSP_WAIT_30FE08; } -unsigned int PicoSVPRead16(unsigned int a, int realsize) + ((u16 *)svp->dram)[a / 2] = d; +} + +// "cell arrange" 1: 390000-39ffff +static u32 PicoRead16_svpca1(u32 a) { - unsigned int d = 0; - static int a15004_looping = 0; - - // dram: 300000-31ffff - if ((a & 0xfe0000) == 0x300000) - d = *(u16 *)(svp->dram + (a&0x1fffe)); - - // "cell arrange" 1: 390000-39ffff - else if ((a & 0xff0000) == 0x390000) { - // this is rewritten 68k code - unsigned int a1 = a >> 1; - a1 = (a1 & 0x7001) | ((a1 & 0x3e) << 6) | ((a1 & 0xfc0) >> 5); - d = ((u16 *)svp->dram)[a1]; - } + // this is 68k code rewritten + u32 a1 = a >> 1; + a1 = (a1 & 0x7001) | ((a1 & 0x3e) << 6) | ((a1 & 0xfc0) >> 5); + return ((u16 *)svp->dram)[a1]; +} - // "cell arrange" 2: 3a0000-3affff - else if ((a & 0xff0000) == 0x3a0000) { - // this is rewritten 68k code - unsigned int a1 = a >> 1; - a1 = (a1 & 0x7801) | ((a1 & 0x1e) << 6) | ((a1 & 0x7e0) >> 4); - d = ((u16 *)svp->dram)[a1]; - } +// "cell arrange" 2: 3a0000-3affff +static u32 PicoRead16_svpca2(u32 a) +{ + u32 a1 = a >> 1; + a1 = (a1 & 0x7801) | ((a1 & 0x1e) << 6) | ((a1 & 0x7e0) >> 4); + return ((u16 *)svp->dram)[a1]; +} + +// IO/control area (0xa10000 - 0xa1ffff) +static u32 PicoRead16_svpr(u32 a) +{ + u32 d = 0; // regs - else if ((a & 0xfffff0) == 0xa15000) { + if ((a & ~0x0f) == 0xa15000) { switch (a & 0xf) { case 0: case 2: @@ -60,44 +77,55 @@ unsigned int PicoSVPRead16(unsigned int a, int realsize) case 4: d = svp->ssp1601.gr[SSP_PM0].h; svp->ssp1601.gr[SSP_PM0].h &= ~1; - if (d&1) a15004_looping = 0; break; } - } - else - elprintf(EL_UIO|EL_SVP|EL_ANOMALY, "SVP FIXME: unhandled r%i: [%06x] %04x @%06x", realsize, a&0xffffff, d, SekPc); - if (!a15004_looping) - elprintf(EL_SVP, "SVP r%i: [%06x] %04x @%06x", realsize, a&0xffffff, d, SekPc); - - if (a == 0xa15004 && !(d&1)) { - if (!a15004_looping) - elprintf(EL_SVP, "SVP det TIGHT loop: a15004"); - a15004_looping = 1; +#if EL_LOGMASK & EL_SVP + { + static int a15004_looping = 0; + if (a == 0xa15004 && (d & 1)) + a15004_looping = 0; + + if (!a15004_looping) + elprintf(EL_SVP, "SVP r%i: [%06x] %04x @%06x", realsize, a, d, SekPc); + + if (a == 0xa15004 && !(d&1)) { + if (!a15004_looping) + elprintf(EL_SVP, "SVP det TIGHT loop: a15004"); + a15004_looping = 1; + } + else + a15004_looping = 0; + } +#endif + return d; } - else a15004_looping = 0; //if (a == 0x30fe02 && d == 0) // elprintf(EL_ANOMALY, "SVP lag?"); - return d; + return PicoRead16_io(a); } -void PicoSVPWrite8(unsigned int a, unsigned int d, int realsize) +// used in VR test mode +static u32 PicoRead8_svpr(u32 a) { - elprintf(EL_UIO|EL_SVP|EL_ANOMALY, "!!! SVP w%i: [%06x], %08x @%06x", realsize, a&0xffffff, d, SekPc); + u32 d; + + if ((a & ~0x0f) != 0xa15000) + return PicoRead8_io(a); + + d = PicoRead16_svpr(a & ~1); + if (!(a & 1)) + d >>= 8; + return d; } -void PicoSVPWrite16(unsigned int a, unsigned int d, int realsize) +static void PicoWrite16_svpr(u32 a, u32 d) { - static int clearing_ram = 0; + elprintf(EL_SVP, "SVP w16: [%06x] %04x @%06x", a, d, SekPc); - // DRAM - if ((a & 0xfe0000) == 0x300000) - *(u16 *)(svp->dram + (a&0x1fffe)) = d; - - // regs - else if ((a & 0xfffff0) == 0xa15000) { + if ((a & ~0x0f) == 0xa15000) { if (a == 0xa15000 || a == 0xa15002) { // just guessing here svp->ssp1601.gr[SSP_XST].h = d; @@ -106,24 +134,30 @@ void PicoSVPWrite16(unsigned int a, unsigned int d, int realsize) } //else if (a == 0xa15006) svp->ssp1601.gr[SSP_PM0].h = d | (d << 1); // 0xa15006 probably has 'halt' + return; } - else - elprintf(EL_UIO|EL_SVP|EL_ANOMALY, "SVP FIXME: unhandled w%i: [%06x] %04x @%06x", realsize, a&0xffffff, d, SekPc); + PicoWrite16_io(a, d); +} - if (a == 0x30fe06 && d != 0) - svp->ssp1601.emu_status &= ~SSP_WAIT_30FE06; - - if (a == 0x30fe08 && d != 0) - svp->ssp1601.emu_status &= ~SSP_WAIT_30FE08; +void PicoSVPMemSetup(void) +{ + // 68k memmap: + // DRAM + cpu68k_map_set(m68k_read8_map, 0x300000, 0x31ffff, svp->dram, 0); + cpu68k_map_set(m68k_read16_map, 0x300000, 0x31ffff, svp->dram, 0); + cpu68k_map_set(m68k_write8_map, 0x300000, 0x31ffff, svp->dram, 0); + cpu68k_map_set(m68k_write16_map, 0x300000, 0x31ffff, svp->dram, 0); + cpu68k_map_set(m68k_write16_map, 0x300000, 0x30ffff, PicoWrite16_dram, 1); - // debug: detect RAM clears.. - CLEAR_DETECT(0x0221dc, 0x0221f0, "SVP RAM CLEAR (full) @ 0221C2"); - CLEAR_DETECT(0x02204c, 0x022068, "SVP RAM CLEAR 300000-31ffbf (1) @ 022032"); - CLEAR_DETECT(0x021900, 0x021ff0, "SVP RAM CLEAR 300000-305fff"); - CLEAR_DETECT(0x0220b0, 0x0220cc, "SVP RAM CLEAR 300000-31ffbf (2) @ 022096"); - clearing_ram = 0; + // DRAM (cell arrange) + cpu68k_map_set(m68k_read16_map, 0x390000, 0x39ffff, PicoRead16_svpca1, 1); + cpu68k_map_set(m68k_read16_map, 0x3a0000, 0x3affff, PicoRead16_svpca2, 1); - elprintf(EL_SVP, "SVP w%i: [%06x] %04x @%06x", realsize, a&0xffffff, d, SekPc); + // regs + cpu68k_map_set(m68k_read8_map, 0xa10000, 0xa1ffff, PicoRead8_svpr, 1); + cpu68k_map_set(m68k_read16_map, 0xa10000, 0xa1ffff, PicoRead16_svpr, 1); + cpu68k_map_set(m68k_write8_map, 0xa10000, 0xa1ffff, PicoWrite8_io, 1); // PicoWrite8_svpr + cpu68k_map_set(m68k_write16_map, 0xa10000, 0xa1ffff, PicoWrite16_svpr, 1); }