np2/i286c/i286c.c - diff

Return to i286c.c CVS log

Up to [RetroPC.NET] / np2 / i286c

Diff for /np2/i286c/i286c.c between versions 1.11 and 1.22

version 1.11, 2003/12/01 10:45:46	version 1.22, 2004/01/08 16:29:56
Line 1	Line 1
#include "compiler.h"	#include "compiler.h"
#include "i286.h"	#include "cpucore.h"
#include "i286c.h"	#include "i286c.h"
#include "v30patch.h"	#include "v30patch.h"
#include "memory.h"
#include "pccore.h"	#include "pccore.h"
#include "iocore.h"	#include "iocore.h"
#include "dmap.h"	#include "dmap.h"
Line 11	Line 10

I286CORE i286core;	I286CORE i286core;

const BYTE iflags[256] = { // Z_FLAG, S_FLAG, P_FLAG	const UINT8 iflags[512] = { // Z_FLAG, S_FLAG, P_FLAG
0x44, 0x00, 0x00, 0x04, 0x00, 0x04, 0x04, 0x00,	0x44, 0x00, 0x00, 0x04, 0x00, 0x04, 0x04, 0x00,
0x00, 0x04, 0x04, 0x00, 0x04, 0x00, 0x00, 0x04,	0x00, 0x04, 0x04, 0x00, 0x04, 0x00, 0x00, 0x04,
0x00, 0x04, 0x04, 0x00, 0x04, 0x00, 0x00, 0x04,	0x00, 0x04, 0x04, 0x00, 0x04, 0x00, 0x00, 0x04,
Line 43 const BYTE iflags[256] = { // Z_FLAG	Line 42 const BYTE iflags[256] = { // Z_FLAG
0x80, 0x84, 0x84, 0x80, 0x84, 0x80, 0x80, 0x84,	0x80, 0x84, 0x84, 0x80, 0x84, 0x80, 0x80, 0x84,
0x84, 0x80, 0x80, 0x84, 0x80, 0x84, 0x84, 0x80,	0x84, 0x80, 0x80, 0x84, 0x80, 0x84, 0x84, 0x80,
0x84, 0x80, 0x80, 0x84, 0x80, 0x84, 0x84, 0x80,	0x84, 0x80, 0x80, 0x84, 0x80, 0x84, 0x84, 0x80,
0x80, 0x84, 0x84, 0x80, 0x84, 0x80, 0x80, 0x84};	0x80, 0x84, 0x84, 0x80, 0x84, 0x80, 0x80, 0x84,
	0x45, 0x01, 0x01, 0x05, 0x01, 0x05, 0x05, 0x01,
	0x01, 0x05, 0x05, 0x01, 0x05, 0x01, 0x01, 0x05,
	0x01, 0x05, 0x05, 0x01, 0x05, 0x01, 0x01, 0x05,
	0x05, 0x01, 0x01, 0x05, 0x01, 0x05, 0x05, 0x01,
	0x01, 0x05, 0x05, 0x01, 0x05, 0x01, 0x01, 0x05,
	0x05, 0x01, 0x01, 0x05, 0x01, 0x05, 0x05, 0x01,
	0x05, 0x01, 0x01, 0x05, 0x01, 0x05, 0x05, 0x01,
	0x01, 0x05, 0x05, 0x01, 0x05, 0x01, 0x01, 0x05,
	0x01, 0x05, 0x05, 0x01, 0x05, 0x01, 0x01, 0x05,
	0x05, 0x01, 0x01, 0x05, 0x01, 0x05, 0x05, 0x01,
	0x05, 0x01, 0x01, 0x05, 0x01, 0x05, 0x05, 0x01,
	0x01, 0x05, 0x05, 0x01, 0x05, 0x01, 0x01, 0x05,
	0x05, 0x01, 0x01, 0x05, 0x01, 0x05, 0x05, 0x01,
	0x01, 0x05, 0x05, 0x01, 0x05, 0x01, 0x01, 0x05,
	0x01, 0x05, 0x05, 0x01, 0x05, 0x01, 0x01, 0x05,
	0x05, 0x01, 0x01, 0x05, 0x01, 0x05, 0x05, 0x01,
	0x81, 0x85, 0x85, 0x81, 0x85, 0x81, 0x81, 0x85,
	0x85, 0x81, 0x81, 0x85, 0x81, 0x85, 0x85, 0x81,
	0x85, 0x81, 0x81, 0x85, 0x81, 0x85, 0x85, 0x81,
	0x81, 0x85, 0x85, 0x81, 0x85, 0x81, 0x81, 0x85,
	0x85, 0x81, 0x81, 0x85, 0x81, 0x85, 0x85, 0x81,
	0x81, 0x85, 0x85, 0x81, 0x85, 0x81, 0x81, 0x85,
	0x81, 0x85, 0x85, 0x81, 0x85, 0x81, 0x81, 0x85,
	0x85, 0x81, 0x81, 0x85, 0x81, 0x85, 0x85, 0x81,
	0x85, 0x81, 0x81, 0x85, 0x81, 0x85, 0x85, 0x81,
	0x81, 0x85, 0x85, 0x81, 0x85, 0x81, 0x81, 0x85,
	0x81, 0x85, 0x85, 0x81, 0x85, 0x81, 0x81, 0x85,
	0x85, 0x81, 0x81, 0x85, 0x81, 0x85, 0x85, 0x81,
	0x81, 0x85, 0x85, 0x81, 0x85, 0x81, 0x81, 0x85,
	0x85, 0x81, 0x81, 0x85, 0x81, 0x85, 0x85, 0x81,
	0x85, 0x81, 0x81, 0x85, 0x81, 0x85, 0x85, 0x81,
	0x81, 0x85, 0x85, 0x81, 0x85, 0x81, 0x81, 0x85};


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

BYTE _szpcflag8[0x200];

#if !defined(MEMOPTIMIZE)	#if !defined(MEMOPTIMIZE)
BYTE _szpflag16[0x10000];	UINT8 _szpflag16[0x10000];
#endif	#endif

#if !defined(MEMOPTIMIZE) \|\| (MEMOPTIMIZE < 2)	#if !defined(MEMOPTIMIZE) \|\| (MEMOPTIMIZE < 2)
BYTE *_reg8_b53[256];	UINT8 *_reg8_b53[256];
BYTE *_reg8_b20[256];	UINT8 *_reg8_b20[256];
#endif	#endif
#if !defined(MEMOPTIMIZE) \|\| (MEMOPTIMIZE < 2)	#if !defined(MEMOPTIMIZE) \|\| (MEMOPTIMIZE < 2)
UINT16 *_reg16_b53[256];	UINT16 *_reg16_b53[256];
UINT16 *_reg16_b20[256];	UINT16 *_reg16_b20[256];
#endif	#endif

void i286_initialize(void) {	void i286c_initialize(void) {

	#if !defined(MEMOPTIMIZE) \|\| (MEMOPTIMIZE < 2)
UINT i;	UINT i;
UINT bit;	#endif
BYTE f;

for (i=0; i<0x100; i++) {
f = P_FLAG;
for (bit=0x80; bit; bit>>=1) {
if (i & bit) {
f ^= P_FLAG;
}
}
if (!(i & 0xff)) {
f \|= Z_FLAG;
}
if (i & 0x80) {
f \|= S_FLAG;
}
_szpcflag8[i+0x000] = f;
_szpcflag8[i+0x100] = f \| C_FLAG;
}

#if !defined(MEMOPTIMIZE) \|\| (MEMOPTIMIZE < 2)	#if !defined(MEMOPTIMIZE) \|\| (MEMOPTIMIZE < 2)
for (i=0; i<0x100; i++) {	for (i=0; i<0x100; i++) {
Line 95 void i286_initialize(void) {	Line 107 void i286_initialize(void) {
pos = ((i & 0x20)?0:1);	pos = ((i & 0x20)?0:1);
#endif	#endif
pos += ((i >> 3) & 3) * 2;	pos += ((i >> 3) & 3) * 2;
_reg8_b53[i] = ((BYTE *)&I286_REG) + pos;	_reg8_b53[i] = ((UINT8 *)&I286_REG) + pos;
#if defined(BYTESEX_LITTLE)	#if defined(BYTESEX_LITTLE)
pos = ((i & 0x4)?1:0);	pos = ((i & 0x4)?1:0);
#else	#else
pos = ((i & 0x4)?0:1);	pos = ((i & 0x4)?0:1);
#endif	#endif
pos += (i & 3) * 2;	pos += (i & 3) * 2;
_reg8_b20[i] = ((BYTE *)&I286_REG) + pos;	_reg8_b20[i] = ((UINT8 *)&I286_REG) + pos;
#if !defined(MEMOPTIMIZE) \|\| (MEMOPTIMIZE < 2)	#if !defined(MEMOPTIMIZE) \|\| (MEMOPTIMIZE < 2)
_reg16_b53[i] = ((UINT16 *)&I286_REG) + ((i >> 3) & 7);	_reg16_b53[i] = ((UINT16 *)&I286_REG) + ((i >> 3) & 7);
_reg16_b20[i] = ((UINT16 *)&I286_REG) + (i & 7);	_reg16_b20[i] = ((UINT16 *)&I286_REG) + (i & 7);
Line 112 void i286_initialize(void) {	Line 124 void i286_initialize(void) {

#if !defined(MEMOPTIMIZE)	#if !defined(MEMOPTIMIZE)
for (i=0; i<0x10000; i++) {	for (i=0; i<0x10000; i++) {
	REG8 f;
	UINT bit;
f = P_FLAG;	f = P_FLAG;
for (bit=0x80; bit; bit>>=1) {	for (bit=0x80; bit; bit>>=1) {
if (i & bit) {	if (i & bit) {
Line 130 void i286_initialize(void) {	Line 144 void i286_initialize(void) {
#if !defined(MEMOPTIMIZE) \|\| (MEMOPTIMIZE < 2)	#if !defined(MEMOPTIMIZE) \|\| (MEMOPTIMIZE < 2)
i286cea_initialize();	i286cea_initialize();
#endif	#endif
v30init();	v30cinit();
}	}

void i286_reset(void) {	static void i286c_initreg(void) {

	I286_CS = 0xf000;
	CS_BASE = 0xf0000;
	I286_IP = 0xfff0;
	I286_ADRSMASK = 0xfffff;
	}

	void i286c_reset(void) {

i286_initialize();
ZeroMemory(&i286core.s, sizeof(i286core.s));	ZeroMemory(&i286core.s, sizeof(i286core.s));
I286_CS = 0x1fc0;	i286c_initreg();
CS_BASE = 0x1fc00;
i286core.s.adrsmask = 0xfffff;
}	}

void i286_resetprefetch(void) {	void i286c_shut(void) {

	ZeroMemory(&i286core.s, offsetof(I286STAT, cpu_type));
	i286c_initreg();
}	}

void CPUCALL i286_intnum(UINT vect, REG16 IP) {	void CPUCALL i286c_intnum(UINT vect, REG16 IP) {

const BYTE *ptr;	const BYTE *ptr;

Line 156 const BYTE *ptr;	Line 178 const BYTE *ptr;
I286_FLAG &= ~(T_FLAG \| I_FLAG);	I286_FLAG &= ~(T_FLAG \| I_FLAG);
I286_TRAP = 0;	I286_TRAP = 0;

ptr = I286_MEM + (vect * 4);	ptr = mem + (vect * 4);
I286_IP = LOADINTELWORD(ptr+0); // real mode!	I286_IP = LOADINTELWORD(ptr+0); // real mode!
I286_CS = LOADINTELWORD(ptr+2); // real mode!	I286_CS = LOADINTELWORD(ptr+2); // real mode!
CS_BASE = I286_CS << 4;	CS_BASE = I286_CS << 4;
I286_WORKCLOCK(20);	I286_WORKCLOCK(20);
}	}

void CPUCALL i286_interrupt(BYTE vect) {	void CPUCALL i286c_interrupt(REG8 vect) {

UINT op;	UINT op;
const BYTE *ptr;	const BYTE *ptr;
Line 179 const BYTE *ptr;	Line 201 const BYTE *ptr;
I286_FLAG &= ~(T_FLAG \| I_FLAG);	I286_FLAG &= ~(T_FLAG \| I_FLAG);
I286_TRAP = 0;	I286_TRAP = 0;

ptr = I286_MEM + (vect * 4);	ptr = mem + (vect * 4);
I286_IP = LOADINTELWORD(ptr+0); // real mode!	I286_IP = LOADINTELWORD(ptr + 0); // real mode!
I286_CS = LOADINTELWORD(ptr+2); // real mode!	I286_CS = LOADINTELWORD(ptr + 2); // real mode!
CS_BASE = I286_CS << 4;	CS_BASE = I286_CS << 4;
I286_WORKCLOCK(20);	I286_WORKCLOCK(20);
}	}

void i286(void) {	void i286c(void) {

UINT opcode;	UINT opcode;

Line 195 void i286(void) {	Line 217 void i286(void) {
GET_PCBYTE(opcode);	GET_PCBYTE(opcode);
i286op[opcode]();	i286op[opcode]();
if (I286_TRAP) {	if (I286_TRAP) {
i286_interrupt(1);	i286c_interrupt(1);
}	}
dmap_i286();	dmap_i286();
} while(I286_REMCLOCK > 0);	} while(I286_REMCLOCK > 0);
Line 215 void i286(void) {	Line 237 void i286(void) {
}	}
}	}

void i286_step(void) {	void i286c_step(void) {

UINT opcode;	UINT opcode;

Line 241 BYTE BYTESZPF(UINT r) {	Line 263 BYTE BYTESZPF(UINT r) {
if (r & (~0xff)) {	if (r & (~0xff)) {
TRACEOUT(("BYTESZPF bound error: %x", r));	TRACEOUT(("BYTESZPF bound error: %x", r));
}	}
return(_szpcflag8[r & 0xff]);	return(iflags[r & 0xff]);
}	}

BYTE BYTESZPCF(UINT r) {	BYTE BYTESZPCF(UINT r) {
Line 249 BYTE BYTESZPCF(UINT r) {	Line 271 BYTE BYTESZPCF(UINT r) {
if (r & (~0x1ff)) {	if (r & (~0x1ff)) {
TRACEOUT(("BYTESZPCF bound error: %x", r));	TRACEOUT(("BYTESZPCF bound error: %x", r));
}	}
return(_szpcflag8[r & 0x1ff]);	return(iflags[r & 0x1ff]);
}	}

BYTE WORDSZPF(UINT32 r) {	BYTE WORDSZPF(UINT32 r) {
Line 261 BYTE WORDSZPF(UINT32 r) {	Line 283 BYTE WORDSZPF(UINT32 r) {
TRACEOUT(("WORDSZPF bound error: %x", r));	TRACEOUT(("WORDSZPF bound error: %x", r));
}	}
f1 = _szpflag16[r & 0xffff];	f1 = _szpflag16[r & 0xffff];
f2 = _szpcflag8[r & 0xff] & P_FLAG;	f2 = iflags[r & 0xff] & P_FLAG;
f2 += (r)?0:Z_FLAG;	f2 += (r)?0:Z_FLAG;
f2 += (r >> 8) & S_FLAG;	f2 += (r >> 8) & S_FLAG;
if (f1 != f2) {	if (f1 != f2) {
Line 281 BYTE WORDSZPCF(UINT32 r) {	Line 303 BYTE WORDSZPCF(UINT32 r) {
f1 = (r >> 16) & 1;	f1 = (r >> 16) & 1;
f1 += _szpflag16[LOW16(r)];	f1 += _szpflag16[LOW16(r)];

f2 = _szpcflag8[r & 0xff] & P_FLAG;	f2 = iflags[r & 0xff] & P_FLAG;
f2 += (LOW16(r))?0:Z_FLAG;	f2 += (LOW16(r))?0:Z_FLAG;
f2 += (r >> 8) & S_FLAG;	f2 += (r >> 8) & S_FLAG;
f2 += (r >> 16) & 1;	f2 += (r >> 16) & 1;

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

Removed from v.1.11
changed lines
	Added in v.1.22