--- np2/pccore.c 2003/12/04 09:47:08 1.25 +++ np2/pccore.c 2004/01/30 01:29:13 1.59 @@ -4,9 +4,7 @@ #include "soundmng.h" #include "sysmng.h" #include "timemng.h" -#include "i286.h" -#include "memory.h" -#include "np2ver.h" +#include "cpucore.h" #include "pccore.h" #include "iocore.h" #include "cbuscore.h" @@ -24,14 +22,18 @@ #include "sound.h" #include "fmboard.h" #include "beep.h" +#include "s98.h" #include "font.h" #include "diskdrv.h" #include "fddfile.h" #include "fdd_mtr.h" #include "sxsi.h" +#if defined(SUPPORT_HOSTDRV) +#include "hostdrv.h" +#endif +#include "np2ver.h" #include "calendar.h" #include "timing.h" -//#include "hostdrv.h" #include "debugsub.h" @@ -51,19 +53,18 @@ 3, {0x0c, 0x0c, 0x08, 0x06, 0x03, 0x0c}, 64, 64, 64, 64, 64, 1, 0x82, 0, {0x17, 0x04, 0x1f}, {0x0c, 0x0c, 0x02, 0x10, 0x3f, 0x3f}, - 1, 80, 0, - {"", ""}, "", ""}; + 3, 1, 80, 0, 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, PCMODEL_VX}; + PCCORE pccore = { PCBASECLOCK25, 4, + 0, PCMODEL_VX, 0, 0, + 0, 0, + 4 * PCBASECLOCK25, + 4 * PCBASECLOCK25 * 50 / 3104, + 4 * PCBASECLOCK25 * 5 / 3104, + 4 * PCBASECLOCK25 / 1920, + 4 * PCBASECLOCK25 / 3125, + 100, 20}; // on=0, off=1 // BYTE dip_default[3] = {0x3e, 0x63, 0x7a}; @@ -75,12 +76,29 @@ static const BYTE msw_default[8] = int soundrenewal = 0; BOOL drawframe; UINT drawcount = 0; - - BYTE mem[0x200000]; + BOOL hardwarereset = FALSE; // --------------------------------------------------------------------------- +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; @@ -111,41 +129,76 @@ static void setvsyncclock(void) { vs = 1; } maxy = disp + vs; - cnt = (pc.realclock * 5) / 282; - pc.raster = cnt / maxy; - pc.hsync = (pc.raster * 4) / 5; - pc.dispclock = pc.raster * disp; - pc.vsyncclock = cnt - pc.dispclock; + cnt = (pccore.realclock * 5) / 282; + pccore.raster = cnt / maxy; + pccore.hsync = (pccore.raster * 4) / 5; + pccore.dispclock = pccore.raster * disp; + pccore.vsyncclock = cnt - pccore.dispclock; } -static void setpcclock(UINT base, UINT multiple) { +static void pccore_set(void) { + + UINT8 model; + UINT32 multiple; + UINT8 extsize; - pc.model = PCMODEL_VX; + ZeroMemory(&pccore, sizeof(pccore)); + model = PCMODEL_VX; + if (!milstr_cmp(np2cfg.model, str_VM)) { + model = PCMODEL_VM; + } + else if (!milstr_cmp(np2cfg.model, str_EPSON)) { + model = PCMODEL_EPSON | PCMODEL_VM; + } + pccore.model = model; - if (base >= ((PCBASECLOCK25 + PCBASECLOCK20) / 2)) { - pc.baseclock = PCBASECLOCK25; // 2.5MHz - pc.cpumode = 0; + if (np2cfg.baseclock >= ((PCBASECLOCK25 + PCBASECLOCK20) / 2)) { + pccore.baseclock = PCBASECLOCK25; // 2.5MHz + pccore.cpumode = 0; } else { - pc.baseclock = PCBASECLOCK20; // 2.0MHz - pc.cpumode = CPUMODE_8MHz; + pccore.baseclock = PCBASECLOCK20; // 2.0MHz + pccore.cpumode = CPUMODE_8MHz; } + multiple = np2cfg.multiple; if (multiple == 0) { multiple = 1; } else if (multiple > 32) { multiple = 32; } - pc.multiple = multiple; - pc.realclock = pc.baseclock * multiple; - pc.raster = pc.realclock / 24816; // ver0.28 - pc.hsync = (pc.raster * 4) / 5; // ver0.28 - pc.dispclock = pc.realclock * 50 / 3102; - pc.vsyncclock = pc.realclock * 5 / 3102; - pc.mouseclock = pc.realclock / 120; - pc.keyboardclock = pc.realclock / 1920; - pc.midiclock = pc.realclock / 3125; - pc.frame1000 = pc.realclock / 56400; + pccore.multiple = multiple; + pccore.realclock = pccore.baseclock * multiple; + pccore.raster = pccore.realclock / 24816; + pccore.hsync = (pccore.raster * 4) / 5; + pccore.dispclock = pccore.realclock * 50 / 3102; + pccore.vsyncclock = pccore.realclock * 5 / 3102; + pccore.keyboardclock = pccore.realclock / 1920; + pccore.midiclock = pccore.realclock / 3125; + + // HDDの接続 (I/Oの使用状態が変わるので.. + if (np2cfg.dipsw[1] & 0x20) { + pccore.hddif |= PCHDD_IDE; + } + + // 拡張メモリ + extsize = 0; + if (!(np2cfg.dipsw[2] & 0x80)) { + extsize = min(np2cfg.EXTMEM, 13); + } + pccore.extmem = extsize; + + // サウンドボードの接続 + pccore.sound = np2cfg.SOUND_SW; + + // その他CBUSの接続 + pccore.device = 0; + if (np2cfg.pc9861enable) { + pccore.device |= PCCBUS_PC9861K; + } + if (np2cfg.mpuenable) { + pccore.device |= PCCBUS_MPU98; + } } @@ -160,6 +213,9 @@ static void sound_init(void) { rate = 0; } sound_create(rate, np2cfg.delayms); +#if defined(SUPPORT_WAVEMIX) + wavemix_initialize(rate); +#endif beep_initialize(rate); beep_setvol(np2cfg.BEEP_VOL); tms3631_initialize(rate); @@ -174,28 +230,22 @@ static void sound_init(void) { adpcm_setvol(np2cfg.vol_adpcm); pcm86gen_initialize(rate); pcm86gen_setvol(np2cfg.vol_pcm); + cs4231_initialize(rate); } static void sound_term(void) { soundmng_stop(); +#if defined(SUPPORT_WAVEMIX) + wavemix_deinitialize(); +#endif rhythm_deinitialize(); sound_destroy(); } void pccore_init(void) { - char *p; - - p = np2cfg.biospath; - if (p[0]) { - file_setseparator(p, sizeof(np2cfg.biospath)); - } - else { - file_cpyname(p, file_getcd(str_null), sizeof(np2cfg.biospath)); - } - - i286_initialize(); + CPU_INITIALIZE(); pal_initlcdtable(); pal_makelcdpal(); @@ -217,10 +267,18 @@ void pccore_init(void) { pc9861k_construct(); iocore_create(); + +#if defined(SUPPORT_HOSTDRV) + hostdrv_initialize(); +#endif } void pccore_term(void) { +#if defined(SUPPORT_HOSTDRV) + hostdrv_deinitialize(); +#endif + sound_term(); fdd_eject(0); @@ -228,8 +286,6 @@ void pccore_term(void) { fdd_eject(2); fdd_eject(3); - extmemmng_clear(); - iocore_destroy(); pc9861k_destruct(); @@ -237,6 +293,8 @@ void pccore_term(void) { mpu98ii_destruct(); sxsi_trash(); + + CPU_DEINITIALIZE(); } @@ -261,51 +319,73 @@ void pccore_reset(void) { int i; -// reset_hostdrv(); + soundmng_stop(); + if (soundrenewal) { + soundrenewal = 0; + sound_term(); + sound_init(); + } - ZeroMemory(mem, 0x10fff0); // ver0.28 + ZeroMemory(mem, 0x110000); // ver0.28 ZeroMemory(mem + VRAM1_B, 0x18000); ZeroMemory(mem + VRAM1_E, 0x08000); ZeroMemory(mem + FONT_ADRS, 0x08000); - i286_reset(); - CPUTYPE = 0; - if (np2cfg.dipsw[2] & 0x80) { - CPUTYPE = CPUTYPE_V30; - } - //メモリスイッチ for (i=0; i<8; i++) { mem[0xa3fe2 + i*4] = np2cfg.memsw[i]; } - fddfile_reset2dmode(); - bios0x18_16(0x20, 0xe1); + pccore_set(); + nevent_init(); - soundmng_stop(); - if (soundrenewal) { - soundrenewal = 0; - sound_term(); - sound_init(); + CPU_RESET(); + CPU_SETEXTSIZE((UINT32)pccore.extmem); + + CPU_TYPE = 0; + if (np2cfg.dipsw[2] & 0x80) { + CPU_TYPE = CPUTYPE_V30; + } + if (pccore.model & PCMODEL_EPSON) { // RAM ctrl + CPU_RAM_D000 = 0xffff; } - setpcclock(np2cfg.baseclock, np2cfg.multiple); + // HDDセット + sxsi_open(); +#if defined(SUPPORT_SASI) + if (sxsi_issasi()) { + pccore.hddif &= ~PCHDD_IDE; + pccore.hddif |= PCHDD_SASI; + TRACEOUT(("supported SASI")); + } +#endif +#if defined(SUPPORT_SCSI) + if (sxsi_isscsi()) { + pccore.hddif |= PCHDD_SCSI; + TRACEOUT(("supported SCSI")); + } +#endif + sound_changeclock(); beep_changeclock(); - nevent_init(); - sound_reset(); +#if defined(SUPPORT_WAVEMIX) + wavemix_bind(); +#endif + + fddfile_reset2dmode(); + bios0x18_16(0x20, 0xe1); iocore_reset(); // サウンドでpicを呼ぶので… cbuscore_reset(); - fmboard_reset(np2cfg.SOUND_SW); + fmboard_reset(pccore.sound); + i286_memorymap((pccore.model & PCMODEL_EPSON)?1:0); iocore_build(); iocore_bind(); cbuscore_bind(); fmboard_bind(); - timing_reset(); fddmtr_init(); calendar_init(); vram_init(); @@ -313,24 +393,28 @@ void pccore_reset(void) { pal_change(1); bios_init(); - sxsi_open(); 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(); +#if defined(SUPPORT_HOSTDRV) + hostdrv_reset(); +#endif + + timing_reset(); soundmng_play(); } @@ -483,18 +567,18 @@ 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) { gdc.vsyncint = 0; pic_setirq(2); } - nevent_set(NEVENT_FLAMES, pc.vsyncclock, screendisp, NEVENT_RELATIVE); + nevent_set(NEVENT_FLAMES, pccore.vsyncclock, screendisp, NEVENT_RELATIVE); - // drawscreenで pc.vsyncclockが変更される可能性があります // ver0.28 + // drawscreenで pccore.vsyncclockが変更される可能性があります if (np2cfg.DISPSYNC) { // ver0.29 drawscreen(); } @@ -504,12 +588,47 @@ void screenvsync(NEVENTITEM item) { // --------------------------------------------------------------------------- +// #define IPTRACE (1 << 12) + +#if defined(TRACE) && IPTRACE +static UINT trpos = 0; +static UINT32 treip[IPTRACE]; + +void iptrace_out(void) { + + FILEH fh; + UINT s; + UINT32 eip; + char buf[32]; + + s = trpos; + if (s > IPTRACE) { + s -= IPTRACE; + } + else { + s = 0; + } + fh = file_create_c("his.txt"); + while(s < trpos) { + eip = treip[s & (IPTRACE - 1)]; + s++; + SPRINTF(buf, "%.4x:%.4x\r\n", (eip >> 16), eip & 0xffff); + file_write(fh, buf, strlen(buf)); + } + file_close(fh); +} +#endif + + #if defined(TRACE) static int resetcnt = 0; static int execcnt = 0; int piccnt = 0; +int tr = 0; +UINT cflg; #endif + void pccore_exec(BOOL draw) { drawframe = draw; @@ -520,10 +639,10 @@ 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]; - nevent_set(NEVENT_FLAMES, pc.dispclock, screenvsync, NEVENT_RELATIVE); + MEMWAIT_TRAM = np2cfg.wait[0]; + MEMWAIT_VRAM = np2cfg.wait[2]; + MEMWAIT_GRCG = np2cfg.wait[4]; + nevent_set(NEVENT_FLAMES, pccore.dispclock, screenvsync, NEVENT_RELATIVE); // nevent_get1stevent(); @@ -532,30 +651,75 @@ void pccore_exec(BOOL draw) { resetcnt++; #endif pic_irq(); - if (i286core.s.resetreq) { - i286core.s.resetreq = 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(); } #if 1 // ndef TRACE - if (I286_REMCLOCK > 0) { - if (!(CPUTYPE & CPUTYPE_V30)) { - i286(); + if (CPU_REMCLOCK > 0) { + if (!(CPU_TYPE & CPUTYPE_V30)) { + CPU_EXEC(); } else { - v30(); + CPU_EXECV30(); } } #else - while(I286_REMCLOCK > 0) { - TRACEOUT(("%.4x:%.4x", I286_CS, I286_IP)); - i286_step(); + while(CPU_REMCLOCK > 0) { +#if IPTRACE + treip[trpos & (IPTRACE - 1)] = (CPU_CS << 16) + CPU_IP; + trpos++; +#endif +#if 1 + if ((CPU_CS == 0xf800) && (CPU_IP == 0x0B5B)) { + TRACEOUT(("%.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x", + mem[0x9000], mem[0x9001], + mem[0x9002], mem[0x9003], + mem[0x9004], mem[0x9005], + mem[0x9006], mem[0x9007], + mem[0x9008], mem[0x9009])); + } + if ((CPU_CS == 0xf800) && (CPU_IP == 0x15FF)) { + TRACEOUT(("DX = %.4x / DS:DI = %.4x:%.4x [%.2x]", + CPU_DX, CPU_DS, CPU_DI, mem[0xa3fe0])); + } +#endif +#if 0 + if ((tr & 2) && (mem[0x0471e] == '\\')) { + TRACEOUT(("DTA BREAK %.4x:%.4x", CPU_CS, CPU_IP)); + TRACEOUT(("0471:000e %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x", + mem[0x0471e+0], mem[0x0471e+1], mem[0x0471e+2], mem[0x0471e+3], + mem[0x0471e+4], mem[0x0471e+5], mem[0x0471e+6], mem[0x0471e+7])); + tr -= 2; + } + // DOS6 + if (CPU_CS == 0xffd0) { + if (CPU_IP == 0xc4c2) { + TRACEOUT(("DS:DX = %.4x:%.4x / CX = %.4x", CPU_DS, CPU_DX, CPU_CX)); + } + else if (CPU_IP == 0xc21d) { + TRACEOUT(("-> DS:BX = %.4x:%.4x", CPU_DS, CPU_BX)); + } + } +#endif +#if 0 + if ((CPU_CS == 0x0620) || (CPU_CS == 0x08a0)) { + TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP)); + } +#endif + i286x_step(); +// i286c_step(); } #endif nevent_progress(); @@ -564,12 +728,19 @@ void pccore_exec(BOOL draw) { mpu98ii_callback(); diskdrv_callback(); calendar_inc(); + S98_sync(); sound_sync(); // happy! + if (hardwarereset) { + hardwarereset = FALSE; + pccore_cfgupdate(); + pccore_reset(); + } + #if defined(TRACE) execcnt++; if (execcnt >= 60) { - TRACEOUT(("resetcnt = %d / pic %d", resetcnt, piccnt)); +// TRACEOUT(("resetcnt = %d / pic %d", resetcnt, piccnt)); execcnt = 0; resetcnt = 0; piccnt = 0;