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.22 and 1.24

version 1.22, 2004/03/29 05:50:29	version 1.24, 2004/04/05 09:45:06
Line 796 void MEMCALL i286_vram_dispatch(UINT fun	Line 796 void MEMCALL i286_vram_dispatch(UINT fun

const VACCTBL *vacc;	const VACCTBL *vacc;

vacc = vacctbl + (func & 0x0f);
#if defined(SUPPORT_PC9821)	#if defined(SUPPORT_PC9821)
if (!(func & 0x20)) {	if (!(func & 0x20)) {
#endif	#endif
	vacc = vacctbl + (func & 0x0f);
memfn.rd8[0xa8000 >> 15] = vacc->rd8;	memfn.rd8[0xa8000 >> 15] = vacc->rd8;
memfn.rd8[0xb0000 >> 15] = vacc->rd8;	memfn.rd8[0xb0000 >> 15] = vacc->rd8;
memfn.rd8[0xb8000 >> 15] = vacc->rd8;	memfn.rd8[0xb8000 >> 15] = vacc->rd8;
Line 831 const VACCTBL *vacc;	Line 831 const VACCTBL *vacc;
else {	else {
memfn.rd8[0xa8000 >> 15] = mem9821_b0r;	memfn.rd8[0xa8000 >> 15] = mem9821_b0r;
memfn.rd8[0xb0000 >> 15] = mem9821_b0r;	memfn.rd8[0xb0000 >> 15] = mem9821_b0r;
memfn.rd8[0xb8000 >> 15] = vacc->rd8;	memfn.rd8[0xb8000 >> 15] = i286_nonram_r;
memfn.rd8[0xe0000 >> 15] = mem9821_b2r;	memfn.rd8[0xe0000 >> 15] = mem9821_b2r;

memfn.wr8[0xa8000 >> 15] = mem9821_b0w;	memfn.wr8[0xa8000 >> 15] = mem9821_b0w;
memfn.wr8[0xb0000 >> 15] = mem9821_b0w;	memfn.wr8[0xb0000 >> 15] = mem9821_b0w;
memfn.wr8[0xb8000 >> 15] = vacc->wr8;	memfn.wr8[0xb8000 >> 15] = i286_wn;
memfn.wr8[0xe0000 >> 15] = mem9821_b2w;	memfn.wr8[0xe0000 >> 15] = mem9821_b2w;

memfn.rd16[0xa8000 >> 15] = mem9821_b0rw;	memfn.rd16[0xa8000 >> 15] = mem9821_b0rw;
memfn.rd16[0xb0000 >> 15] = mem9821_b0rw;	memfn.rd16[0xb0000 >> 15] = mem9821_b0rw;
memfn.rd16[0xb8000 >> 15] = vacc->rd16;	memfn.rd16[0xb8000 >> 15] = i286_nonram_rw;
memfn.rd16[0xe0000 >> 15] = mem9821_b2rw;	memfn.rd16[0xe0000 >> 15] = mem9821_b2rw;

memfn.wr16[0xa8000 >> 15] = mem9821_b0ww;	memfn.wr16[0xa8000 >> 15] = mem9821_b0ww;
memfn.wr16[0xb0000 >> 15] = mem9821_b0ww;	memfn.wr16[0xb0000 >> 15] = mem9821_b0ww;
memfn.wr16[0xb8000 >> 15] = vacc->wr16;	memfn.wr16[0xb8000 >> 15] = i286w_wn;
memfn.wr16[0xe0000 >> 15] = mem9821_b2ww;	memfn.wr16[0xe0000 >> 15] = mem9821_b2ww;
}	}
#endif	#endif
Line 1166 void MEMCALL memp_write(UINT32 address,	Line 1166 void MEMCALL memp_write(UINT32 address,

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

static UINT32 physicaladdr(UINT32 addr) {	static UINT32 physicaladdr(UINT32 addr, BOOL wr) {

UINT32 a;	UINT32 a;
UINT32 pde;	UINT32 pde;
UINT32 pte;	UINT32 pte;

if (CPU_STAT_PAGING) {	a = CPU_STAT_PDE_BASE + ((addr >> 20) & 0xffc);
a = CPU_STAT_PDE_BASE + ((addr >> 20) & 0xffc);	pde = i286_memoryread_d(a);
pde = i286_memoryread_d(a);	if (!(pde & CPU_PDE_PRESENT)) {
if (!(pde & CPU_PDE_PRESENT)) {	goto retdummy;
goto retdummy;	}
}	if (!(pde & CPU_PDE_ACCESS)) {
#if 0	i286_memorywrite(a, (UINT8)(pde \| CPU_PDE_ACCESS));
if (!(pde & CPU_PDE_ACCESS)) {	}
i286_memorywrite_d(a, pde \| CPU_PDE_ACCESS);	a = (pde & CPU_PDE_BASEADDR_MASK) + ((addr >> 10) & 0xffc);
}	pte = cpu_memoryread_d(a);
#endif	if (!(pte & CPU_PTE_PRESENT)) {
a = (pde & CPU_PDE_BASEADDR_MASK) + ((addr >> 10) & 0xffc);	goto retdummy;
pte = cpu_memoryread_d(a);	}
if (!(pte & CPU_PTE_PRESENT)) {	if (!(pte & CPU_PTE_ACCESS)) {
goto retdummy;	i286_memorywrite(a, (UINT8)(pte \| CPU_PTE_ACCESS));
}	}
#if 0	if ((wr) && (!(pte & CPU_PTE_DIRTY))) {
if (!(pte & CPU_PTE_ACCESS)) {	i286_memorywrite(a, (UINT8)(pte \| CPU_PTE_DIRTY));
i286_memorywrite_d(a, pte \| CPU_PTE_ACCESS);
}
#endif
addr = (pte & CPU_PTE_BASEADDR_MASK) + (addr & 0x00000fff);
}	}
	addr = (pte & CPU_PTE_BASEADDR_MASK) + (addr & 0x00000fff);
return(addr);	return(addr);

retdummy:	retdummy:
Line 1208 REG8 MEMCALL meml_read8(UINT seg, UINT o	Line 1205 REG8 MEMCALL meml_read8(UINT seg, UINT o

addr = (seg << 4) + LOW16(off);	addr = (seg << 4) + LOW16(off);
if (CPU_STAT_PAGING) {	if (CPU_STAT_PAGING) {
addr = physicaladdr(addr);	addr = physicaladdr(addr, FALSE);
}	}
return(i286_memoryread(addr));	return(i286_memoryread(addr));
}	}
Line 1222 REG16 MEMCALL meml_read16(UINT seg, UINT	Line 1219 REG16 MEMCALL meml_read16(UINT seg, UINT
return(i286_memoryread_w(addr));	return(i286_memoryread_w(addr));
}	}
else if ((addr + 1) & 0xfff) {	else if ((addr + 1) & 0xfff) {
return(i286_memoryread_w(physicaladdr(addr)));	return(i286_memoryread_w(physicaladdr(addr, FALSE)));
}	}
return(meml_read8(seg, off) + (meml_read8(seg, off + 1) << 8));	return(meml_read8(seg, off) + (meml_read8(seg, off + 1) << 8));
}	}
Line 1233 void MEMCALL meml_write8(UINT seg, UINT	Line 1230 void MEMCALL meml_write8(UINT seg, UINT

addr = (seg << 4) + LOW16(off);	addr = (seg << 4) + LOW16(off);
if (CPU_STAT_PAGING) {	if (CPU_STAT_PAGING) {
addr = physicaladdr(addr);	addr = physicaladdr(addr, TRUE);
}	}
i286_memorywrite(addr, dat);	i286_memorywrite(addr, dat);
}	}
Line 1247 void MEMCALL meml_write16(UINT seg, UINT	Line 1244 void MEMCALL meml_write16(UINT seg, UINT
i286_memorywrite_w(addr, dat);	i286_memorywrite_w(addr, dat);
}	}
else if ((addr + 1) & 0xfff) {	else if ((addr + 1) & 0xfff) {
i286_memorywrite_w(physicaladdr(addr), dat);	i286_memorywrite_w(physicaladdr(addr, TRUE), dat);
}	}
else {	else {
meml_write8(seg, off, (REG8)dat);	meml_write8(seg, off, (REG8)dat);
Line 1257 void MEMCALL meml_write16(UINT seg, UINT	Line 1254 void MEMCALL meml_write16(UINT seg, UINT

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

UINT32 adrs;	UINT32 addr;
	UINT rem;
UINT size;	UINT size;

while(leng) {	while(leng) {
off = LOW16(off);	off = LOW16(off);
adrs = (seg << 4) + off;	addr = (seg << 4) + off;
size = 0x1000 - (adrs & 0xfff);	rem = 0x10000 - off;
size = min(size, leng);	size = min(leng, rem);
size = min(size, 0x10000 - off);	if (CPU_STAT_PAGING) {
memp_read(physicaladdr(adrs), dat, size);	rem = 0x1000 - (addr & 0xfff);
	size = min(size, rem);
	addr = physicaladdr(addr, FALSE);
	}
	memp_read(addr, dat, size);
off += size;	off += size;
dat = ((BYTE *)dat) + size;	dat = ((BYTE *)dat) + size;
leng -= size;	leng -= size;
Line 1275 void MEMCALL meml_readstr(UINT seg, UINT	Line 1277 void MEMCALL meml_readstr(UINT seg, UINT

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

UINT32 adrs;	UINT32 addr;
	UINT rem;
UINT size;	UINT size;

while(leng) {	while(leng) {
off = LOW16(off);	off = LOW16(off);
adrs = (seg << 4) + off;	addr = (seg << 4) + off;
size = 0x1000 - (adrs & 0xfff);	rem = 0x10000 - off;
size = min(size, leng);	size = min(leng, rem);
size = min(size, 0x10000 - off);	if (CPU_STAT_PAGING) {
memp_write(physicaladdr(adrs), dat, size);	rem = 0x1000 - (addr & 0xfff);
	size = min(size, rem);
	addr = physicaladdr(addr, TRUE);
	}
	memp_write(addr, dat, size);
off += size;	off += size;
dat = ((BYTE *)dat) + size;	dat = ((BYTE *)dat) + size;
leng -= size;	leng -= size;
Line 1302 void MEMCALL meml_read(UINT32 address, v	Line 1309 void MEMCALL meml_read(UINT32 address, v
while(leng) {	while(leng) {
size = 0x1000 - (address & 0xfff);	size = 0x1000 - (address & 0xfff);
size = min(size, leng);	size = min(size, leng);
memp_read(physicaladdr(address), dat, size);	memp_read(physicaladdr(address, FALSE), dat, size);
address += size;	address += size;
dat = ((BYTE *)dat) + size;	dat = ((BYTE *)dat) + size;
leng -= size;	leng -= size;
Line 1321 void MEMCALL meml_write(UINT32 address,	Line 1328 void MEMCALL meml_write(UINT32 address,
while(leng) {	while(leng) {
size = 0x1000 - (address & 0xfff);	size = 0x1000 - (address & 0xfff);
size = min(size, leng);	size = min(size, leng);
memp_write(physicaladdr(address), dat, size);	memp_write(physicaladdr(address, TRUE), dat, size);
address += size;	address += size;
dat = ((BYTE *)dat) + size;	dat = ((BYTE *)dat) + size;
leng -= size;	leng -= size;

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

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