--- np2/pccore.c 2004/02/21 04:48:35 1.75 +++ np2/pccore.c 2004/04/16 22:20:03 1.86 @@ -21,6 +21,7 @@ #include "maketext.h" #include "maketgrp.h" #include "makegrph.h" +#include "makegrex.h" #include "sound.h" #include "fmboard.h" #include "beep.h" @@ -51,7 +52,7 @@ "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, @@ -68,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; @@ -348,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(); @@ -374,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; @@ -392,109 +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; - } - } - 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 (!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++; } } @@ -539,11 +533,11 @@ void screenvsync(NEVENTITEM item) { // --------------------------------------------------------------------------- -#define IPTRACE (1 << 12) +// #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) { @@ -580,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(); @@ -646,11 +645,16 @@ void pccore_exec(BOOL draw) { CPU_DX, CPU_DS, CPU_DI, mem[0xa3fe0])); } #endif -// if ((CPU_CS == 0x2516) && (CPU_IP == 0x97B0)) { -// TRACEOUT(("DS = %.4x", CPU_DS)); -// } -// i286x_step(); - i286c_step(); +#if 0 + if (CPU_IP == 0x2E4F) { + TRACEOUT(("CS = %.4x - 0x2e4f", CPU_CS)); + } +#endif + if (CPU_CS == 0x8b6) { + TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP)); + } + i286x_step(); +// i286c_step(); } #endif nevent_progress();