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

Debugger must use CPU memory functions now, in preparation for paging

Browse source
This commit is contained in:
Jeff Parsons 2015-05-05 16:16:57 -07:00 • committed by jeffpar
commit f36b79cd25
4 changed files with 138 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

49
modules/pcjs/lib/debugger.js
View file

@ -1513,10 +1513,10 @@ if (DEBUGGER) {
{
this.println("id physaddr blkaddr used size type");
this.println("-------- --------- -------- ------ ------ ----");
for (var i = 0; i < this.bus.aMemBlocks.length; i++) {
var block = this.bus.aMemBlocks[i];
for (var i = 0; i < this.cpu.aMemBlocks.length; i++) {
var block = this.cpu.aMemBlocks[i];
if (block.type === Memory.TYPE.NONE) continue;
this.println(str.toHex(block.id) + " %" + str.toHex(i << this.bus.blockShift) + ": " + str.toHex(block.addr) + " " + str.toHexWord(block.used) + " " + str.toHexWord(block.size) + " " + Memory.TYPE.NAMES[block.type]);
this.println(str.toHex(block.id) + " %" + str.toHex(i << this.cpu.blockShift) + ": " + str.toHex(block.addr) + " " + str.toHexWord(block.used) + " " + str.toHexWord(block.size) + " " + Memory.TYPE.NAMES[block.type]);
}
};
@ -1636,7 +1636,7 @@ if (DEBUGGER) {
for (var sField in Debugger.aTSSFields) {
var off = Debugger.aTSSFields[sField];
var ch = (sField.length < 8? ' ' : '');
var w = this.bus.getShortDirect(seg.base + off);
var w = this.cpu.getShort(seg.base + off);
if (sDump) sDump += '\n';
sDump += str.toHexWord(off) + " " + sField + ": " + ch + str.toHexWord(w);
}
@ -2450,7 +2450,7 @@ if (DEBUGGER) {
*/
if (nState >= 0 && this.aaOpcodeCounts.length) {
this.cInstructions++;
var bOpcode = this.bus.getByteDirect(addr);
var bOpcode = this.cpu.getByte(addr);
this.aaOpcodeCounts[bOpcode][1]++;
var a = this.aOpcodeHistory[this.iOpcodeHistory];
a[0] = this.cpu.getIP();
@ -2602,8 +2602,7 @@ if (DEBUGGER) {
/**
* getByte(aAddr, inc)
*
* getByte() should be used for all Debugger memory reads (eg, doDump, doUnassemble), to ensure
* all notification handlers are bypassed for physical addresses.
* We must route all our memory requests through the CPU now, in case paging is enabled.
*
* @this {Debugger}
* @param {Array} aAddr
@ -2615,8 +2614,9 @@ if (DEBUGGER) {
var b = 0xff;
var addr = this.getAddr(aAddr, false, 1);
if (addr !== X86.ADDR_INVALID) {
b = this.bus.getByteDirect(addr);
this.assert((b == (b & 0xff)), "invalid byte (" + b + ") at address: " + this.hexAddr(aAddr));
this.nSuppress++;
b = this.cpu.getByte(addr);
this.nSuppress--;
if (inc !== undefined) this.incAddr(aAddr, inc);
}
return b;
@ -2651,8 +2651,9 @@ if (DEBUGGER) {
var w = 0xffff;
var addr = this.getAddr(aAddr, false, 2);
if (addr !== X86.ADDR_INVALID) {
w = this.bus.getShortDirect(addr);
this.assert((w == (w & 0xffff)), "invalid word (" + w + ") at address: " + this.hexAddr(aAddr));
this.nSuppress++;
w = this.cpu.getShort(addr);
this.nSuppress--;
if (inc !== undefined) this.incAddr(aAddr, inc);
}
return w;
@ -2671,7 +2672,9 @@ if (DEBUGGER) {
var l = -1;
var addr = this.getAddr(aAddr, false, 4);
if (addr !== X86.ADDR_INVALID) {
l = this.bus.getLongDirect(addr);
this.nSuppress++;
l = this.cpu.getLong(addr);
this.nSuppress--;
if (inc !== undefined) this.incAddr(aAddr, inc);
}
return l;
@ -2680,10 +2683,6 @@ if (DEBUGGER) {
/**
* setByte(aAddr, b, inc)
*
* setByte() should be used for all Debugger memory writes (eg, doAssemble, doEdit), to insure
* all memory notification handlers are bypassed; in addition, we want the Debugger to be able to
* change the contents of the simulated ROM images.
*
* @this {Debugger}
* @param {Array} aAddr
* @param {number} b
@ -2693,7 +2692,9 @@ if (DEBUGGER) {
{
var addr = this.getAddr(aAddr, true, 1);
if (addr !== X86.ADDR_INVALID) {
this.bus.setByteDirect(addr, b);
this.nSuppress++;
this.cpu.setByte(addr, b);
this.nSuppress--;
if (inc !== undefined) this.incAddr(aAddr, inc);
this.cpu.updateCPU();
}
@ -2711,7 +2712,9 @@ if (DEBUGGER) {
{
var addr = this.getAddr(aAddr, true, 2);
if (addr !== X86.ADDR_INVALID) {
this.bus.setShortDirect(addr, w);
this.nSuppress++;
this.cpu.setShort(addr, w);
this.nSuppress--;
if (inc !== undefined) this.incAddr(aAddr, inc);
this.cpu.updateCPU();
}
@ -2738,6 +2741,7 @@ if (DEBUGGER) {
}
}
this.aBreakWrite = ["write"];
this.nSuppress = 0;
};
/**
@ -2921,6 +2925,8 @@ if (DEBUGGER) {
*/
Debugger.prototype.checkBreakpoint = function(addr, aBreak, fTemp)
{
if (this.nSuppress) return false;
/*
* Time to check for execution breakpoints; note that this should be done BEFORE updating frequency
* or history data (see checkInstruction), since we might not actually execute the current instruction.
@ -3536,8 +3542,8 @@ if (DEBUGGER) {
*/
Debugger.prototype.parseAddr = function(sAddr, type)
{
var aAddr;
var aAddrNext = (type == Debugger.ADDR_DATA? this.aAddrNextData : this.aAddrNextCode);
var off = aAddrNext[0], seg = aAddrNext[1], addr = aAddrNext[2];
if (sAddr !== undefined) {
@ -3549,7 +3555,7 @@ if (DEBUGGER) {
addr = 0;
}
var aAddr = this.findSymbolAddr(sAddr);
aAddr = this.findSymbolAddr(sAddr);
if (aAddr && aAddr.length) return aAddr;
var iColon = sAddr.indexOf(":");
@ -3567,7 +3573,8 @@ if (DEBUGGER) {
addr = null;
}
}
var aAddr = [off, seg, addr];
aAddr = [off, seg, addr];
this.checkLimit(aAddr);
return aAddr;
};

2
modules/pcjs/lib/x86func.js
View file

@ -3643,7 +3643,7 @@ X86.fnPageFault = function(addr, fPresent, fWrite)
X86.fnFaultMessage = function(nFault, nError, fHalt)
{
var bitsMessage = Messages.FAULT;
var bOpcode = this.bus.getByteDirect(this.regLIP);
var bOpcode = this.getByte(this.regLIP);
/*
* OS/2 1.0 uses an INT3 (0xCC) opcode in conjunction with an invalid IDT to trigger a triple-fault

21
modules/pcjs/lib/x86seg.js
View file

@ -605,6 +605,13 @@ X86Seg.prototype.loadDesc8 = function(addrDesc, sel, fSuppress)
var fGate, regPSMask, nFaultError, regSP;
var rpl = sel & X86.SEL.RPL;
var dpl = (acc & X86.DESC.ACC.DPL.MASK) >> X86.DESC.ACC.DPL.SHIFT;
if (selMasked && !(acc & X86.DESC.ACC.PRESENT)) {
if (!fSuppress) X86.fnFault.call(cpu, X86.EXCEPTION.NP_FAULT, sel);
base = X86.ADDR_INVALID;
break;
}
/*
* Since we are X86Seg.ID.CODE, we can use this.cpl instead of the more generic cpu.segCS.cpl
*/
@ -713,7 +720,12 @@ X86Seg.prototype.loadDesc8 = function(addrDesc, sel, fSuppress)
}
else if (this.id == X86Seg.ID.DATA) {
if (selMasked) {
if (type < X86.DESC.ACC.TYPE.DATA_READONLY || (type & (X86.DESC.ACC.TYPE.CODE | X86.DESC.ACC.TYPE.READABLE)) == X86.DESC.ACC.TYPE.CODE) {
if (!(acc & X86.DESC.ACC.PRESENT)) {
if (!fSuppress) X86.fnFault.call(cpu, X86.EXCEPTION.NP_FAULT, sel);
base = X86.ADDR_INVALID;
break;
}
if (type < X86.DESC.ACC.TYPE.SEG || (type & (X86.DESC.ACC.TYPE.CODE | X86.DESC.ACC.TYPE.READABLE)) == X86.DESC.ACC.TYPE.CODE) {
/*
* OS/2 1.0 triggers this "Empty Descriptor" GP_FAULT multiple times during boot; eg:
*
@ -742,7 +754,12 @@ X86Seg.prototype.loadDesc8 = function(addrDesc, sel, fSuppress)
}
}
else if (this.id == X86Seg.ID.STACK) {
if (!selMasked || type < X86.DESC.ACC.TYPE.DATA_READONLY || (type & (X86.DESC.ACC.TYPE.CODE | X86.DESC.ACC.TYPE.READABLE)) == X86.DESC.ACC.TYPE.CODE) {
if (!(acc & X86.DESC.ACC.PRESENT)) {
if (!fSuppress) X86.fnFault.call(cpu, X86.EXCEPTION.SS_FAULT, sel);
base = X86.ADDR_INVALID;
break;
}
if (!selMasked || type < X86.DESC.ACC.TYPE.SEG || (type & (X86.DESC.ACC.TYPE.CODE | X86.DESC.ACC.TYPE.WRITABLE)) != X86.DESC.ACC.TYPE.WRITABLE) {
if (!fSuppress) X86.fnFault.call(cpu, X86.EXCEPTION.GP_FAULT, sel, true);
base = X86.ADDR_INVALID;
break;