np2/i386c/memory.c - diff

Return to memory.c CVS log

Up to [RetroPC.NET] / np2 / i386c

Diff for /np2/i386c/memory.c between versions 1.15 and 1.18

version 1.15, 2004/03/04 16:58:57	version 1.18, 2004/03/10 07:41:48
Line 813 REG8 MEMCALL i286_memoryread(UINT32 addr	Line 813 REG8 MEMCALL i286_memoryread(UINT32 addr
}	}
#endif	#endif
else {	else {
	// TRACEOUT(("out of mem (read8): %x", addr));
return(0xff);	return(0xff);
}	}
}	}
Line 844 REG16 MEMCALL i286_memoryread_w(UINT32 a	Line 845 REG16 MEMCALL i286_memoryread_w(UINT32 a
}	}
#endif	#endif
else {	else {
	// TRACEOUT(("out of mem (read16): %x", addr));
return(0xffff);	return(0xffff);
}	}
}	}
Line 903 void MEMCALL i286_memorywrite(UINT32 add	Line 905 void MEMCALL i286_memorywrite(UINT32 add
}	}
#endif	#endif
else {	else {
TRACEOUT(("mem_w %x %x", addr, value));	// TRACEOUT(("out of mem (write8): %x", addr));
}	}
}	}
else {	else {
Line 932 void MEMCALL i286_memorywrite_w(UINT32 a	Line 934 void MEMCALL i286_memorywrite_w(UINT32 a
mem9821_ww(addr, value);	mem9821_ww(addr, value);
}	}
#endif	#endif
	else {
	// TRACEOUT(("out of mem (write16): %x", addr));
	}
}	}
else {	else {
memfn.wr16[(addr >> 15) & 0x1f](addr, value);	memfn.wr16[(addr >> 15) & 0x1f](addr, value);
Line 1088 void MEMCALL memp_write(UINT32 address,	Line 1093 void MEMCALL memp_write(UINT32 address,

// ---- Logical Space (BIOS)	// ---- Logical Space (BIOS)

static UINT32 realaddr(UINT32 addr) {	static UINT32 physicaladdr(UINT32 addr) {

UINT32 pde;	UINT32 pde;
UINT32 pte;	UINT32 pte;
Line 1110 retdummy:	Line 1115 retdummy:
return(0x01000000); // てきとーにメモリが存在しない場所	return(0x01000000); // てきとーにメモリが存在しない場所
}	}

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

	UINT32 addr;

	addr = (seg << 4) + LOW16(off);
	if (CPU_STAT_PAGING) {
	addr = physicaladdr(addr);
	}
	return(i286_memoryread(addr));
	}

	REG16 MEMCALL meml_read16(UINT seg, UINT off) {

	UINT32 addr;

	addr = (seg << 4) + LOW16(off);
	if (!CPU_STAT_PAGING) {
	return(i286_memoryread_w(addr));
	}
	else if ((addr + 1) & 0xfff) {
	return(i286_memoryread_w(physicaladdr(addr)));
	}
	return(meml_read8(seg, off) + (meml_read8(seg, off + 1) << 8));
	}

	void MEMCALL meml_write8(UINT seg, UINT off, REG8 dat) {

	UINT32 addr;

	addr = (seg << 4) + LOW16(off);
	if (CPU_STAT_PAGING) {
	addr = physicaladdr(addr);
	}
	i286_memorywrite(addr, dat);
	}

	void MEMCALL meml_write16(UINT seg, UINT off, REG16 dat) {

	UINT32 addr;

	addr = (seg << 4) + LOW16(off);
	if (!CPU_STAT_PAGING) {
	i286_memorywrite_w(addr, dat);
	}
	else if ((addr + 1) & 0xfff) {
	i286_memorywrite_w(physicaladdr(addr), dat);
	}
	else {
	meml_write8(seg, off, (REG8)dat);
	meml_write8(seg, off + 1, (REG8)(dat >> 8));
	}
	}

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

UINT32 adrs;	UINT32 adrs;
UINT size;	UINT size;
Line 1121 void MEMCALL i286_memstr_read(UINT seg,	Line 1180 void MEMCALL i286_memstr_read(UINT seg,
size = 0x1000 - (adrs & 0xfff);	size = 0x1000 - (adrs & 0xfff);
size = min(size, leng);	size = min(size, leng);
size = min(size, 0x10000 - off);	size = min(size, 0x10000 - off);
memp_read(realaddr(adrs), dat, size);	memp_read(physicaladdr(adrs), dat, size);
off += size;	off += size;
dat = ((BYTE *)dat) + size;	dat = ((BYTE *)dat) + size;
leng -= size;	leng -= size;
}	}
}	}

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) {

UINT32 adrs;	UINT32 adrs;
UINT size;	UINT size;
Line 1140 void MEMCALL i286_memstr_write(UINT seg,	Line 1198 void MEMCALL i286_memstr_write(UINT seg,
size = 0x1000 - (adrs & 0xfff);	size = 0x1000 - (adrs & 0xfff);
size = min(size, leng);	size = min(size, leng);
size = min(size, 0x10000 - off);	size = min(size, 0x10000 - off);
memp_write(realaddr(adrs), dat, size);	memp_write(physicaladdr(adrs), dat, size);
off += size;	off += size;
dat = ((BYTE *)dat) + size;	dat = ((BYTE *)dat) + size;
leng -= size;	leng -= size;
Line 1151 void MEMCALL meml_read(UINT32 address, v	Line 1209 void MEMCALL meml_read(UINT32 address, v

UINT size;	UINT size;

while(leng) {	if (!CPU_STAT_PAGING) {
size = 0x1000 - (address & 0xfff);	memp_read(address, dat, leng);
size = min(size, leng);	}
memp_read(realaddr(address), dat, size);	else {
address += size;	while(leng) {
dat = ((BYTE *)dat) + size;	size = 0x1000 - (address & 0xfff);
leng -= size;	size = min(size, leng);
	memp_read(physicaladdr(address), dat, size);
	address += size;
	dat = ((BYTE *)dat) + size;
	leng -= size;
	}
}	}
}	}

Line 1165 void MEMCALL meml_write(UINT32 address,	Line 1228 void MEMCALL meml_write(UINT32 address,

UINT size;	UINT size;

while(leng) {	if (!CPU_STAT_PAGING) {
size = 0x1000 - (address & 0xfff);	memp_write(address, dat, leng);
size = min(size, leng);	}
memp_write(realaddr(address), dat, size);	else {
address += size;	while(leng) {
dat = ((BYTE *)dat) + size;	size = 0x1000 - (address & 0xfff);
leng -= size;	size = min(size, leng);
	memp_write(physicaladdr(address), dat, size);
	address += size;
	dat = ((BYTE *)dat) + size;
	leng -= size;
	}
}	}
}	}

#endif	#endif

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

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