--- np2/pccore.c 2004/02/19 11:32:11 1.73 +++ np2/pccore.c 2004/07/04 08:30:16 1.93 @@ -7,6 +7,7 @@ #include "cpucore.h" #include "pccore.h" #include "iocore.h" +#include "gdc_sub.h" #include "cbuscore.h" #include "pc9861k.h" #include "mpu98ii.h" @@ -20,6 +21,7 @@ #include "maketext.h" #include "maketgrp.h" #include "makegrph.h" +#include "makegrex.h" #include "sound.h" #include "fmboard.h" #include "beep.h" @@ -39,39 +41,35 @@ #include "debugsub.h" - const char np2version[] = NP2VER_CORE; +const OEMCHAR np2version[] = OEMTEXT(NP2VER_CORE); NP2CFG np2cfg = { 0, 1, 0, 32, 0, 0, 0x40, 0, 0, 0, 0, {0x3e, 0x73, 0x7b}, 0, 0, 0, {1, 1, 6, 1, 8, 1}, - {{0, {0, }}, {0, {0, }}}, - "VX", PCBASECLOCK25, 4, + OEMTEXT("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, 0, {0x17, 0x04, 0x1f}, {0x0c, 0x0c, 0x02, 0x10, 0x3f, 0x3f}, 3, 1, 80, 0, 0, - {"", ""}, + {OEMTEXT(""), OEMTEXT("")}, #if defined(SUPPORT_SCSI) - {"", "", "", ""}, + {OEMTEXT(""), OEMTEXT(""), OEMTEXT(""), OEMTEXT("")}, #endif - "", "", ""}; + OEMTEXT(""), OEMTEXT(""), OEMTEXT("")}; PCCORE pccore = { PCBASECLOCK25, 4, 0, PCMODEL_VX, 0, 0, {0x3e, 0x73, 0x7b}, 0, 0, 0, 4 * PCBASECLOCK25}; -static const BYTE msw_default[8] = - {0x48, 0x05, 0x04, 0x00, 0x01, 0x00, 0x00, 0x6e}; - - BYTE screenupdate = 3; + UINT8 screenupdate = 3; int screendispflag = 1; int soundrenewal = 0; BOOL drawframe; @@ -81,9 +79,9 @@ static const BYTE msw_default[8] = // --------------------------------------------------------------------------- -void getbiospath(char *path, const char *fname, int maxlen) { +void getbiospath(OEMCHAR *path, const OEMCHAR *fname, int maxlen) { -const char *p; +const OEMCHAR *p; p = np2cfg.biospath; if (p[0]) { @@ -132,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; @@ -168,6 +160,7 @@ static void pccore_set(void) { // -------------------------------------------------------------------------- +#if !defined(DISABLE_SOUND) static void sound_init(void) { UINT rate; @@ -201,9 +194,11 @@ static void sound_term(void) { soundmng_stop(); amd98_deinitialize(); rhythm_deinitialize(); + beep_deinitialize(); fddmtrsnd_deinitialize(); sound_destroy(); } +#endif void pccore_init(void) { @@ -222,7 +217,9 @@ void pccore_init(void) { gdcsub_initialize(); fddfile_initialize(); +#if !defined(DISABLE_SOUND) sound_init(); +#endif rs232c_construct(); mpu98ii_construct(); @@ -241,7 +238,9 @@ void pccore_term(void) { hostdrv_deinitialize(); #endif +#if !defined(DISABLE_SOUND) sound_term(); +#endif fdd_eject(0); fdd_eject(1); @@ -267,8 +266,8 @@ void pccore_cfgupdate(void) { renewal = FALSE; for (i=0; i<8; i++) { - if (np2cfg.memsw[i] != mem[MEMB_MSW + i*4]) { - np2cfg.memsw[i] = mem[MEMB_MSW + i*4]; + if (np2cfg.memsw[i] != mem[MEMX_MSW + i*4]) { + np2cfg.memsw[i] = mem[MEMX_MSW + i*4]; renewal = TRUE; } } @@ -282,12 +281,13 @@ void pccore_reset(void) { int i; soundmng_stop(); +#if !defined(DISABLE_SOUND) if (soundrenewal) { soundrenewal = 0; sound_term(); sound_init(); } - +#endif ZeroMemory(mem, 0x110000); ZeroMemory(mem + VRAM1_B, 0x18000); ZeroMemory(mem + VRAM1_E, 0x08000); @@ -354,19 +354,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(); @@ -380,7 +371,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; @@ -398,109 +391,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; - } - } - if (gdcs.textdisp & GDCSCRN_EXT) { - gdcs.textdisp &= ~GDCSCRN_EXT; - dispsync_renewalhorizontal(); - tramflag.renewal |= 1; - if (dispsync_renewalmode()) { - screenupdate |= 2; - } + 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.palchange) { - gdcs.palchange = 0; - pal_change(0); - screenupdate |= 1; + } + if (gdcs.textdisp & GDCSCRN_EXT) { + gdcs.textdisp &= ~GDCSCRN_EXT; + dispsync_renewalhorizontal(); + tramflag.renewal |= 1; + if (dispsync_renewalmode()) { + screenupdate |= 2; } - 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.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; + } + 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); } - 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; + 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++; } } @@ -548,8 +544,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) { @@ -586,10 +582,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(); @@ -610,20 +611,10 @@ void pccore_exec(BOOL draw) { pic_irq(); if (CPU_RESETREQ) { CPU_RESETREQ = 0; -#if 1 CPU_SHUT(); -#else - CPU_CS = 0xf000; - CS_BASE = 0xf0000; - CPU_IP = 0xfff0; -#if defined(CPUCORE_IA32) - CPU_DX = 0x0300; -#endif - CPU_CLEARPREFETCH(); -#endif } -#if 1 // ndef TRACE +#if !defined(SINGLESTEPONLY) if (CPU_REMCLOCK > 0) { if (!(CPU_TYPE & CPUTYPE_V30)) { CPU_EXEC(); @@ -638,20 +629,6 @@ void pccore_exec(BOOL draw) { 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(); }