np2/pccore.c - diff

Return to pccore.c CVS log

Up to [RetroPC.NET] / np2

Diff for /np2/pccore.c between versions 1.91 and 1.97

version 1.91, 2004/06/20 00:56:26	version 1.97, 2005/02/07 14:46:07
Line 43	Line 43

const OEMCHAR np2version[] = OEMTEXT(NP2VER_CORE);	const OEMCHAR np2version[] = OEMTEXT(NP2VER_CORE);

	#if defined(_WIN32_WCE)
	#define PCBASEMULTIPLE 2
	#else
	#define PCBASEMULTIPLE 4
	#endif


NP2CFG np2cfg = {	NP2CFG np2cfg = {
0, 1, 0, 32, 0, 0, 0x40,	0, 1, 0, 32, 0, 0, 0x40,
0, 0, 0, 0,	0, 0, 0, 0,
{0x3e, 0x73, 0x7b}, 0,	{0x3e, 0x73, 0x7b}, 0,
0, 0, {1, 1, 6, 1, 8, 1},	0, 0, {1, 1, 6, 1, 8, 1},

OEMTEXT("VX"), PCBASECLOCK25, 4,	OEMTEXT("VX"), PCBASECLOCK25, PCBASEMULTIPLE,
{0x48, 0x05, 0x04, 0x00, 0x01, 0x00, 0x00, 0x6e},	{0x48, 0x05, 0x04, 0x00, 0x01, 0x00, 0x00, 0x6e},
1, 1, 2, 1, 0x000000, 0xffffff,	1, 1, 2, 1, 0x000000, 0xffffff,
22050, 500, 4, 0,	22050, 500, 4, 0,
Line 64 const OEMCHAR np2version[] = OEMTEXT(NP2	Line 71 const OEMCHAR np2version[] = OEMTEXT(NP2
#endif	#endif
OEMTEXT(""), OEMTEXT(""), OEMTEXT("")};	OEMTEXT(""), OEMTEXT(""), OEMTEXT("")};

PCCORE pccore = { PCBASECLOCK25, 4,	PCCORE pccore = { PCBASECLOCK25, PCBASEMULTIPLE,
0, PCMODEL_VX, 0, 0, {0x3e, 0x73, 0x7b}, 0,	0, PCMODEL_VX, 0, 0, {0x3e, 0x73, 0x7b}, 0,
0, 0,	0, 0,
4 * PCBASECLOCK25};	PCBASECLOCK25 * PCBASEMULTIPLE};

UINT8 screenupdate = 3;	UINT8 screenupdate = 3;
int screendispflag = 1;	int screendispflag = 1;
Line 160 static void pccore_set(void) {	Line 167 static void pccore_set(void) {

// --------------------------------------------------------------------------	// --------------------------------------------------------------------------

	#if !defined(DISABLE_SOUND)
static void sound_init(void) {	static void sound_init(void) {

UINT rate;	UINT rate;
Line 193 static void sound_term(void) {	Line 201 static void sound_term(void) {
soundmng_stop();	soundmng_stop();
amd98_deinitialize();	amd98_deinitialize();
rhythm_deinitialize();	rhythm_deinitialize();
	beep_deinitialize();
fddmtrsnd_deinitialize();	fddmtrsnd_deinitialize();
sound_destroy();	sound_destroy();
}	}
	#endif

void pccore_init(void) {	void pccore_init(void) {

Line 214 void pccore_init(void) {	Line 224 void pccore_init(void) {
gdcsub_initialize();	gdcsub_initialize();
fddfile_initialize();	fddfile_initialize();

	#if !defined(DISABLE_SOUND)
sound_init();	sound_init();
	#endif

rs232c_construct();	rs232c_construct();
mpu98ii_construct();	mpu98ii_construct();
Line 233 void pccore_term(void) {	Line 245 void pccore_term(void) {
hostdrv_deinitialize();	hostdrv_deinitialize();
#endif	#endif

	#if !defined(DISABLE_SOUND)
sound_term();	sound_term();
	#endif

fdd_eject(0);	fdd_eject(0);
fdd_eject(1);	fdd_eject(1);
Line 274 void pccore_reset(void) {	Line 288 void pccore_reset(void) {
int i;	int i;

soundmng_stop();	soundmng_stop();
	#if !defined(DISABLE_SOUND)
if (soundrenewal) {	if (soundrenewal) {
soundrenewal = 0;	soundrenewal = 0;
sound_term();	sound_term();
sound_init();	sound_init();
}	}
	#endif
ZeroMemory(mem, 0x110000);	ZeroMemory(mem, 0x110000);
ZeroMemory(mem + VRAM1_B, 0x18000);	ZeroMemory(mem + VRAM1_B, 0x18000);
ZeroMemory(mem + VRAM1_E, 0x08000);	ZeroMemory(mem + VRAM1_E, 0x08000);
Line 487 static void drawscreen(void) {	Line 502 static void drawscreen(void) {
}	}
}	}
if (screenupdate) {	if (screenupdate) {
screenupdate = scrndraw_draw((BYTE)(screenupdate & 2));	screenupdate = scrndraw_draw((UINT8)(screenupdate & 2));
drawcount++;	drawcount++;
}	}
}	}
Line 533 void screenvsync(NEVENTITEM item) {	Line 548 void screenvsync(NEVENTITEM item) {

// ---------------------------------------------------------------------------	// ---------------------------------------------------------------------------

	// #define SINGLESTEPONLY
// #define IPTRACE (1 << 12)	// #define IPTRACE (1 << 12)

#if defined(TRACE) && IPTRACE	#if defined(TRACE) && IPTRACE
Line 598 void pccore_exec(BOOL draw) {	Line 614 void pccore_exec(BOOL draw) {

while(screendispflag) {	while(screendispflag) {
#if defined(TRACE)	#if defined(TRACE)
resetcnt++;	resetcnt++;
#endif	#endif
pic_irq();	pic_irq();
if (CPU_RESETREQ) {	if (CPU_RESETREQ) {
Line 617 void pccore_exec(BOOL draw) {	Line 633 void pccore_exec(BOOL draw) {
}	}
#else	#else
while(CPU_REMCLOCK > 0) {	while(CPU_REMCLOCK > 0) {
	#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 == 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_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 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)));
	}
	}
	#endif
#if IPTRACE	#if IPTRACE
treip[trpos & (IPTRACE - 1)] = (CPU_CS << 16) + CPU_IP;	treip[trpos & (IPTRACE - 1)] = (CPU_CS << 16) + CPU_IP;
trpos++;	trpos++;
#endif	#endif
i286x_step();	// TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP));
// i286c_step();	CPU_STEPEXEC();
}	}
#endif	#endif
nevent_progress();	nevent_progress();

RetroPC.NET-CVS <cvs@retropc.net>

Removed from v.1.91
changed lines
	Added in v.1.97