--- np2/pccore.c 2004/02/18 21:58:41 1.70 +++ np2/pccore.c 2004/05/07 11:42:29 1.87 @@ -7,9 +7,11 @@ #include "cpucore.h" #include "pccore.h" #include "iocore.h" +#include "gdc_sub.h" #include "cbuscore.h" #include "pc9861k.h" #include "mpu98ii.h" +#include "amd98.h" #include "bios.h" #include "biosmem.h" #include "vram.h" @@ -19,6 +21,7 @@ #include "maketext.h" #include "maketgrp.h" #include "makegrph.h" +#include "makegrex.h" #include "sound.h" #include "fmboard.h" #include "beep.h" @@ -45,12 +48,11 @@ 0, 0, 0, 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}, 1, 1, 2, 1, 0x000000, 0xffffff, - 22050, 800, 4, 0, + 22050, 500, 4, 0, {0, 0, 0}, 0xd1, 0x7f, 0xd1, 0, 0, 1, 3, {0x0c, 0x0c, 0x08, 0x06, 0x03, 0x0c}, 64, 64, 64, 64, 64, 1, 0x82, @@ -67,9 +69,6 @@ 0, 0, 4 * PCBASECLOCK25}; -static const BYTE msw_default[8] = - {0x48, 0x05, 0x04, 0x00, 0x01, 0x00, 0x00, 0x6e}; - BYTE screenupdate = 3; int screendispflag = 1; int soundrenewal = 0; @@ -120,7 +119,7 @@ static void pccore_set(void) { } else { pccore.baseclock = PCBASECLOCK20; // 2.0MHz - pccore.cpumode = CPUMODE_8MHz; + pccore.cpumode = CPUMODE_8MHZ; } multiple = np2cfg.multiple; if (multiple == 0) { @@ -131,13 +130,7 @@ static void pccore_set(void) { } 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; @@ -192,11 +185,13 @@ 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(); + amd98_deinitialize(); rhythm_deinitialize(); fddmtrsnd_deinitialize(); sound_destroy(); @@ -285,7 +280,7 @@ void pccore_reset(void) { sound_init(); } - ZeroMemory(mem, 0x110000); // ver0.28 + ZeroMemory(mem, 0x110000); ZeroMemory(mem + VRAM1_B, 0x18000); ZeroMemory(mem + VRAM1_E, 0x08000); ZeroMemory(mem + FONT_ADRS, 0x08000); @@ -351,19 +346,10 @@ void pccore_reset(void) { bios_initialize(); - if (np2cfg.ITF_WORK) { - CS_BASE = 0xf0000; - CPU_CS = 0xf000; - CPU_IP = 0xfff0; - } - else { - for (i=0; i<8; i++) { - mem[0xa3fe2 + i*4] = msw_default[i]; - } - CS_BASE = 0xfd800; - CPU_CS = 0xfd80; - CPU_IP = 0x0002; - } + CS_BASE = 0xf0000; + CPU_CS = 0xf000; + CPU_IP = 0xfff0; + CPU_CLEARPREFETCH(); sysmng_cpureset(); @@ -377,7 +363,9 @@ void pccore_reset(void) { static void drawscreen(void) { - BYTE timing; + UINT8 timing; + void (VRAMCALL * grphfn)(int page, int alldraw); + UINT8 bit; tramflag.timing++; timing = ((LOADINTELWORD(gdc.m.para + GDC_CSRFORM + 1)) >> 5) & 0x3e; @@ -395,111 +383,112 @@ static void drawscreen(void) { gdc_updateclock(); } - if (drawframe) { - 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(); - tramflag.renewal |= 1; - if (dispsync_renewalmode()) { - screenupdate |= 2; - } - } - // ver0.28/pr4 - if (gdcs.palchange) { // grphを先に - gdcs.palchange = 0; - pal_change(0); - screenupdate |= 1; + if (!drawframe) { + return; + } + if ((gdcs.textdisp & GDCSCRN_EXT) || (gdcs.grphdisp & GDCSCRN_EXT)) { + if (dispsync_renewalvertical()) { + gdcs.textdisp |= GDCSCRN_ALLDRAW2; + gdcs.grphdisp |= GDCSCRN_ALLDRAW2; } - if (gdcs.grphdisp & GDCSCRN_EXT) { - gdcs.grphdisp &= ~GDCSCRN_EXT; - if (((gdc.clock & 0x80) && (gdc.clock != 0x83)) || - (gdc.clock == 0x03)) { - gdc.clock ^= 0x80; - gdcs.grphdisp |= GDCSCRN_ALLDRAW2; + } + if (gdcs.textdisp & GDCSCRN_EXT) { + gdcs.textdisp &= ~GDCSCRN_EXT; + dispsync_renewalhorizontal(); + tramflag.renewal |= 1; + if (dispsync_renewalmode()) { + screenupdate |= 2; + } + } + if (gdcs.palchange) { + gdcs.palchange = 0; + pal_change(0); + screenupdate |= 1; + } + if (gdcs.grphdisp & GDCSCRN_EXT) { + gdcs.grphdisp &= ~GDCSCRN_EXT; + if (((gdc.clock & 0x80) && (gdc.clock != 0x83)) || + (gdc.clock == 0x03)) { + gdc.clock ^= 0x80; + gdcs.grphdisp |= GDCSCRN_ALLDRAW2; + } + } + if (gdcs.grphdisp & GDCSCRN_ENABLE) { + if (!(gdc.mode1 & 2)) { + grphfn = makegrph; + bit = GDCSCRN_MAKE; + if (gdcs.disp) { + bit <<= 1; + } +#if defined(SUPPORT_PC9821) + if (gdc.analog & 2) { + grphfn = makegrphex; + if (gdc.analog & 4) { + bit = GDCSCRN_MAKE | (GDCSCRN_MAKE << 1); + } + } +#endif + if (gdcs.grphdisp & bit) { + (*grphfn)(gdcs.disp, gdcs.grphdisp & bit & GDCSCRN_ALLDRAW2); + gdcs.grphdisp &= ~bit; + screenupdate |= 1; } } - if (gdcs.grphdisp & GDCSCRN_ENABLE) { - if (!(gdc.mode1 & 2)) { - if (!gdcs.disp) { - if (gdcs.grphdisp & GDCSCRN_MAKE) { - makegrph(0, gdcs.grphdisp & GDCSCRN_ALLDRAW); - gdcs.grphdisp &= ~GDCSCRN_MAKE; - screenupdate |= 1; + else if (gdcs.textdisp & GDCSCRN_ENABLE) { + if (!gdcs.disp) { + if ((gdcs.grphdisp & GDCSCRN_MAKE) || + (gdcs.textdisp & GDCSCRN_MAKE)) { + if (!(gdc.mode1 & 0x4)) { + maketextgrph(0, gdcs.textdisp & GDCSCRN_ALLDRAW, + gdcs.grphdisp & GDCSCRN_ALLDRAW); } - } - else { - if (gdcs.grphdisp & (GDCSCRN_MAKE << 1)) { - makegrph(1, gdcs.grphdisp & (GDCSCRN_ALLDRAW << 1)); - gdcs.grphdisp &= ~(GDCSCRN_MAKE << 1); - screenupdate |= 1; + else { + maketextgrph40(0, gdcs.textdisp & GDCSCRN_ALLDRAW, + gdcs.grphdisp & GDCSCRN_ALLDRAW); } + gdcs.grphdisp &= ~GDCSCRN_MAKE; + screenupdate |= 1; } } - else if (gdcs.textdisp & GDCSCRN_ENABLE) { - if (!gdcs.disp) { - if ((gdcs.grphdisp & GDCSCRN_MAKE) || - (gdcs.textdisp & GDCSCRN_MAKE)) { - if (!(gdc.mode1 & 0x4)) { - maketextgrph(0, gdcs.textdisp & GDCSCRN_ALLDRAW, - gdcs.grphdisp & GDCSCRN_ALLDRAW); - } - else { - maketextgrph40(0, gdcs.textdisp & GDCSCRN_ALLDRAW, - gdcs.grphdisp & GDCSCRN_ALLDRAW); - } - gdcs.grphdisp &= ~GDCSCRN_MAKE; - screenupdate |= 1; + else { + if ((gdcs.grphdisp & (GDCSCRN_MAKE << 1)) || + (gdcs.textdisp & GDCSCRN_MAKE)) { + if (!(gdc.mode1 & 0x4)) { + maketextgrph(1, gdcs.textdisp & GDCSCRN_ALLDRAW, + gdcs.grphdisp & (GDCSCRN_ALLDRAW << 1)); } - } - else { - if ((gdcs.grphdisp & (GDCSCRN_MAKE << 1)) || - (gdcs.textdisp & GDCSCRN_MAKE)) { - if (!(gdc.mode1 & 0x4)) { - maketextgrph(1, gdcs.textdisp & GDCSCRN_ALLDRAW, - gdcs.grphdisp & (GDCSCRN_ALLDRAW << 1)); - } - else { - maketextgrph40(1, gdcs.textdisp & GDCSCRN_ALLDRAW, - gdcs.grphdisp & (GDCSCRN_ALLDRAW << 1)); - } - gdcs.grphdisp &= ~(GDCSCRN_MAKE << 1); - screenupdate |= 1; + else { + maketextgrph40(1, gdcs.textdisp & GDCSCRN_ALLDRAW, + gdcs.grphdisp & (GDCSCRN_ALLDRAW << 1)); } + gdcs.grphdisp &= ~(GDCSCRN_MAKE << 1); + screenupdate |= 1; } } } - - if (gdcs.textdisp & GDCSCRN_ENABLE) { - if (tramflag.renewal) { - gdcs.textdisp |= maketext_curblink(); - } - if ((cgwindow.writable & 0x80) && (tramflag.gaiji)) { - gdcs.textdisp |= GDCSCRN_ALLDRAW; - } - cgwindow.writable &= ~0x80; - if (gdcs.textdisp & GDCSCRN_MAKE) { - if (!(gdc.mode1 & 0x4)) { - maketext(gdcs.textdisp & GDCSCRN_ALLDRAW); - } - else { - maketext40(gdcs.textdisp & GDCSCRN_ALLDRAW); - } - gdcs.textdisp &= ~GDCSCRN_MAKE; - screenupdate |= 1; + } + if (gdcs.textdisp & GDCSCRN_ENABLE) { + if (tramflag.renewal) { + gdcs.textdisp |= maketext_curblink(); + } + if ((cgwindow.writable & 0x80) && (tramflag.gaiji)) { + gdcs.textdisp |= GDCSCRN_ALLDRAW; + } + cgwindow.writable &= ~0x80; + if (gdcs.textdisp & GDCSCRN_MAKE) { + if (!(gdc.mode1 & 0x4)) { + maketext(gdcs.textdisp & GDCSCRN_ALLDRAW); } + else { + maketext40(gdcs.textdisp & GDCSCRN_ALLDRAW); + } + gdcs.textdisp &= ~GDCSCRN_MAKE; + screenupdate |= 1; } - if (screenupdate) { - screenupdate = scrndraw_draw((BYTE)(screenupdate & 2)); - drawcount++; - } + } + if (screenupdate) { + screenupdate = scrndraw_draw((BYTE)(screenupdate & 2)); + drawcount++; } } @@ -510,7 +499,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]; @@ -535,7 +524,7 @@ void screenvsync(NEVENTITEM item) { nevent_set(NEVENT_FLAMES, gdc.vsyncclock, screendisp, NEVENT_RELATIVE); // drawscreenで pccore.vsyncclockが変更される可能性があります - if (np2cfg.DISPSYNC) { // ver0.29 + if (np2cfg.DISPSYNC) { drawscreen(); } (void)item; @@ -547,8 +536,8 @@ void screenvsync(NEVENTITEM item) { // #define IPTRACE (1 << 12) #if defined(TRACE) && IPTRACE -static UINT trpos = 0; -static UINT32 treip[IPTRACE]; +static UINT trpos = 0; +static UINT32 treip[IPTRACE]; void iptrace_out(void) { @@ -585,10 +574,15 @@ UINT cflg; #endif +void pccore_postevent(UINT32 event) { // yet! + + (void)event; +} + void pccore_exec(BOOL draw) { drawframe = draw; - keystat_sync(); +// keystat_sync(); soundmng_sync(); mouseif_sync(); pal_eventclear(); @@ -622,7 +616,7 @@ void pccore_exec(BOOL draw) { #endif } -#if 1 // ndef TRACE +#if 0 // ndef TRACE if (CPU_REMCLOCK > 0) { if (!(CPU_TYPE & CPUTYPE_V30)) { CPU_EXEC(); @@ -652,37 +646,15 @@ void pccore_exec(BOOL draw) { } #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)); + if (CPU_IP == 0x2E4F) { + TRACEOUT(("CS = %.4x - 0x2e4f", CPU_CS)); } #endif -#if 0 // VX LIO - if (CPU_CS == 0xf990) { - if (CPU_IP == 0x07BE) { - TRACEOUT(("%d,%d - %d,%d", CPU_BP, CPU_DX, CPU_SI, CPU_DI)); - } + if (CPU_CS == 0xfd80) { + TRACEOUT(("%.4x:%.4x - %.2x", CPU_CS, CPU_IP, CPU_AH)); } -#endif -// i286x_step(); - i286c_step(); + i286x_step(); +// i286c_step(); } #endif nevent_progress();