--- np2/pccore.c 2004/01/08 16:29:56 1.41 +++ np2/pccore.c 2004/01/22 08:40:30 1.46 @@ -33,7 +33,7 @@ #include "timing.h" #include "debugsub.h" #if defined(SUPPORT_HOSTDRV) -// #include "hostdrv.h" +#include "hostdrv.h" #endif @@ -53,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}; @@ -129,50 +128,72 @@ 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(const char *modelstr, UINT base, UINT multiple) { +static void pccore_set(void) { UINT8 model; + UINT32 multiple; + 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; + 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; + + // 拡張メモリ + pccore.extmem = 0; + + // HDDの接続 (I/Oの使用状態が変わるので.. +// if (np2cfg.dipsw[1] & 0x20) { + pccore.hddif |= PCHDD_IDE; +// } + pccore.hddif |= PCHDD_SCSI; + + // サウンドボードの接続 + pccore.sound = np2cfg.SOUND_SW; + + // その他CBUSの接続 + pccore.device = 0; + if (np2cfg.pc9861enable) { + pccore.device |= PCCBUS_PC9861K; + } + if (np2cfg.mpuenable) { + pccore.device |= PCCBUS_MPU98; + } } @@ -241,10 +262,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); @@ -285,8 +314,6 @@ void pccore_reset(void) { int i; -// reset_hostdrv(); - ZeroMemory(mem, 0x10fff0); // ver0.28 ZeroMemory(mem + VRAM1_B, 0x18000); ZeroMemory(mem + VRAM1_E, 0x08000); @@ -313,7 +340,8 @@ void pccore_reset(void) { sound_init(); } - setpcclock(np2cfg.model, np2cfg.baseclock, np2cfg.multiple); + pccore_set(); + sound_changeclock(); beep_changeclock(); nevent_init(); @@ -323,7 +351,7 @@ void pccore_reset(void) { wavemix_bind(); #endif - if (pc.model & PCMODEL_EPSON) { // RAM ctrl + if (pccore.model & PCMODEL_EPSON) { // RAM ctrl CPU_RAM_D000 = 0xffff; } @@ -331,7 +359,7 @@ void pccore_reset(void) { cbuscore_reset(); fmboard_reset(np2cfg.SOUND_SW); - i286_memorymap((pc.model & PCMODEL_EPSON)?1:0); + i286_memorymap((pccore.model & PCMODEL_EPSON)?1:0); iocore_build(); iocore_bind(); cbuscore_bind(); @@ -364,6 +392,10 @@ void pccore_reset(void) { sysmng_cpureset(); soundmng_play(); + +#if defined(SUPPORT_HOSTDRV) + hostdrv_reset(); +#endif } static void drawscreen(void) { @@ -524,9 +556,9 @@ void screenvsync(NEVENTITEM item) { 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(); } @@ -536,12 +568,47 @@ void screenvsync(NEVENTITEM item) { // --------------------------------------------------------------------------- +// #define IPTRACE (1 << 16) + +#if IPTRACE +static UINT trpos; +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; #endif + UINT cflg; + void pccore_exec(BOOL draw) { drawframe = draw; @@ -555,7 +622,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, pccore.dispclock, screenvsync, NEVENT_RELATIVE); // nevent_get1stevent(); @@ -590,8 +657,33 @@ void pccore_exec(BOOL draw) { } #else while(CPU_REMCLOCK > 0) { - TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP)); - i286x_step(); +#if IPTRACE + treip[trpos & (IPTRACE - 1)] = (CPU_CS << 16) + CPU_IP; + trpos++; +#endif + if (tr) { + TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP)); + } +#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 +// i286x_step(); + i286c_step(); } #endif nevent_progress();