Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed physical memory breakpoints when paging enabled

Browse source
This commit is contained in:
Jeff Parsons 2016-01-31 11:23:13 -08:00
commit e20cb1d0e3
28 changed files with 8248 additions and 1237 deletions
Download patch file Download diff file Expand all files Collapse all files

51
modules/pcjs/lib/x86cpu.js
View file

@ -298,7 +298,7 @@ X86CPU.prototype.setAddressMask = function(nBusMask)
};
/**
* addMemBreak(addr, fWrite, fLinear)
* addMemBreak(addr, fWrite, fPhysical)
*
* NOTE: addMemBreak() could be merged with addMemCheck(), but the new merged interface would
* have to provide one additional parameter indicating whether the Debugger or the CPU is the client.
@ -308,19 +308,24 @@ X86CPU.prototype.setAddressMask = function(nBusMask)
* @this {X86CPU}
* @param {number} addr
* @param {boolean} fWrite is true for a memory write breakpoint, false for a memory read breakpoint
* @param {boolean} [fLinear] (true for linear breakpoint, false for physical)
* @param {boolean} [fPhysical] (true for physical breakpoint, false for linear)
*/
X86CPU.prototype.addMemBreak = function(addr, fWrite, fLinear)
X86CPU.prototype.addMemBreak = function(addr, fWrite, fPhysical)
{
if (DEBUGGER) {
var iBlock = addr >>> this.nBlockShift;
var aBlocks = (fLinear? this.aMemBlocks : this.aBusBlocks);
var aBlocks = (fPhysical? this.aBusBlocks : this.aMemBlocks);
aBlocks[iBlock].addBreakpoint(addr & this.nBlockLimit, fWrite);
/*
* When a physical memory breakpoint is added, a fresh setPhysBlock() call is REQUIRED for any
* linear mappings to that address. This is a bit of a sledgehammer solution, but at least it's a solution.
*/
if (fPhysical) this.flushPageBlocks();
}
};
/**
* removeMemBreak(addr, fWrite, fLinear)
* removeMemBreak(addr, fWrite, fPhysical)
*
* NOTE: removeMemBreak() could be merged with removeMemCheck(), but the new merged interface would
* have to provide one additional parameter indicating whether the Debugger or the CPU is the client.
@ -330,14 +335,19 @@ X86CPU.prototype.addMemBreak = function(addr, fWrite, fLinear)
* @this {X86CPU}
* @param {number} addr
* @param {boolean} fWrite is true for a memory write breakpoint, false for a memory read breakpoint
* @param {boolean} [fLinear] (true for linear breakpoint, false for physical)
* @param {boolean} [fPhysical] (true for physical breakpoint, false for linear)
*/
X86CPU.prototype.removeMemBreak = function(addr, fWrite, fLinear)
X86CPU.prototype.removeMemBreak = function(addr, fWrite, fPhysical)
{
if (DEBUGGER) {
var iBlock = addr >>> this.nBlockShift;
var aBlocks = (fLinear? this.aMemBlocks : this.aBusBlocks);
var aBlocks = (fPhysical? this.aBusBlocks : this.aMemBlocks);
aBlocks[iBlock].removeBreakpoint(addr & this.nBlockLimit, fWrite);
/*
* When a physical memory breakpoint is removed, a fresh setPhysBlock() call is RECOMMENDED for any
* linear mappings to that address. This is a bit of a sledgehammer solution, but at least it's a solution.
*/
if (fPhysical) this.flushPageBlocks();
}
};
@ -456,6 +466,17 @@ X86CPU.prototype.enablePageBlocks = function()
this.aBlocksPaged = [];
};
/**
* flushPageBlocks()
*
* @this {X86CPU}
*/
X86CPU.prototype.flushPageBlocks = function()
{
if (this.regCR0 & X86.CR0.PG) this.enablePageBlocks();
}
/**
* acquirePageBlock(addr)
*
@ -2988,7 +3009,7 @@ X86CPU.prototype.setBinding = function(sHTMLType, sBinding, control)
};
/**
* probeAddr(addr, size, fLinear)
* probeAddr(addr, size, fPhysical)
*
* Used by the Debugger to probe addresses without risk of triggering a page fault, and by internal
* functions, like fnCheckFault(), that must also avoid triggering faults, since they're not part of
@ -3002,12 +3023,12 @@ X86CPU.prototype.setBinding = function(sHTMLType, sBinding, control)
* @this {X86CPU}
* @param {number} addr is a linear address
* @param {number} [size] is a length (default is 1; if specified, must be 1, 2 or 4)
* @param {boolean} [fLinear] (true for linear probe, false for physical; linear is the default)
* @param {boolean} [fPhysical] (true for physical probe, false for linear; linear is the default)
* @return {number|null} value at the specified address, or null if invalid
*/
X86CPU.prototype.probeAddr = function(addr, size, fLinear)
X86CPU.prototype.probeAddr = function(addr, size, fPhysical)
{
var aBlocks = (fLinear === false? this.aBusBlocks : this.aMemBlocks);
var aBlocks = (fPhysical? this.aBusBlocks : this.aMemBlocks);
var block = aBlocks[(addr & this.nMemMask) >>> this.nBlockShift];
if (block && block.type == Memory.TYPE.UNPAGED) block = this.mapPageBlock(addr, false, true);
@ -3020,16 +3041,16 @@ X86CPU.prototype.probeAddr = function(addr, size, fLinear)
if (off < this.nBlockLimit) {
return block.readShortDirect(off, addr);
}
return block.readByteDirect(off, addr) | (this.probeAddr(addr + 1, 1, fLinear) << 8);
return block.readByteDirect(off, addr) | (this.probeAddr(addr + 1, 1, fPhysical) << 8);
}
if (size == 4) {
if (off < this.nBlockLimit - 2) {
return block.readLongDirect(off, addr);
}
if (off == this.nBlockLimit - 1) {
return block.readShortDirect(off, addr) | (this.probeAddr(addr + 2, 2, fLinear) << 16);
return block.readShortDirect(off, addr) | (this.probeAddr(addr + 2, 2, fPhysical) << 16);
}
return block.readByteDirect(off, addr) | (this.probeAddr(addr + 1, 1, fLinear) << 8) | (this.probeAddr(addr + 2, 1, fLinear) << 16) | (this.probeAddr(addr + 3, 1, fLinear) << 24);
return block.readByteDirect(off, addr) | (this.probeAddr(addr + 1, 1, fPhysical) << 8) | (this.probeAddr(addr + 2, 1, fPhysical) << 16) | (this.probeAddr(addr + 3, 1, fPhysical) << 24);
}
}