--- np2/pccore.c 2005/02/07 14:46:07 1.97 +++ np2/pccore.c 2011/01/15 05:33:07 1.110 @@ -75,13 +75,14 @@ const OEMCHAR np2version[] = OEMTEXT(NP2 0, PCMODEL_VX, 0, 0, {0x3e, 0x73, 0x7b}, 0, 0, 0, PCBASECLOCK25 * PCBASEMULTIPLE}; + PCSTAT pcstat = {3, TRUE, FALSE, FALSE}; - UINT8 screenupdate = 3; - int screendispflag = 1; - int soundrenewal = 0; - BOOL drawframe; +// UINT8 screenupdate = 3; +// int screendispflag = 1; + UINT8 soundrenewal = 0; +// BOOL drawframe; UINT drawcount = 0; - BOOL hardwarereset = FALSE; +// BOOL hardwarereset = FALSE; // --------------------------------------------------------------------------- @@ -104,62 +105,82 @@ const OEMCHAR *p; // ---- -static void pccore_set(void) { - +static void pccore_set(const NP2CFG *pConfig) +{ UINT8 model; UINT32 multiple; UINT8 extsize; ZeroMemory(&pccore, sizeof(pccore)); model = PCMODEL_VX; - if (!milstr_cmp(np2cfg.model, str_VM)) { + if (!milstr_cmp(pConfig->model, str_VM)) { model = PCMODEL_VM; } - else if (!milstr_cmp(np2cfg.model, str_EPSON)) { + else if (!milstr_cmp(pConfig->model, str_EPSON)) { model = PCMODEL_EPSON | PCMODEL_VM; } pccore.model = model; - if (np2cfg.baseclock >= ((PCBASECLOCK25 + PCBASECLOCK20) / 2)) { + if (np2cfg.baseclock >= ((PCBASECLOCK25 + PCBASECLOCK20) / 2)) + { pccore.baseclock = PCBASECLOCK25; // 2.5MHz pccore.cpumode = 0; } - else { + else + { pccore.baseclock = PCBASECLOCK20; // 2.0MHz pccore.cpumode = CPUMODE_8MHZ; } - multiple = np2cfg.multiple; - if (multiple == 0) { + multiple = pConfig->multiple; + if (multiple == 0) + { multiple = 1; } - else if (multiple > 32) { + else if (multiple > 32) + { multiple = 32; } pccore.multiple = multiple; pccore.realclock = pccore.baseclock * multiple; // HDDの接続 (I/Oの使用状態が変わるので.. - if (np2cfg.dipsw[1] & 0x20) { + if (pConfig->dipsw[1] & 0x20) + { pccore.hddif |= PCHDD_IDE; +#if defined(SUPPORT_IDEIO) + sxsi_setdevtype(0x02, SXSIDEV_CDROM); +#endif + } + else + { + sxsi_setdevtype(0x02, SXSIDEV_NC); } // 拡張メモリ extsize = 0; - if (!(np2cfg.dipsw[2] & 0x80)) { - extsize = min(np2cfg.EXTMEM, 13); + if (!(pConfig->dipsw[2] & 0x80)) + { + extsize = np2cfg.EXTMEM; +#if defined(CPUCORE_IA32) + extsize = min(extsize, 63); +#else + extsize = min(extsize, 13); +#endif } pccore.extmem = extsize; - CopyMemory(pccore.dipsw, np2cfg.dipsw, 3); + CopyMemory(pccore.dipsw, pConfig->dipsw, 3); // サウンドボードの接続 - pccore.sound = np2cfg.SOUND_SW; + pccore.sound = pConfig->SOUND_SW; // その他CBUSの接続 pccore.device = 0; - if (np2cfg.pc9861enable) { + if (pConfig->pc9861enable) + { pccore.device |= PCCBUS_PC9861K; } - if (np2cfg.mpuenable) { + if (pConfig->mpuenable) + { pccore.device |= PCCBUS_MPU98; } } @@ -168,12 +189,13 @@ static void pccore_set(void) { // -------------------------------------------------------------------------- #if !defined(DISABLE_SOUND) -static void sound_init(void) { - +static void sound_init(void) +{ UINT rate; rate = np2cfg.samplingrate; - if ((rate != 11025) && (rate != 22050) && (rate != 44100)) { + if ((rate != 11025) && (rate != 22050) && (rate != 44100)) + { rate = 0; } sound_create(rate, np2cfg.delayms); @@ -260,7 +282,7 @@ void pccore_term(void) { mpu98ii_destruct(); rs232c_destruct(); - sxsi_trash(); + sxsi_alltrash(); CPU_DEINITIALIZE(); } @@ -272,12 +294,22 @@ void pccore_cfgupdate(void) { int i; renewal = FALSE; - for (i=0; i<8; i++) { - if (np2cfg.memsw[i] != mem[MEMX_MSW + i*4]) { + for (i=0; i<8; i++) + { + if (np2cfg.memsw[i] != mem[MEMX_MSW + i*4]) + { np2cfg.memsw[i] = mem[MEMX_MSW + i*4]; renewal = TRUE; } } + for (i=0; i<3; i++) + { + if (np2cfg.dipsw[i] != pccore.dipsw[i]) + { + np2cfg.dipsw[i] = pccore.dipsw[i]; + renewal = TRUE; + } + } if (renewal) { sysmng_update(SYS_UPDATECFG); } @@ -301,18 +333,19 @@ void pccore_reset(void) { ZeroMemory(mem + FONT_ADRS, 0x08000); //メモリスイッチ - for (i=0; i<8; i++) { + for (i=0; i<8; i++) + { mem[0xa3fe2 + i*4] = np2cfg.memsw[i]; } - pccore_set(); + pccore_set(&np2cfg); nevent_allreset(); CPU_RESET(); CPU_SETEXTSIZE((UINT32)pccore.extmem); CPU_TYPE = 0; - if (np2cfg.dipsw[2] & 0x80) { + if (pccore.dipsw[2] & 0x80) { CPU_TYPE = CPUTYPE_V30; } if (pccore.model & PCMODEL_EPSON) { // RAM ctrl @@ -320,7 +353,8 @@ void pccore_reset(void) { } // HDDセット - sxsi_open(); + diskdrv_hddbind(); + // SASI/IDEどっち？ #if defined(SUPPORT_SASI) if (sxsi_issasi()) { pccore.hddif &= ~PCHDD_IDE; @@ -343,11 +377,11 @@ void pccore_reset(void) { fddfile_reset2dmode(); bios0x18_16(0x20, 0xe1); - iocore_reset(); // サウンドでpicを呼ぶので… - cbuscore_reset(); - fmboard_reset(pccore.sound); + iocore_reset(&np2cfg); // サウンドでpicを呼ぶので… + cbuscore_reset(&np2cfg); + fmboard_reset(&np2cfg, pccore.sound); - i286_memorymap((pccore.model & PCMODEL_EPSON)?1:0); + MEMM_ARCH((pccore.model & PCMODEL_EPSON)?1:0); iocore_build(); iocore_bind(); cbuscore_bind(); @@ -374,6 +408,10 @@ void pccore_reset(void) { timing_reset(); soundmng_play(); + +#if 0 && defined(SUPPORT_IDEIO) // Test! + sxsi_devopen(0x02, OEMTEXT("e:\\pn\\pn.iso")); +#endif } static void drawscreen(void) { @@ -398,7 +436,7 @@ static void drawscreen(void) { gdc_updateclock(); } - if (!drawframe) { + if (!pcstat.drawframe) { return; } if ((gdcs.textdisp & GDCSCRN_EXT) || (gdcs.grphdisp & GDCSCRN_EXT)) { @@ -412,13 +450,13 @@ static void drawscreen(void) { dispsync_renewalhorizontal(); tramflag.renewal |= 1; if (dispsync_renewalmode()) { - screenupdate |= 2; + pcstat.screenupdate |= 2; } } if (gdcs.palchange) { gdcs.palchange = 0; pal_change(0); - screenupdate |= 1; + pcstat.screenupdate |= 1; } if (gdcs.grphdisp & GDCSCRN_EXT) { gdcs.grphdisp &= ~GDCSCRN_EXT; @@ -446,7 +484,7 @@ static void drawscreen(void) { if (gdcs.grphdisp & bit) { (*grphfn)(gdcs.disp, gdcs.grphdisp & bit & GDCSCRN_ALLDRAW2); gdcs.grphdisp &= ~bit; - screenupdate |= 1; + pcstat.screenupdate |= 1; } } else if (gdcs.textdisp & GDCSCRN_ENABLE) { @@ -462,7 +500,7 @@ static void drawscreen(void) { gdcs.grphdisp & GDCSCRN_ALLDRAW); } gdcs.grphdisp &= ~GDCSCRN_MAKE; - screenupdate |= 1; + pcstat.screenupdate |= 1; } } else { @@ -477,7 +515,7 @@ static void drawscreen(void) { gdcs.grphdisp & (GDCSCRN_ALLDRAW << 1)); } gdcs.grphdisp &= ~(GDCSCRN_MAKE << 1); - screenupdate |= 1; + pcstat.screenupdate |= 1; } } } @@ -498,11 +536,11 @@ static void drawscreen(void) { maketext40(gdcs.textdisp & GDCSCRN_ALLDRAW); } gdcs.textdisp &= ~GDCSCRN_MAKE; - screenupdate |= 1; + pcstat.screenupdate |= 1; } } - if (screenupdate) { - screenupdate = scrndraw_draw((UINT8)(screenupdate & 2)); + if (pcstat.screenupdate) { + pcstat.screenupdate = scrndraw_draw((UINT8)(pcstat.screenupdate & 2)); drawcount++; } } @@ -513,7 +551,7 @@ void screendisp(NEVENTITEM item) { gdc_work(GDCWORK_SLAVE); gdc.vsync = 0; - screendispflag = 0; + pcstat.screendispflag = 0; if (!np2cfg.DISPSYNC) { drawscreen(); } @@ -549,44 +587,11 @@ void screenvsync(NEVENTITEM item) { // --------------------------------------------------------------------------- // #define SINGLESTEPONLY -// #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 @@ -597,14 +602,14 @@ void pccore_postevent(UINT32 event) { // void pccore_exec(BOOL draw) { - drawframe = draw; + pcstat.drawframe = (UINT8)draw; // keystat_sync(); soundmng_sync(); mouseif_sync(); pal_eventclear(); gdc.vsync = 0; - screendispflag = 1; + pcstat.screendispflag = 1; MEMWAIT_TRAM = np2cfg.wait[0]; MEMWAIT_VRAM = np2cfg.wait[2]; MEMWAIT_GRCG = np2cfg.wait[4]; @@ -612,7 +617,7 @@ void pccore_exec(BOOL draw) { // nevent_get1stevent(); - while(screendispflag) { + while(pcstat.screendispflag) { #if defined(TRACE) resetcnt++; #endif @@ -621,7 +626,6 @@ void pccore_exec(BOOL draw) { CPU_RESETREQ = 0; CPU_SHUT(); } - #if !defined(SINGLESTEPONLY) if (CPU_REMCLOCK > 0) { if (!(CPU_TYPE & CPUTYPE_V30)) { @@ -633,115 +637,6 @@ void pccore_exec(BOOL draw) { } #else while(CPU_REMCLOCK > 0) { -#if 0 - if (CPU_CS == 0x0000) { - if (CPU_IP == 0x1191) { - char buf[10]; - int i; - for (i=0; i<6; i++) { - buf[i] = MEML_READ8(0x1000, CPU_BX + i); - } - buf[6] = '\0'; - TRACEOUT(("load: %s", buf)); - } - if (CPU_IP == 0x1265) { - TRACEOUT(("%.4x:%.4x addr=%.4x ret=%.4x", - CPU_CS, CPU_IP, CPU_DX, - MEML_READ16(CPU_SS, CPU_SP))); - } - } -#endif -#if 0 - if (CPU_CS == 0x0080) { - if (CPU_IP == 0x052A) { - UINT i; - UINT addr; - char fname[9]; - addr = MEML_READ16(CPU_SS, CPU_BP + 4); - for (i=0; i<8; i++) { - fname[i] = MEML_READ8(CPU_DS, addr + i); - } - fname[8] = 0; - TRACEOUT(("%.4x:%.4x play... addr:%.4x %s", - CPU_CS, CPU_IP, addr, fname)); - } - } -#endif -#if 0 - if (CPU_CS == 0x800) { - if (CPU_IP == 0x017A) { - TRACEOUT(("%.4x:%.4x solve... DS=%.4x SIZE=%.4x KEY=%.4x", - CPU_CS, CPU_IP, - MEML_READ16(CPU_SS, CPU_BP - 0x06), - CPU_DX, - MEML_READ16(CPU_SS, CPU_BP - 0x08))); - } - } -#endif -#if 0 - if (CPU_CS == 0x3d52) { - if (CPU_IP == 0x4A57) { - TRACEOUT(("%.4x:%.4x %.4x:%.4x/%.4x/%.4x", - CPU_DX, CPU_BX, CPU_DS, - MEML_READ16(CPU_SS, CPU_BP + 0x06), - MEML_READ16(CPU_SS, CPU_BP + 0x08), - MEML_READ16(CPU_SS, CPU_BP + 0x0a))); - } - if (CPU_IP == 0x4BF8) { - debugsub_memorydump(); - } -#if 1 - if (CPU_IP == 0x4B7A) { - TRACEOUT(("datum = %x", CPU_AX)); - } - if (CPU_IP == 0x4B87) { - TRACEOUT(("leng = %x", CPU_AX)); - } - if (CPU_IP == 0x4BD5) { - TRACEOUT(("%.4x:%.4x <- %.2x[%.4x]", - CPU_ES, CPU_BX, CPU_AL, CPU_DI)); - } -#endif - } -#endif -#if 0 // DC - if (CPU_CS == 0x1000) { - if (CPU_IP == 0x5924) { - TRACEOUT(("%.4x:%.4x -> %.4x:%.4x", CPU_CS, CPU_IP, - MEML_READ16(CPU_DS, 0x6846), - MEML_READ16(CPU_DS, 0x6848))); - } - } -#endif -#if 0 // 羅針盤 - if (CPU_CS == 0x60) { - if (CPU_IP == 0xADF9) { - TRACEOUT(("%.4x:%.4x -> %.4x:%.4x:%.4x", CPU_CS, CPU_IP, CPU_BX, CPU_SI, CPU_AX)); - } - else if (CPU_IP == 0xC7E1) { - TRACEOUT(("%.4x:%.4x -> %.4x:%.4x", CPU_CS, CPU_IP, CPU_ES, CPU_BX)); - } - } -#endif -#if 1 - if (CPU_CS == 0x60) { - if (CPU_IP == 0x8AC2) { - UINT pos = CPU_SI + (CPU_AX * 6); - TRACEOUT(("%.4x:%.4x -> %.4x:%.4x-%.4x:%.4x [%.2x %.2x %.2x %.2x %.2x %.2x]", CPU_CS, CPU_IP, CPU_SI, CPU_AX, CPU_DX, CPU_DI, -MEML_READ8(CPU_DS, pos+0), -MEML_READ8(CPU_DS, pos+1), -MEML_READ8(CPU_DS, pos+2), -MEML_READ8(CPU_DS, pos+3), -MEML_READ8(CPU_DS, pos+4), -MEML_READ8(CPU_DS, pos+5))); - } - } -#endif -#if IPTRACE - treip[trpos & (IPTRACE - 1)] = (CPU_CS << 16) + CPU_IP; - trpos++; -#endif -// TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP)); CPU_STEPEXEC(); } #endif @@ -752,10 +647,10 @@ MEML_READ8(CPU_DS, pos+5))); diskdrv_callback(); calendar_inc(); S98_sync(); - sound_sync(); // happy! + sound_sync(); - if (hardwarereset) { - hardwarereset = FALSE; + if (pcstat.hardwarereset) { + pcstat.hardwarereset = FALSE; pccore_cfgupdate(); pccore_reset(); }