--- np2/pccore.c 2004/01/09 04:36:02 1.42 +++ np2/pccore.c 2004/02/19 11:32:11 1.73 @@ -5,12 +5,12 @@ #include "sysmng.h" #include "timemng.h" #include "cpucore.h" -#include "np2ver.h" #include "pccore.h" #include "iocore.h" #include "cbuscore.h" #include "pc9861k.h" #include "mpu98ii.h" +#include "amd98.h" #include "bios.h" #include "biosmem.h" #include "vram.h" @@ -29,12 +29,14 @@ #include "fddfile.h" #include "fdd_mtr.h" #include "sxsi.h" -#include "calendar.h" -#include "timing.h" -#include "debugsub.h" #if defined(SUPPORT_HOSTDRV) #include "hostdrv.h" #endif +#include "np2ver.h" +#include "calendar.h" +#include "timing.h" +#include "keystat.h" +#include "debugsub.h" const char np2version[] = NP2VER_CORE; @@ -42,8 +44,9 @@ NP2CFG np2cfg = { 0, 1, 0, 32, 0, 0, 0x40, 0, 0, 0, 0, - {0x3e, 0x63, 0x7a}, 0, + {0x3e, 0x73, 0x7b}, 0, 0, 0, {1, 1, 6, 1, 8, 1}, + {{0, {0, }}, {0, {0, }}}, "VX", PCBASECLOCK25, 4, {0x48, 0x05, 0x04, 0x00, 0x01, 0x00, 0x00, 0x6e}, @@ -53,22 +56,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, - {"", ""}, "", "", ""}; - - 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}; + 3, 1, 80, 0, 0, + {"", ""}, +#if defined(SUPPORT_SCSI) + {"", "", "", ""}, +#endif + "", "", ""}; + + PCCORE pccore = { PCBASECLOCK25, 4, + 0, PCMODEL_VX, 0, 0, {0x3e, 0x73, 0x7b}, 0, + 0, 0, + 4 * PCBASECLOCK25}; - // 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}; @@ -77,6 +76,7 @@ static const BYTE msw_default[8] = int soundrenewal = 0; BOOL drawframe; UINT drawcount = 0; + BOOL hardwarereset = FALSE; // --------------------------------------------------------------------------- @@ -99,80 +99,70 @@ const char *p; // ---- -static void setvsyncclock(void) { - - UINT vfp; - UINT vbp; - UINT lf; - UINT disp; - UINT vs; - UINT maxy; - UINT cnt; - - vfp = gdc.m.para[GDC_SYNC + 5] & 0x3f; - if (!vfp) { - vfp = 1; - } - vbp = gdc.m.para[GDC_SYNC + 7] >> 2; - if (!vbp) { - vbp = 1; - } - lf = LOADINTELWORD(gdc.m.para + GDC_SYNC + 6); - lf &= 0x3ff; - if (!lf) { - lf = 1024; - } - disp = vfp + vbp + lf; - vs = LOADINTELWORD(gdc.m.para + GDC_SYNC + 4); - vs = (vs >> 5) & 0x1f; - if (!vs) { - 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; -} - -static void setpcclock(const char *modelstr, UINT base, UINT multiple) { +static void pccore_set(void) { UINT8 model; + UINT32 multiple; + UINT8 extsize; + ZeroMemory(&pccore, sizeof(pccore)); model = PCMODEL_VX; - if (!milstr_cmp(modelstr, str_VM)) { + if (!milstr_cmp(np2cfg.model, str_VM)) { model = PCMODEL_VM; } - else if (!milstr_cmp(modelstr, str_EPSON)) { + else if (!milstr_cmp(np2cfg.model, str_EPSON)) { model = PCMODEL_EPSON | PCMODEL_VM; } - pc.model = model; + 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; +#if 0 + keybrd.xferclock = pccore.realclock / 1920; + gdc.rasterclock = pccore.realclock / 24816; + gdc.hsyncclock = (gdc.rasterclock * 4) / 5; + gdc.dispclock = pccore.realclock * 50 / 3102; + gdc.vsyncclock = pccore.realclock * 5 / 3102; +#endif + // 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; + CopyMemory(pccore.dipsw, np2cfg.dipsw, 3); + + // サウンドボードの接続 + pccore.sound = np2cfg.SOUND_SW; + + // その他CBUSの接続 + pccore.device = 0; + if (np2cfg.pc9861enable) { + pccore.device |= PCCBUS_PC9861K; + } + if (np2cfg.mpuenable) { + pccore.device |= PCCBUS_MPU98; + } } @@ -187,9 +177,7 @@ static void sound_init(void) { rate = 0; } sound_create(rate, np2cfg.delayms); -#if defined(SUPPORT_WAVEMIX) - wavemix_initialize(rate); -#endif + fddmtrsnd_initialize(rate); beep_initialize(rate); beep_setvol(np2cfg.BEEP_VOL); tms3631_initialize(rate); @@ -205,15 +193,15 @@ static void sound_init(void) { pcm86gen_initialize(rate); pcm86gen_setvol(np2cfg.vol_pcm); cs4231_initialize(rate); + amd98_initialize(rate); } static void sound_term(void) { soundmng_stop(); -#if defined(SUPPORT_WAVEMIX) - wavemix_deinitialize(); -#endif + amd98_deinitialize(); rhythm_deinitialize(); + fddmtrsnd_deinitialize(); sound_destroy(); } @@ -224,21 +212,21 @@ void pccore_init(void) { pal_initlcdtable(); pal_makelcdpal(); pal_makeskiptable(); - dispsync_init(); + dispsync_initialize(); sxsi_initialize(); - font_init(); + font_initialize(); font_load(np2cfg.fontfile, TRUE); - maketext_init(); - makegrph_init(); - gdcsub_init(); - fddfile_init(); + maketext_initialize(); + makegrph_initialize(); + gdcsub_initialize(); + fddfile_initialize(); sound_init(); - mpu98ii_construct(); rs232c_construct(); - pc9861k_construct(); + mpu98ii_construct(); + pc9861k_initialize(); iocore_create(); @@ -260,15 +248,15 @@ void pccore_term(void) { fdd_eject(2); fdd_eject(3); - extmemmng_clear(); - iocore_destroy(); - pc9861k_destruct(); - rs232c_destruct(); + pc9861k_deinitialize(); mpu98ii_destruct(); + rs232c_destruct(); sxsi_trash(); + + CPU_DEINITIALIZE(); } @@ -293,65 +281,78 @@ void pccore_reset(void) { int i; - ZeroMemory(mem, 0x10fff0); // ver0.28 + soundmng_stop(); + if (soundrenewal) { + soundrenewal = 0; + sound_term(); + sound_init(); + } + + ZeroMemory(mem, 0x110000); ZeroMemory(mem + VRAM1_B, 0x18000); ZeroMemory(mem + VRAM1_E, 0x08000); ZeroMemory(mem + FONT_ADRS, 0x08000); + //メモリスイッチ + for (i=0; i<8; i++) { + mem[0xa3fe2 + i*4] = np2cfg.memsw[i]; + } + + pccore_set(); + nevent_allreset(); + CPU_RESET(); + CPU_SETEXTSIZE((UINT32)pccore.extmem); + CPU_TYPE = 0; if (np2cfg.dipsw[2] & 0x80) { CPU_TYPE = CPUTYPE_V30; } - - //メモリスイッチ - for (i=0; i<8; i++) { - mem[0xa3fe2 + i*4] = np2cfg.memsw[i]; + if (pccore.model & PCMODEL_EPSON) { // RAM ctrl + CPU_RAM_D000 = 0xffff; } - fddfile_reset2dmode(); - bios0x18_16(0x20, 0xe1); - - soundmng_stop(); - if (soundrenewal) { - soundrenewal = 0; - sound_term(); - sound_init(); + // 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 - setpcclock(np2cfg.model, np2cfg.baseclock, np2cfg.multiple); sound_changeclock(); beep_changeclock(); - nevent_init(); - sound_reset(); -#if defined(SUPPORT_WAVEMIX) - wavemix_bind(); -#endif + fddmtrsnd_bind(); - if (pc.model & PCMODEL_EPSON) { // RAM ctrl - CPU_RAM_D000 = 0xffff; - } + fddfile_reset2dmode(); + bios0x18_16(0x20, 0xe1); iocore_reset(); // サウンドでpicを呼ぶので… cbuscore_reset(); - fmboard_reset(np2cfg.SOUND_SW); + fmboard_reset(pccore.sound); - i286_memorymap((pc.model & PCMODEL_EPSON)?1:0); + i286_memorymap((pccore.model & PCMODEL_EPSON)?1:0); iocore_build(); iocore_bind(); cbuscore_bind(); fmboard_bind(); - timing_reset(); - fddmtr_init(); - calendar_init(); - vram_init(); + fddmtr_initialize(); + calendar_initialize(); + vram_initialize(); pal_change(1); - bios_init(); - sxsi_open(); + bios_initialize(); if (np2cfg.ITF_WORK) { CS_BASE = 0xf0000; @@ -369,11 +370,12 @@ void pccore_reset(void) { CPU_CLEARPREFETCH(); sysmng_cpureset(); - soundmng_play(); - #if defined(SUPPORT_HOSTDRV) hostdrv_reset(); #endif + + timing_reset(); + soundmng_play(); } static void drawscreen(void) { @@ -392,20 +394,18 @@ static void drawscreen(void) { tramflag.renewal |= 1; } - if ((gdcs.textdisp & GDCSCRN_EXT) || // ver0.28 - (gdcs.grphdisp & GDCSCRN_EXT)) { - setvsyncclock(); + if (gdcs.textdisp & GDCSCRN_EXT) { + gdc_updateclock(); } if (drawframe) { - if ((gdcs.textdisp & GDCSCRN_EXT) || // ver0.26 + if ((gdcs.textdisp & GDCSCRN_EXT) || (gdcs.grphdisp & GDCSCRN_EXT)) { if (dispsync_renewalvertical()) { gdcs.textdisp |= GDCSCRN_ALLDRAW2; gdcs.grphdisp |= GDCSCRN_ALLDRAW2; } } - // ver0.28/pr4 if (gdcs.textdisp & GDCSCRN_EXT) { gdcs.textdisp &= ~GDCSCRN_EXT; dispsync_renewalhorizontal(); @@ -414,8 +414,7 @@ static void drawscreen(void) { screenupdate |= 2; } } - // ver0.28/pr4 - if (gdcs.palchange) { // grphを先に + if (gdcs.palchange) { gdcs.palchange = 0; pal_change(0); screenupdate |= 1; @@ -512,7 +511,7 @@ void screendisp(NEVENTITEM item) { gdc_work(GDCWORK_SLAVE); gdc.vsync = 0; screendispflag = 0; - if (!np2cfg.DISPSYNC) { // ver0.29 + if (!np2cfg.DISPSYNC) { drawscreen(); } pi = &pic.pi[0]; @@ -534,10 +533,10 @@ void screenvsync(NEVENTITEM item) { gdc.vsyncint = 0; pic_setirq(2); } - nevent_set(NEVENT_FLAMES, pc.vsyncclock, screendisp, NEVENT_RELATIVE); + nevent_set(NEVENT_FLAMES, gdc.vsyncclock, screendisp, NEVENT_RELATIVE); - // drawscreenで pc.vsyncclockが変更される可能性があります // ver0.28 - if (np2cfg.DISPSYNC) { // ver0.29 + // drawscreenで pccore.vsyncclockが変更される可能性があります + if (np2cfg.DISPSYNC) { drawscreen(); } (void)item; @@ -546,16 +545,51 @@ 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; - keyext_flash(); + keystat_sync(); soundmng_sync(); mouseif_sync(); pal_eventclear(); @@ -565,7 +599,7 @@ void pccore_exec(BOOL draw) { 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_set(NEVENT_FLAMES, gdc.dispclock, screenvsync, NEVENT_RELATIVE); // nevent_get1stevent(); @@ -600,8 +634,26 @@ void pccore_exec(BOOL draw) { } #else while(CPU_REMCLOCK > 0) { - TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP)); +#if IPTRACE + treip[trpos & (IPTRACE - 1)] = (CPU_CS << 16) + CPU_IP; + trpos++; +#endif +#if 0 + 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 i286x_step(); +// i286c_step(); } #endif nevent_progress(); @@ -613,6 +665,12 @@ void pccore_exec(BOOL draw) { S98_sync(); sound_sync(); // happy! + if (hardwarereset) { + hardwarereset = FALSE; + pccore_cfgupdate(); + pccore_reset(); + } + #if defined(TRACE) execcnt++; if (execcnt >= 60) {