--- np2/pccore.c 2004/01/23 06:03:40 1.47 +++ np2/pccore.c 2004/01/30 01:56:01 1.60 @@ -5,7 +5,6 @@ #include "sysmng.h" #include "timemng.h" #include "cpucore.h" -#include "np2ver.h" #include "pccore.h" #include "iocore.h" #include "cbuscore.h" @@ -29,12 +28,13 @@ #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 "debugsub.h" const char np2version[] = NP2VER_CORE; @@ -76,6 +76,7 @@ static const BYTE msw_default[8] = int soundrenewal = 0; BOOL drawframe; UINT drawcount = 0; + BOOL hardwarereset = FALSE; // --------------------------------------------------------------------------- @@ -139,6 +140,7 @@ static void pccore_set(void) { UINT8 model; UINT32 multiple; + UINT8 extsize; ZeroMemory(&pccore, sizeof(pccore)); model = PCMODEL_VX; @@ -174,14 +176,17 @@ static void pccore_set(void) { pccore.keyboardclock = pccore.realclock / 1920; pccore.midiclock = pccore.realclock / 3125; - // 拡張メモリ - pccore.extmem = 0; - // HDDの接続 (I/Oの使用状態が変わるので.. -// if (np2cfg.dipsw[1] & 0x20) { + if (np2cfg.dipsw[1] & 0x20) { pccore.hddif |= PCHDD_IDE; -// } - pccore.hddif |= PCHDD_SCSI; + } + + // 拡張メモリ + extsize = 0; + if (!(np2cfg.dipsw[2] & 0x80)) { + extsize = min(np2cfg.EXTMEM, 13); + } + pccore.extmem = extsize; // サウンドボードの接続 pccore.sound = np2cfg.SOUND_SW; @@ -257,9 +262,9 @@ void pccore_init(void) { sound_init(); - mpu98ii_construct(); rs232c_construct(); - pc9861k_construct(); + mpu98ii_construct(); + pc9861k_initialize(); iocore_create(); @@ -281,15 +286,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(); } @@ -314,50 +319,66 @@ void pccore_reset(void) { int i; - ZeroMemory(mem, 0x10fff0); // ver0.28 + soundmng_stop(); + if (soundrenewal) { + soundrenewal = 0; + sound_term(); + sound_init(); + } + + ZeroMemory(mem, 0x110000); // ver0.28 ZeroMemory(mem + VRAM1_B, 0x18000); ZeroMemory(mem + VRAM1_E, 0x08000); ZeroMemory(mem + FONT_ADRS, 0x08000); - CPU_RESET(); - 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]; } - 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; } - pccore_set(); + // 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 - if (pccore.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((pccore.model & PCMODEL_EPSON)?1:0); iocore_build(); @@ -365,7 +386,6 @@ void pccore_reset(void) { cbuscore_bind(); fmboard_bind(); - timing_reset(); fddmtr_init(); calendar_init(); vram_init(); @@ -373,7 +393,6 @@ void pccore_reset(void) { pal_change(1); bios_init(); - sxsi_open(); if (np2cfg.ITF_WORK) { CS_BASE = 0xf0000; @@ -391,11 +410,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) { @@ -568,10 +588,10 @@ void screenvsync(NEVENTITEM item) { // --------------------------------------------------------------------------- -// #define IPTRACE (1 << 16) +// #define IPTRACE (1 << 12) -#if IPTRACE -static UINT trpos; +#if defined(TRACE) && IPTRACE +static UINT trpos = 0; static UINT32 treip[IPTRACE]; void iptrace_out(void) { @@ -605,10 +625,9 @@ static int resetcnt = 0; static int execcnt = 0; int piccnt = 0; int tr = 0; -UINT gr = 0; +UINT cflg; #endif - UINT cflg; void pccore_exec(BOOL draw) { @@ -662,11 +681,20 @@ void pccore_exec(BOOL draw) { treip[trpos & (IPTRACE - 1)] = (CPU_CS << 16) + CPU_IP; trpos++; #endif - if (tr) { - if ((CPU_CS == 0xf760) || (CPU_CS == 0xf990)) { - TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP)); - } +#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)); @@ -685,13 +713,11 @@ void pccore_exec(BOOL draw) { } } #endif - { - UINT r = (gdcs.grphdisp & GDCSCRN_ENABLE); - if (gr != r) { - TRACEOUT(("gdcs.grphdisp = %.2x [%.4x:%.4x]", r, CPU_CS, CPU_IP)); - gr = r; - } +#if 0 + if ((CPU_CS == 0x0620) || (CPU_CS == 0x08a0)) { + TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP)); } +#endif i286x_step(); // i286c_step(); } @@ -705,6 +731,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) {