np2/i286c/memory.c - diff

Return to memory.c CVS log

Up to [RetroPC.NET] / np2 / i286c

Diff for /np2/i286c/memory.c between versions 1.15 and 1.19

version 1.15, 2003/12/22 01:44:59	version 1.19, 2004/03/07 23:04:51
Line 10	Line 10
BYTE mem[0x200000];	BYTE mem[0x200000];


#define USE_HIMEM 0x10fff0

#if defined(TRACE)	#if defined(TRACE)
#define MEMORY_DEBUG	#define MEMORY_DEBUG
#endif	#endif
Line 185 static void MEMCALL egc_wt(UINT32 addres	Line 183 static void MEMCALL egc_wt(UINT32 addres

static void MEMCALL emmc_wt(UINT32 address, REG8 value) {	static void MEMCALL emmc_wt(UINT32 address, REG8 value) {

extmem.pageptr[(address >> 14) & 3][LOW14(address)] = (BYTE)value;	i286core.e.ems[(address >> 14) & 3][LOW14(address)] = (BYTE)value;
	}

	static void MEMCALL i286_wb(UINT32 address, REG8 value) {

	mem[address + 0x1c8000 - 0xe8000] = (BYTE)value;
}	}

static void MEMCALL i286_wn(UINT32 address, REG8 value) {	static void MEMCALL i286_wn(UINT32 address, REG8 value) {
Line 285 static REG8 MEMCALL egc_rd(UINT32 addres	Line 288 static REG8 MEMCALL egc_rd(UINT32 addres

static REG8 MEMCALL emmc_rd(UINT32 address) {	static REG8 MEMCALL emmc_rd(UINT32 address) {

return(extmem.pageptr[(address >> 14) & 3][LOW14(address)]);	return(i286core.e.ems[(address >> 14) & 3][LOW14(address)]);
}	}

static REG8 MEMCALL i286_itf(UINT32 address) {	static REG8 MEMCALL i286_rb(UINT32 address) {

if (CPU_ITFBANK) {	if (CPU_ITFBANK) {
address = ITF_ADRS + LOW15(address);	address += VRAM_STEP;
}	}
return(mem[address]);	return(mem[address]);
}	}
Line 445 static void MEMCALL grcgw_tdw1(UINT32 ad	Line 448 static void MEMCALL grcgw_tdw1(UINT32 ad
static void MEMCALL egcw_wt(UINT32 address, REG16 value) {	static void MEMCALL egcw_wt(UINT32 address, REG16 value) {

CPU_REMCLOCK -= MEMWAIT_GRCG;	CPU_REMCLOCK -= MEMWAIT_GRCG;
if (!(address & 1)) {	egc_write_w(address, value);
egc_write_w(address, value);
}
else {
if (!(egc.sft & 0x1000)) {
egc_write(address, (REG8)value);
egc_write(address + 1, (REG8)(value >> 8));
}
else {
egc_write(address + 1, (REG8)(value >> 8));
egc_write(address, (REG8)value);
}
}
}	}

static void MEMCALL emmcw_wt(UINT32 address, REG16 value) {	static void MEMCALL emmcw_wt(UINT32 address, REG16 value) {
Line 465 static void MEMCALL emmcw_wt(UINT32 addr	Line 456 static void MEMCALL emmcw_wt(UINT32 addr
BYTE *ptr;	BYTE *ptr;

if ((address & 0x3fff) != 0x3fff) {	if ((address & 0x3fff) != 0x3fff) {
ptr = extmem.pageptr[(address >> 14) & 3] + LOW14(address);	ptr = i286core.e.ems[(address >> 14) & 3] + LOW14(address);
STOREINTELWORD(ptr, value);	STOREINTELWORD(ptr, value);
}	}
else {	else {
extmem.pageptr[(address >> 14) & 3][0x3fff] = (BYTE)value;	i286core.e.ems[(address >> 14) & 3][0x3fff] = (BYTE)value;
extmem.pageptr[((address + 1) >> 14) & 3][0] = (BYTE)(value >> 8);	i286core.e.ems[((address + 1) >> 14) & 3][0] = (BYTE)(value >> 8);
}	}
}	}

	static void MEMCALL i286w_wb(UINT32 address, REG16 value) {

	mem[address + 0x1c8000 - 0xe8000] = (BYTE)value;
	mem[address + 0x1c8001 - 0xe8000] = (BYTE)(value >> 8);
	}

static void MEMCALL i286w_wn(UINT32 address, REG16 value) {	static void MEMCALL i286w_wn(UINT32 address, REG16 value) {

(void)address;	(void)address;
Line 580 static REG16 MEMCALL grcgw_tcr1(UINT32 a	Line 577 static REG16 MEMCALL grcgw_tcr1(UINT32 a

static REG16 MEMCALL egcw_rd(UINT32 address) {	static REG16 MEMCALL egcw_rd(UINT32 address) {

REG16 ret;

CPU_REMCLOCK -= MEMWAIT_GRCG;	CPU_REMCLOCK -= MEMWAIT_GRCG;
if (!(address & 1)) {	return(egc_read_w(address));
return(egc_read_w(address));
}
else {
if (!(egc.sft & 0x1000)) {
ret = egc_read(address);
ret += egc_read(address + 1) << 8;
return(ret);
}
else {
ret = egc_read(address + 1) << 8;
ret += egc_read(address);
return(ret);
}
}
}	}

static REG16 MEMCALL emmcw_rd(UINT32 address) {	static REG16 MEMCALL emmcw_rd(UINT32 address) {
Line 606 const BYTE *ptr;	Line 587 const BYTE *ptr;
REG16 ret;	REG16 ret;

if ((address & 0x3fff) != 0x3fff) {	if ((address & 0x3fff) != 0x3fff) {
ptr = extmem.pageptr[(address >> 14) & 3] + LOW14(address);	ptr = i286core.e.ems[(address >> 14) & 3] + LOW14(address);
return(LOADINTELWORD(ptr));	return(LOADINTELWORD(ptr));
}	}
else {	else {
ret = extmem.pageptr[(address >> 14) & 3][0x3fff];	ret = i286core.e.ems[(address >> 14) & 3][0x3fff];
ret += extmem.pageptr[((address + 1) >> 14) & 3][0] << 8;	ret += i286core.e.ems[((address + 1) >> 14) & 3][0] << 8;
return(ret);	return(ret);
}	}
}	}

static REG16 MEMCALL i286w_itf(UINT32 address) {	static REG16 MEMCALL i286w_rb(UINT32 address) {

if (CPU_ITFBANK) {	if (CPU_ITFBANK) {
address = ITF_ADRS + LOW15(address);	address += VRAM_STEP;
}	}
return(LOADINTELWORD(mem + address));	return(LOADINTELWORD(mem + address));
}	}
Line 640 typedef struct {	Line 621 typedef struct {
} MEMFN;	} MEMFN;

typedef struct {	typedef struct {
	MEM8READ brd8;
	MEM8READ ird8;
	MEM8WRITE ewr8;
	MEM8WRITE bwr8;
	MEM16READ brd16;
	MEM16READ ird16;
	MEM16WRITE ewr16;
	MEM16WRITE bwr16;
	} MMAPTBL;

	typedef struct {
MEM8READ rd8;	MEM8READ rd8;
MEM8WRITE wr8;	MEM8WRITE wr8;
MEM16READ rd16;	MEM16READ rd16;
Line 654 static MEMFN memfn = {	Line 646 static MEMFN memfn = {
i286_rd, i286_rd, i286_rd, i286_rd, // 80	i286_rd, i286_rd, i286_rd, i286_rd, // 80
tram_rd, vram_r0, vram_r0, vram_r0, // a0	tram_rd, vram_r0, vram_r0, vram_r0, // a0
emmc_rd, emmc_rd, i286_rd, i286_rd, // c0	emmc_rd, emmc_rd, i286_rd, i286_rd, // c0
vram_r0, i286_rd, i286_rd, i286_itf}, // f0	vram_r0, i286_rd, i286_rd, i286_rb}, // f0

{i286_wt, i286_wt, i286_wt, i286_wt, // 00	{i286_wt, i286_wt, i286_wt, i286_wt, // 00
i286_wt, i286_wt, i286_wt, i286_wt, // 20	i286_wt, i286_wt, i286_wt, i286_wt, // 20
Line 672 static MEMFN memfn = {	Line 664 static MEMFN memfn = {
i286w_rd, i286w_rd, i286w_rd, i286w_rd, // 80	i286w_rd, i286w_rd, i286w_rd, i286w_rd, // 80
tramw_rd, vramw_r0, vramw_r0, vramw_r0, // a0	tramw_rd, vramw_r0, vramw_r0, vramw_r0, // a0
emmcw_rd, emmcw_rd, i286w_rd, i286w_rd, // c0	emmcw_rd, emmcw_rd, i286w_rd, i286w_rd, // c0
vramw_r0, i286w_rd, i286w_rd, i286w_itf}, // e0	vramw_r0, i286w_rd, i286w_rd, i286w_rb}, // e0

{i286w_wt, i286w_wt, i286w_wt, i286w_wt, // 00	{i286w_wt, i286w_wt, i286w_wt, i286w_wt, // 00
i286w_wt, i286w_wt, i286w_wt, i286w_wt, // 20	i286w_wt, i286w_wt, i286w_wt, i286w_wt, // 20
Line 683 static MEMFN memfn = {	Line 675 static MEMFN memfn = {
emmcw_wt, emmcw_wt, i286w_wn, i286w_wn, // c0	emmcw_wt, emmcw_wt, i286w_wn, i286w_wn, // c0
vramw_w0, i286w_wn, i286w_wn, i286w_wn}}; // e0	vramw_w0, i286w_wn, i286w_wn, i286w_wn}}; // e0

	static const MMAPTBL mmaptbl[2] = {
	{i286_rd, i286_rb, i286_wn, i286_wn,
	i286w_rd, i286w_rb, i286w_wn, i286w_wn},
	{i286_rb, i286_rb, i286_wt, i286_wb,
	i286w_rb, i286w_rb, i286w_wt, i286w_wb}};

static const VACCTBL vacctbl[0x10] = {	static const VACCTBL vacctbl[0x10] = {
{vram_r0, vram_w0, vramw_r0, vramw_w0}, // 00	{vram_r0, vram_w0, vramw_r0, vramw_w0}, // 00
{vram_r1, vram_w1, vramw_r1, vramw_w1},	{vram_r1, vram_w1, vramw_r1, vramw_w1},
Line 714 static REG16 MEMCALL i286_nonram_rw(UINT	Line 712 static REG16 MEMCALL i286_nonram_rw(UINT
return(0xffff);	return(0xffff);
}	}


	void MEMCALL i286_memorymap(UINT type) {

	const MMAPTBL *mm;

	mm = mmaptbl + (type & 1);

	memfn.rd8[0xe8000 >> 15] = mm->brd8;
	memfn.rd8[0xf0000 >> 15] = mm->brd8;
	memfn.rd8[0xf8000 >> 15] = mm->ird8;

	memfn.wr8[0xd0000 >> 15] = mm->ewr8;
	memfn.wr8[0xd8000 >> 15] = mm->ewr8;
	memfn.wr8[0xe8000 >> 15] = mm->bwr8;
	memfn.wr8[0xf0000 >> 15] = mm->bwr8;
	memfn.wr8[0xf8000 >> 15] = mm->bwr8;

	memfn.rd16[0xe8000 >> 15] = mm->brd16;
	memfn.rd16[0xf0000 >> 15] = mm->brd16;
	memfn.rd16[0xf8000 >> 15] = mm->ird16;

	memfn.wr16[0xd0000 >> 15] = mm->ewr16;
	memfn.wr16[0xd8000 >> 15] = mm->ewr16;
	memfn.wr16[0xe8000 >> 15] = mm->bwr16;
	memfn.wr16[0xf0000 >> 15] = mm->bwr16;
	memfn.wr16[0xf8000 >> 15] = mm->bwr16;
	}

void MEMCALL i286_vram_dispatch(UINT func) {	void MEMCALL i286_vram_dispatch(UINT func) {

const VACCTBL *vacc;	const VACCTBL *vacc;
Line 942 void MEMCALL i286_memorywrite_w(UINT32 a	Line 968 void MEMCALL i286_memorywrite_w(UINT32 a
}	}
}	}

REG8 MEMCALL i286_membyte_read(UINT seg, UINT off) {	REG8 MEMCALL meml_read8(UINT seg, UINT off) {

UINT32 address;	UINT32 address;

Line 955 REG8 MEMCALL i286_membyte_read(UINT seg,	Line 981 REG8 MEMCALL i286_membyte_read(UINT seg,
}	}
}	}

REG16 MEMCALL i286_memword_read(UINT seg, UINT off) {	REG16 MEMCALL meml_read16(UINT seg, UINT off) {

UINT32 address;	UINT32 address;

Line 968 REG16 MEMCALL i286_memword_read(UINT seg	Line 994 REG16 MEMCALL i286_memword_read(UINT seg
}	}
}	}

void MEMCALL i286_membyte_write(UINT seg, UINT off, REG8 value) {	void MEMCALL meml_write8(UINT seg, UINT off, REG8 value) {

UINT32 address;	UINT32 address;

Line 981 void MEMCALL i286_membyte_write(UINT seg	Line 1007 void MEMCALL i286_membyte_write(UINT seg
}	}
}	}

void MEMCALL i286_memword_write(UINT seg, UINT off, REG16 value) {	void MEMCALL meml_write16(UINT seg, UINT off, REG16 value) {

UINT32 address;	UINT32 address;

Line 994 void MEMCALL i286_memword_write(UINT seg	Line 1020 void MEMCALL i286_memword_write(UINT seg
}	}
}	}

void MEMCALL i286_memstr_read(UINT seg, UINT off, void *dat, UINT leng) {	void MEMCALL meml_readstr(UINT seg, UINT off, void *dat, UINT leng) {

BYTE *out;	BYTE *out;
UINT32 adrs;	UINT32 adrs;
Line 1032 void MEMCALL i286_memstr_read(UINT seg,	Line 1058 void MEMCALL i286_memstr_read(UINT seg,
}	}
}	}

void MEMCALL i286_memstr_write(UINT seg, UINT off,	void MEMCALL meml_writestr(UINT seg, UINT off, const void *dat, UINT leng) {
const void *dat, UINT leng) {

BYTE *out;	BYTE *out;
UINT32 adrs;	UINT32 adrs;
Line 1071 void MEMCALL i286_memstr_write(UINT seg,	Line 1096 void MEMCALL i286_memstr_write(UINT seg,
}	}
}	}

void MEMCALL i286_memx_read(UINT32 address, void *dat, UINT leng) {	void MEMCALL meml_read(UINT32 address, void *dat, UINT leng) {

if ((address + leng) < I286_MEMREADMAX) {	if ((address + leng) < I286_MEMREADMAX) {
CopyMemory(dat, mem + address, leng);	CopyMemory(dat, mem + address, leng);
Line 1090 void MEMCALL i286_memx_read(UINT32 addre	Line 1115 void MEMCALL i286_memx_read(UINT32 addre
}	}
}	}

void MEMCALL i286_memx_write(UINT32 address, const void *dat, UINT leng) {	void MEMCALL meml_write(UINT32 address, const void *dat, UINT leng) {

const BYTE *out;	const BYTE *out;

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

Removed from v.1.15
changed lines
	Added in v.1.19