--- np2/pccore.c 2004/03/04 15:20:13 1.78 +++ np2/pccore.c 2005/02/07 14:46:07 1.97 @@ -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,30 +56,27 @@ {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}; -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; @@ -82,9 +86,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]) { @@ -163,6 +167,7 @@ static void pccore_set(void) { // -------------------------------------------------------------------------- +#if !defined(DISABLE_SOUND) static void sound_init(void) { UINT rate; @@ -196,9 +201,11 @@ static void sound_term(void) { soundmng_stop(); amd98_deinitialize(); rhythm_deinitialize(); + beep_deinitialize(); fddmtrsnd_deinitialize(); sound_destroy(); } +#endif void pccore_init(void) { @@ -217,7 +224,9 @@ void pccore_init(void) { gdcsub_initialize(); fddfile_initialize(); +#if !defined(DISABLE_SOUND) sound_init(); +#endif rs232c_construct(); mpu98ii_construct(); @@ -236,7 +245,9 @@ void pccore_term(void) { hostdrv_deinitialize(); #endif +#if !defined(DISABLE_SOUND) sound_term(); +#endif fdd_eject(0); fdd_eject(1); @@ -262,8 +273,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; } } @@ -277,12 +288,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); @@ -349,19 +361,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(); @@ -499,7 +502,7 @@ static void drawscreen(void) { } } if (screenupdate) { - screenupdate = scrndraw_draw((BYTE)(screenupdate & 2)); + screenupdate = scrndraw_draw((UINT8)(screenupdate & 2)); drawcount++; } } @@ -545,6 +548,7 @@ void screenvsync(NEVENTITEM item) { // --------------------------------------------------------------------------- +// #define SINGLESTEPONLY // #define IPTRACE (1 << 12) #if defined(TRACE) && IPTRACE @@ -586,10 +590,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(); @@ -605,25 +614,15 @@ 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(); @@ -634,34 +633,116 @@ void pccore_exec(BOOL draw) { } #else while(CPU_REMCLOCK > 0) { -#if IPTRACE - treip[trpos & (IPTRACE - 1)] = (CPU_CS << 16) + CPU_IP; - trpos++; +#if 0 + if (CPU_CS == 0x0000) { + if (CPU_IP == 0x1191) { + char buf[10]; + int i; + for (i=0; i<6; i++) { + buf[i] = MEML_READ8(0x1000, CPU_BX + i); + } + buf[6] = '\0'; + TRACEOUT(("load: %s", buf)); + } + if (CPU_IP == 0x1265) { + TRACEOUT(("%.4x:%.4x addr=%.4x ret=%.4x", + CPU_CS, CPU_IP, CPU_DX, + MEML_READ16(CPU_SS, CPU_SP))); + } + } #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])); + if (CPU_CS == 0x0080) { + if (CPU_IP == 0x052A) { + UINT i; + UINT addr; + char fname[9]; + addr = MEML_READ16(CPU_SS, CPU_BP + 4); + for (i=0; i<8; i++) { + fname[i] = MEML_READ8(CPU_DS, addr + i); + } + fname[8] = 0; + TRACEOUT(("%.4x:%.4x play... addr:%.4x %s", + CPU_CS, CPU_IP, addr, fname)); + } + } +#endif +#if 0 + if (CPU_CS == 0x800) { + if (CPU_IP == 0x017A) { + TRACEOUT(("%.4x:%.4x solve... DS=%.4x SIZE=%.4x KEY=%.4x", + CPU_CS, CPU_IP, + MEML_READ16(CPU_SS, CPU_BP - 0x06), + CPU_DX, + MEML_READ16(CPU_SS, CPU_BP - 0x08))); + } } #endif #if 0 - if (CPU_IP == 0x2E4F) { - TRACEOUT(("CS = %.4x - 0x2e4f", CPU_CS)); + if (CPU_CS == 0x3d52) { + if (CPU_IP == 0x4A57) { + TRACEOUT(("%.4x:%.4x %.4x:%.4x/%.4x/%.4x", + CPU_DX, CPU_BX, CPU_DS, + MEML_READ16(CPU_SS, CPU_BP + 0x06), + MEML_READ16(CPU_SS, CPU_BP + 0x08), + MEML_READ16(CPU_SS, CPU_BP + 0x0a))); + } + if (CPU_IP == 0x4BF8) { + debugsub_memorydump(); + } +#if 1 + if (CPU_IP == 0x4B7A) { + TRACEOUT(("datum = %x", CPU_AX)); + } + if (CPU_IP == 0x4B87) { + TRACEOUT(("leng = %x", CPU_AX)); + } + if (CPU_IP == 0x4BD5) { + TRACEOUT(("%.4x:%.4x <- %.2x[%.4x]", + CPU_ES, CPU_BX, CPU_AL, CPU_DI)); + } +#endif } #endif - if (CPU_CS == 0x8b6) { - TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP)); +#if 0 // DC + if (CPU_CS == 0x1000) { + if (CPU_IP == 0x5924) { + TRACEOUT(("%.4x:%.4x -> %.4x:%.4x", CPU_CS, CPU_IP, + MEML_READ16(CPU_DS, 0x6846), + MEML_READ16(CPU_DS, 0x6848))); + } + } +#endif +#if 0 // Íå¿ËÈ× + if (CPU_CS == 0x60) { + if (CPU_IP == 0xADF9) { + TRACEOUT(("%.4x:%.4x -> %.4x:%.4x:%.4x", CPU_CS, CPU_IP, CPU_BX, CPU_SI, CPU_AX)); + } + else if (CPU_IP == 0xC7E1) { + TRACEOUT(("%.4x:%.4x -> %.4x:%.4x", CPU_CS, CPU_IP, CPU_ES, CPU_BX)); + } + } +#endif +#if 1 + if (CPU_CS == 0x60) { + if (CPU_IP == 0x8AC2) { + UINT pos = CPU_SI + (CPU_AX * 6); + TRACEOUT(("%.4x:%.4x -> %.4x:%.4x-%.4x:%.4x [%.2x %.2x %.2x %.2x %.2x %.2x]", CPU_CS, CPU_IP, CPU_SI, CPU_AX, CPU_DX, CPU_DI, +MEML_READ8(CPU_DS, pos+0), +MEML_READ8(CPU_DS, pos+1), +MEML_READ8(CPU_DS, pos+2), +MEML_READ8(CPU_DS, pos+3), +MEML_READ8(CPU_DS, pos+4), +MEML_READ8(CPU_DS, pos+5))); + } } -// i286x_step(); - i286c_step(); +#endif +#if IPTRACE + treip[trpos & (IPTRACE - 1)] = (CPU_CS << 16) + CPU_IP; + trpos++; +#endif +// TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP)); + CPU_STEPEXEC(); } #endif nevent_progress();