--- np2/pccore.c 2004/03/01 05:29:58 1.77 +++ np2/pccore.c 2004/05/15 06:45:56 1.89 @@ -52,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, @@ -69,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; @@ -349,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(); @@ -548,8 +536,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 +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(); @@ -623,7 +616,7 @@ void pccore_exec(BOOL draw) { #endif } -#if 1 // ndef TRACE +#if !defined(SINGLESTEPONLY) if (CPU_REMCLOCK > 0) { if (!(CPU_TYPE & CPUTYPE_V30)) { CPU_EXEC(); @@ -638,30 +631,8 @@ 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 -#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(); + i286x_step(); +// i286c_step(); } #endif nevent_progress();