--- np2/pccore.c 2004/03/21 11:47:19 1.80 +++ np2/pccore.c 2005/05/20 13:59:45 1.106 @@ -41,7 +41,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, @@ -49,7 +56,7 @@ {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, 500, 4, 0, @@ -58,18 +65,18 @@ 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}; - BYTE screenupdate = 3; + UINT8 screenupdate = 3; int screendispflag = 1; int soundrenewal = 0; BOOL drawframe; @@ -79,9 +86,9 @@ // --------------------------------------------------------------------------- -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]) { @@ -134,12 +141,23 @@ static void pccore_set(void) { // HDDの接続 (I/Oの使用状態が変わるので.. if (np2cfg.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); + 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); @@ -160,6 +178,7 @@ static void pccore_set(void) { // -------------------------------------------------------------------------- +#if !defined(DISABLE_SOUND) static void sound_init(void) { UINT rate; @@ -193,9 +212,11 @@ static void sound_term(void) { soundmng_stop(); amd98_deinitialize(); rhythm_deinitialize(); + beep_deinitialize(); fddmtrsnd_deinitialize(); sound_destroy(); } +#endif void pccore_init(void) { @@ -214,7 +235,9 @@ void pccore_init(void) { gdcsub_initialize(); fddfile_initialize(); +#if !defined(DISABLE_SOUND) sound_init(); +#endif rs232c_construct(); mpu98ii_construct(); @@ -233,7 +256,9 @@ void pccore_term(void) { hostdrv_deinitialize(); #endif +#if !defined(DISABLE_SOUND) sound_term(); +#endif fdd_eject(0); fdd_eject(1); @@ -246,7 +271,7 @@ void pccore_term(void) { mpu98ii_destruct(); rs232c_destruct(); - sxsi_trash(); + sxsi_alltrash(); CPU_DEINITIALIZE(); } @@ -259,8 +284,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; } } @@ -274,12 +299,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); @@ -305,7 +331,8 @@ void pccore_reset(void) { } // HDDセット - sxsi_open(); + diskdrv_hddbind(); + // SASI/IDEどっち？ #if defined(SUPPORT_SASI) if (sxsi_issasi()) { pccore.hddif &= ~PCHDD_IDE; @@ -332,7 +359,7 @@ void pccore_reset(void) { cbuscore_reset(); fmboard_reset(pccore.sound); - i286_memorymap((pccore.model & PCMODEL_EPSON)?1:0); + MEMM_ARCH((pccore.model & PCMODEL_EPSON)?1:0); iocore_build(); iocore_bind(); cbuscore_bind(); @@ -359,6 +386,10 @@ 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) { @@ -487,7 +518,7 @@ static void drawscreen(void) { } } if (screenupdate) { - screenupdate = scrndraw_draw((BYTE)(screenupdate & 2)); + screenupdate = scrndraw_draw((UINT8)(screenupdate & 2)); drawcount++; } } @@ -533,51 +564,24 @@ 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(); +// keystat_sync(); soundmng_sync(); mouseif_sync(); pal_eventclear(); @@ -593,25 +597,14 @@ void pccore_exec(BOOL draw) { while(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(); @@ -622,34 +615,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 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(); + CPU_STEPEXEC(); } #endif nevent_progress();