--- np2/pccore.c 2003/11/13 15:33:05 1.16 +++ np2/pccore.c 2003/12/25 19:26:54 1.37 @@ -1,9 +1,10 @@ #include "compiler.h" +#include "strres.h" +#include "dosio.h" #include "soundmng.h" #include "sysmng.h" #include "timemng.h" -#include "i286.h" -#include "memory.h" +#include "cpucore.h" #include "np2ver.h" #include "pccore.h" #include "iocore.h" @@ -11,6 +12,7 @@ #include "pc9861k.h" #include "mpu98ii.h" #include "bios.h" +#include "biosmem.h" #include "vram.h" #include "scrndraw.h" #include "dispsync.h" @@ -21,6 +23,7 @@ #include "sound.h" #include "fmboard.h" #include "beep.h" +#include "s98.h" #include "font.h" #include "diskdrv.h" #include "fddfile.h" @@ -34,38 +37,38 @@ const char np2version[] = NP2VER_CORE; - NP2CFG np2cfg = { - PCBASECLOCK25, 4, 0, - {0x3e, 0x63, 0x7a}, - {0x48, 0x05, 0x04, 0x00, 0x01, 0x00, 0x00, 0x6E}, - {0x0c, 0x0c, 0x08, 0x06, 0x03, 0x0c}, - {1, 1, 6, 1, 8, 1}, - 0, 4, 32, 22050, 800, 0, 1, 1, 0, - 0, 0, - 0, {0, 0, 0}, 0xd1, 0x7f, 0xd1, 0, 0, 1, 0x82, // ver0.30 - 1, 80, 3, 1, 1, 0, 0x000000, 0xffffff, - 0, 0, 0, 0x40, 0, - 64, 64, 64, 64, 64, + NP2CFG np2cfg = { + 0, 1, 0, 32, 0, 0, 0x40, + 0, 0, 0, 0, + {0x3e, 0x63, 0x7a}, 0, + 0, 0, {1, 1, 6, 1, 8, 1}, + + "VX", PCBASECLOCK25, 4, + {0x48, 0x05, 0x04, 0x00, 0x01, 0x00, 0x00, 0x6e}, + 1, 1, 2, 1, 0x000000, 0xffffff, + 22050, 800, 4, 0, + {0, 0, 0}, 0xd1, 0x7f, 0xd1, 0, 0, 1, + 3, {0x0c, 0x0c, 0x08, 0x06, 0x03, 0x0c}, 64, 64, 64, 64, 64, + 1, 0x82, 0, {0x17, 0x04, 0x1f}, {0x0c, 0x0c, 0x02, 0x10, 0x3f, 0x3f}, - 2, 1, 0, 0, - {"", ""}, ""}; + 1, 80, 0, + {"", ""}, "", ""}; PCCORE pc = { PCBASECLOCK25, - 4, - 4 * PCBASECLOCK25, - 4 * PCBASECLOCK25 * 50 / 3104, - 4 * PCBASECLOCK25 * 5 / 3104, - 4 * PCBASECLOCK25 / 120, - 4 * PCBASECLOCK25 / 1920, - 4 * PCBASECLOCK25 / 3125, - (4 * PCBASECLOCK25 / 56400), - 100, 20, - 0}; + 4, + 4 * PCBASECLOCK25, + 4 * PCBASECLOCK25 * 50 / 3104, + 4 * PCBASECLOCK25 * 5 / 3104, + 4 * PCBASECLOCK25 / 120, + 4 * PCBASECLOCK25 / 1920, + 4 * PCBASECLOCK25 / 3125, + 4 * PCBASECLOCK25 / 56400, + 100, 20, 0, PCMODEL_VX}; -// // on=0, off=1 + // on=0, off=1 // BYTE dip_default[3] = {0x3e, 0x63, 0x7a}; static const BYTE msw_default[8] = - {0x48, 0x05, 0x04, 0x00, 0x01, 0x00, 0x00, 0x6E}; + {0x48, 0x05, 0x04, 0x00, 0x01, 0x00, 0x00, 0x6e}; BYTE screenupdate = 3; int screendispflag = 1; @@ -73,11 +76,27 @@ static const BYTE msw_default[8] = BOOL drawframe; UINT drawcount = 0; - BYTE mem[0x200000]; - // --------------------------------------------------------------------------- +void getbiospath(char *path, const char *fname, int maxlen) { + +const char *p; + + p = np2cfg.biospath; + if (p[0]) { + file_cpyname(path, p, maxlen); + file_setseparator(path, maxlen); + file_catname(path, fname, maxlen); + } + else { + file_cpyname(path, file_getcd(fname), maxlen); + } +} + + +// ---- + static void setvsyncclock(void) { UINT vfp; @@ -115,7 +134,18 @@ static void setvsyncclock(void) { pc.vsyncclock = cnt - pc.dispclock; } -static void setpcclock(UINT base, UINT multiple) { // ver0.28 +static void setpcclock(const char *modelstr, UINT base, UINT multiple) { + + UINT8 model; + + model = PCMODEL_VX; + if (!milstr_cmp(modelstr, str_VM)) { + model = PCMODEL_VM; + } + else if (!milstr_cmp(modelstr, str_EPSON)) { + model = PCMODEL_EPSON | PCMODEL_VM; + } + pc.model = model; if (base >= ((PCBASECLOCK25 + PCBASECLOCK20) / 2)) { pc.baseclock = PCBASECLOCK25; // 2.5MHz @@ -180,6 +210,8 @@ static void sound_term(void) { void pccore_init(void) { + CPU_INITIALIZE(); + pal_initlcdtable(); pal_makelcdpal(); pal_makeskiptable(); @@ -211,7 +243,7 @@ void pccore_term(void) { fdd_eject(2); fdd_eject(3); - extmemmng_clear(); // ver0.28 + extmemmng_clear(); iocore_destroy(); @@ -230,8 +262,8 @@ void pccore_cfgupdate(void) { renewal = FALSE; for (i=0; i<8; i++) { - if (np2cfg.memsw[i] != mem[0xa3fe2 + i*4]) { - np2cfg.memsw[i] = mem[0xa3fe2 + i*4]; + if (np2cfg.memsw[i] != mem[MEMB_MSW + i*4]) { + np2cfg.memsw[i] = mem[MEMB_MSW + i*4]; renewal = TRUE; } } @@ -251,10 +283,10 @@ void pccore_reset(void) { ZeroMemory(mem + VRAM1_E, 0x08000); ZeroMemory(mem + FONT_ADRS, 0x08000); - i286_reset(); - CPUTYPE = 0; + CPU_RESET(); + CPU_TYPE = 0; if (np2cfg.dipsw[2] & 0x80) { - CPUTYPE = CPUTYPE_V30; + CPU_TYPE = CPUTYPE_V30; } //メモリスイッチ @@ -272,7 +304,7 @@ void pccore_reset(void) { sound_init(); } - setpcclock(np2cfg.baseclock, np2cfg.multiple); + setpcclock(np2cfg.model, np2cfg.baseclock, np2cfg.multiple); sound_changeclock(); beep_changeclock(); nevent_init(); @@ -300,18 +332,18 @@ void pccore_reset(void) { if (np2cfg.ITF_WORK) { CS_BASE = 0xf0000; - I286_CS = 0xf000; - I286_IP = 0xfff0; + CPU_CS = 0xf000; + CPU_IP = 0xfff0; } else { for (i=0; i<8; i++) { mem[0xa3fe2 + i*4] = msw_default[i]; } CS_BASE = 0xfd800; - I286_CS = 0xfd80; - I286_IP = 0x0002; + CPU_CS = 0xfd80; + CPU_IP = 0x0002; } - i286_resetprefetch(); + CPU_CLEARPREFETCH(); sysmng_cpureset(); soundmng_play(); @@ -466,9 +498,9 @@ void screendisp(NEVENTITEM item) { void screenvsync(NEVENTITEM item) { - vramop.tramwait = np2cfg.wait[1]; - vramop.vramwait = np2cfg.wait[3]; - vramop.grcgwait = np2cfg.wait[5]; + MEMWAIT_TRAM = np2cfg.wait[1]; + MEMWAIT_VRAM = np2cfg.wait[3]; + MEMWAIT_GRCG = np2cfg.wait[5]; gdc_work(GDCWORK_MASTER); gdc.vsync = 0x20; if (gdc.vsyncint) { @@ -484,8 +516,15 @@ void screenvsync(NEVENTITEM item) { (void)item; } + // --------------------------------------------------------------------------- +#if defined(TRACE) +static int resetcnt = 0; +static int execcnt = 0; +int piccnt = 0; +#endif + void pccore_exec(BOOL draw) { drawframe = draw; @@ -496,46 +535,65 @@ void pccore_exec(BOOL draw) { gdc.vsync = 0; screendispflag = 1; - vramop.tramwait = np2cfg.wait[0]; - vramop.vramwait = np2cfg.wait[2]; - vramop.grcgwait = np2cfg.wait[4]; + MEMWAIT_TRAM = np2cfg.wait[0]; + MEMWAIT_VRAM = np2cfg.wait[2]; + MEMWAIT_GRCG = np2cfg.wait[4]; nevent_set(NEVENT_FLAMES, pc.dispclock, screenvsync, NEVENT_RELATIVE); // nevent_get1stevent(); while(screendispflag) { +#if defined(TRACE) + resetcnt++; +#endif pic_irq(); - if (cpuio.reset_req) { - cpuio.reset_req = 0; - I286_CS = 0xf000; + if (CPU_RESETREQ) { + CPU_RESETREQ = 0; +#if 1 + CPU_SHUT(); +#else + CPU_CS = 0xf000; CS_BASE = 0xf0000; - I286_IP = 0xfff0; -#ifdef CPU386 // defineを変えてね - I286_DX = 0x0300; + CPU_IP = 0xfff0; +#if defined(CPUCORE_IA32) + CPU_DX = 0x0300; +#endif + CPU_CLEARPREFETCH(); #endif - i286_resetprefetch(); } -#ifndef TRACE - if (I286_REMCLOCK > 0) { - if (!(CPUTYPE & CPUTYPE_V30)) { - i286(); +#if 1 // ndef TRACE + if (CPU_REMCLOCK > 0) { + if (!(CPU_TYPE & CPUTYPE_V30)) { + CPU_EXEC(); } else { - v30(); + CPU_EXECV30(); } } #else - while(I286_REMCLOCK > 0) { - i286_step(); + while(CPU_REMCLOCK > 0) { + TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP)); + i286x_step(); } #endif nevent_progress(); } - artic_callback(); // ver0.28 + artic_callback(); mpu98ii_callback(); diskdrv_callback(); calendar_inc(); + S98_sync(); sound_sync(); // happy! + +#if defined(TRACE) + execcnt++; + if (execcnt >= 60) { +// TRACEOUT(("resetcnt = %d / pic %d", resetcnt, piccnt)); + execcnt = 0; + resetcnt = 0; + piccnt = 0; + } +#endif }