--- np2/pccore.c 2004/02/21 04:48:35 1.75 +++ np2/pccore.c 2011/02/23 10:11:44 1.111 @@ -1,3 +1,11 @@ +/** + * @file pccore.c + * @brief emluration core + * + * @author $Author: yui $ + * @date $Date: 2011/02/23 10:11:44 $ + */ + #include "compiler.h" #include "strres.h" #include "dosio.h" @@ -21,6 +29,7 @@ #include "maketext.h" #include "maketgrp.h" #include "makegrph.h" +#include "makegrex.h" #include "sound.h" #include "fmboard.h" #include "beep.h" @@ -40,7 +49,14 @@ #include "debugsub.h" - const char np2version[] = NP2VER_CORE; +const OEMCHAR np2version[] = OEMTEXT(NP2VER_CORE); + +#if defined(_WIN32_WCE) +#define PCBASEMULTIPLE 2 +#else +#define PCBASEMULTIPLE 4 +#endif + NP2CFG np2cfg = { 0, 1, 0, 32, 0, 0, 0x40, @@ -48,42 +64,40 @@ {0x3e, 0x73, 0x7b}, 0, 0, 0, {1, 1, 6, 1, 8, 1}, - "VX", PCBASECLOCK25, 4, + OEMTEXT("VX"), PCBASECLOCK25, PCBASEMULTIPLE, {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, + PCCORE pccore = { PCBASECLOCK25, PCBASEMULTIPLE, 0, PCMODEL_VX, 0, 0, {0x3e, 0x73, 0x7b}, 0, 0, 0, - 4 * PCBASECLOCK25}; + PCBASECLOCK25 * PCBASEMULTIPLE}; + PCSTAT pcstat = {3, TRUE, FALSE, FALSE}; -static const BYTE msw_default[8] = - {0x48, 0x05, 0x04, 0x00, 0x01, 0x00, 0x00, 0x6e}; - - BYTE screenupdate = 3; - int screendispflag = 1; - int soundrenewal = 0; - BOOL drawframe; +// UINT8 screenupdate = 3; +// int screendispflag = 1; + UINT8 soundrenewal = 0; +// BOOL drawframe; UINT drawcount = 0; - BOOL hardwarereset = FALSE; +// BOOL hardwarereset = FALSE; // --------------------------------------------------------------------------- -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]) { @@ -99,62 +113,82 @@ const char *p; // ---- -static void pccore_set(void) { - +static void pccore_set(const NP2CFG *pConfig) +{ UINT8 model; UINT32 multiple; UINT8 extsize; ZeroMemory(&pccore, sizeof(pccore)); model = PCMODEL_VX; - if (!milstr_cmp(np2cfg.model, str_VM)) { + if (!milstr_cmp(pConfig->model, str_VM)) { model = PCMODEL_VM; } - else if (!milstr_cmp(np2cfg.model, str_EPSON)) { + else if (!milstr_cmp(pConfig->model, str_EPSON)) { model = PCMODEL_EPSON | PCMODEL_VM; } pccore.model = model; - if (np2cfg.baseclock >= ((PCBASECLOCK25 + PCBASECLOCK20) / 2)) { + if (np2cfg.baseclock >= ((PCBASECLOCK25 + PCBASECLOCK20) / 2)) + { pccore.baseclock = PCBASECLOCK25; // 2.5MHz pccore.cpumode = 0; } - else { + else + { pccore.baseclock = PCBASECLOCK20; // 2.0MHz pccore.cpumode = CPUMODE_8MHZ; } - multiple = np2cfg.multiple; - if (multiple == 0) { + multiple = pConfig->multiple; + if (multiple == 0) + { multiple = 1; } - else if (multiple > 32) { + else if (multiple > 32) + { multiple = 32; } pccore.multiple = multiple; pccore.realclock = pccore.baseclock * multiple; // HDDの接続 (I/Oの使用状態が変わるので.. - if (np2cfg.dipsw[1] & 0x20) { + if (pConfig->dipsw[1] & 0x20) + { pccore.hddif |= PCHDD_IDE; +#if defined(SUPPORT_IDEIO) + sxsi_setdevtype(0x02, SXSIDEV_CDROM); +#endif + } + else + { + sxsi_setdevtype(0x02, SXSIDEV_NC); } // 拡張メモリ extsize = 0; - if (!(np2cfg.dipsw[2] & 0x80)) { - extsize = min(np2cfg.EXTMEM, 13); + if (!(pConfig->dipsw[2] & 0x80)) + { + extsize = np2cfg.EXTMEM; +#if defined(CPUCORE_IA32) + extsize = min(extsize, 63); +#else + extsize = min(extsize, 13); +#endif } pccore.extmem = extsize; - CopyMemory(pccore.dipsw, np2cfg.dipsw, 3); + CopyMemory(pccore.dipsw, pConfig->dipsw, 3); // サウンドボードの接続 - pccore.sound = np2cfg.SOUND_SW; + pccore.sound = pConfig->SOUND_SW; // その他CBUSの接続 pccore.device = 0; - if (np2cfg.pc9861enable) { + if (pConfig->pc9861enable) + { pccore.device |= PCCBUS_PC9861K; } - if (np2cfg.mpuenable) { + if (pConfig->mpuenable) + { pccore.device |= PCCBUS_MPU98; } } @@ -162,12 +196,14 @@ static void pccore_set(void) { // -------------------------------------------------------------------------- -static void sound_init(void) { - +#if !defined(DISABLE_SOUND) +static void sound_init(void) +{ UINT rate; rate = np2cfg.samplingrate; - if ((rate != 11025) && (rate != 22050) && (rate != 44100)) { + if ((rate != 11025) && (rate != 22050) && (rate != 44100)) + { rate = 0; } sound_create(rate, np2cfg.delayms); @@ -195,9 +231,11 @@ static void sound_term(void) { soundmng_stop(); amd98_deinitialize(); rhythm_deinitialize(); + beep_deinitialize(); fddmtrsnd_deinitialize(); sound_destroy(); } +#endif void pccore_init(void) { @@ -216,7 +254,9 @@ void pccore_init(void) { gdcsub_initialize(); fddfile_initialize(); +#if !defined(DISABLE_SOUND) sound_init(); +#endif rs232c_construct(); mpu98ii_construct(); @@ -235,7 +275,9 @@ void pccore_term(void) { hostdrv_deinitialize(); #endif +#if !defined(DISABLE_SOUND) sound_term(); +#endif fdd_eject(0); fdd_eject(1); @@ -248,7 +290,7 @@ void pccore_term(void) { mpu98ii_destruct(); rs232c_destruct(); - sxsi_trash(); + sxsi_alltrash(); CPU_DEINITIALIZE(); } @@ -260,9 +302,19 @@ void pccore_cfgupdate(void) { int i; 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]; + for (i=0; i<8; i++) + { + if (np2cfg.memsw[i] != mem[MEMX_MSW + i*4]) + { + np2cfg.memsw[i] = mem[MEMX_MSW + i*4]; + renewal = TRUE; + } + } + for (i=0; i<3; i++) + { + if (np2cfg.dipsw[i] != pccore.dipsw[i]) + { + np2cfg.dipsw[i] = pccore.dipsw[i]; renewal = TRUE; } } @@ -271,43 +323,54 @@ void pccore_cfgupdate(void) { } } +/** + * Reset the virtual machine + */ void pccore_reset(void) { int i; + BOOL epson; 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); ZeroMemory(mem + FONT_ADRS, 0x08000); //メモリスイッチ - for (i=0; i<8; i++) { + for (i=0; i<8; i++) + { mem[0xa3fe2 + i*4] = np2cfg.memsw[i]; } - pccore_set(); + pccore_set(&np2cfg); nevent_allreset(); CPU_RESET(); CPU_SETEXTSIZE((UINT32)pccore.extmem); CPU_TYPE = 0; - if (np2cfg.dipsw[2] & 0x80) { + if (pccore.dipsw[2] & 0x80) { CPU_TYPE = CPUTYPE_V30; } - if (pccore.model & PCMODEL_EPSON) { // RAM ctrl + + epson = (pccore.model & PCMODEL_EPSON) ? TRUE : FALSE; + if (epson) { + /* enable RAM (D0000-DFFFF) */ CPU_RAM_D000 = 0xffff; } + font_setchargraph(epson); // HDDセット - sxsi_open(); + diskdrv_hddbind(); + // SASI/IDEどっち？ #if defined(SUPPORT_SASI) if (sxsi_issasi()) { pccore.hddif &= ~PCHDD_IDE; @@ -330,11 +393,11 @@ void pccore_reset(void) { fddfile_reset2dmode(); bios0x18_16(0x20, 0xe1); - iocore_reset(); // サウンドでpicを呼ぶので… - cbuscore_reset(); - fmboard_reset(pccore.sound); + iocore_reset(&np2cfg); // サウンドでpicを呼ぶので… + cbuscore_reset(&np2cfg); + fmboard_reset(&np2cfg, pccore.sound); - i286_memorymap((pccore.model & PCMODEL_EPSON)?1:0); + MEMM_ARCH((epson) ? 1 : 0); iocore_build(); iocore_bind(); cbuscore_bind(); @@ -348,19 +411,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(); @@ -370,11 +424,17 @@ void pccore_reset(void) { timing_reset(); soundmng_play(); + +#if 0 && defined(SUPPORT_IDEIO) // Test! + sxsi_devopen(0x02, OEMTEXT("e:\\pn\\pn.iso")); +#endif } 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 +452,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 (!pcstat.drawframe) { + return; + } + 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.textdisp & GDCSCRN_EXT) { + gdcs.textdisp &= ~GDCSCRN_EXT; + dispsync_renewalhorizontal(); + tramflag.renewal |= 1; + if (dispsync_renewalmode()) { + pcstat.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.palchange) { + gdcs.palchange = 0; + pal_change(0); + pcstat.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; + pcstat.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; + pcstat.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); + pcstat.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; + pcstat.screenupdate |= 1; } - if (screenupdate) { - screenupdate = scrndraw_draw((BYTE)(screenupdate & 2)); - drawcount++; - } + } + if (pcstat.screenupdate) { + pcstat.screenupdate = scrndraw_draw((UINT8)(pcstat.screenupdate & 2)); + drawcount++; } } @@ -504,7 +567,7 @@ void screendisp(NEVENTITEM item) { gdc_work(GDCWORK_SLAVE); gdc.vsync = 0; - screendispflag = 0; + pcstat.screendispflag = 0; if (!np2cfg.DISPSYNC) { drawscreen(); } @@ -539,57 +602,30 @@ void screenvsync(NEVENTITEM item) { // --------------------------------------------------------------------------- -#define IPTRACE (1 << 12) - -#if defined(TRACE) && IPTRACE -static UINT trpos = 0; -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 - +// #define SINGLESTEPONLY #if defined(TRACE) static int resetcnt = 0; static int execcnt = 0; int piccnt = 0; -int tr = 0; -UINT cflg; #endif +void pccore_postevent(UINT32 event) { // yet! + + (void)event; +} + void pccore_exec(BOOL draw) { - drawframe = draw; - keystat_sync(); + pcstat.drawframe = (UINT8)draw; +// keystat_sync(); soundmng_sync(); mouseif_sync(); pal_eventclear(); gdc.vsync = 0; - screendispflag = 1; + pcstat.screendispflag = 1; MEMWAIT_TRAM = np2cfg.wait[0]; MEMWAIT_VRAM = np2cfg.wait[2]; MEMWAIT_GRCG = np2cfg.wait[4]; @@ -597,27 +633,16 @@ void pccore_exec(BOOL draw) { // nevent_get1stevent(); - while(screendispflag) { + while(pcstat.screendispflag) { #if defined(TRACE) - resetcnt++; + resetcnt++; #endif 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(); @@ -628,29 +653,7 @@ void pccore_exec(BOOL draw) { } #else while(CPU_REMCLOCK > 0) { -#if IPTRACE - 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 -// if ((CPU_CS == 0x2516) && (CPU_IP == 0x97B0)) { -// TRACEOUT(("DS = %.4x", CPU_DS)); -// } -// i286x_step(); - i286c_step(); + CPU_STEPEXEC(); } #endif nevent_progress(); @@ -660,10 +663,10 @@ void pccore_exec(BOOL draw) { diskdrv_callback(); calendar_inc(); S98_sync(); - sound_sync(); // happy! + sound_sync(); - if (hardwarereset) { - hardwarereset = FALSE; + if (pcstat.hardwarereset) { + pcstat.hardwarereset = FALSE; pccore_cfgupdate(); pccore_reset(); }