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

Updated COMPAQ MS-DOS READMEs, along with a few PCx86 debugger improvements

Browse source
This commit is contained in:
Jeff Parsons 2017-06-30 12:03:35 -07:00 • committed by Jeff Parsons
commit 3abd13e8ca
11 changed files with 1803 additions and 1656 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/pcx86/lib/bus.js
View file

@ -1071,7 +1071,7 @@ class Bus extends Component {
}
if (!fSymbol || fNearest) {
if (bto.obj.idComponent) {
return bto.obj.idComponent + '+' + Str.toHexLong(bto.off + off);
return bto.obj.idComponent + '+' + Str.toHex(bto.off + off, 0, true);
}
}
}

96
modules/pcx86/lib/debugger.js
View file

@ -166,9 +166,9 @@ class DebuggerX86 extends Debugger {
* Finally, for TEMPORARY breakpoint addresses, we set fTempBreak to true, so that they can be
* automatically cleared when they're hit.
*/
this.dbgAddrNextCode = this.newAddr();
this.dbgAddrNextData = this.newAddr();
this.dbgAddrAssemble = this.newAddr();
this.dbgAddrNextCode = this.newAddr(0, 0);
this.dbgAddrNextData = this.newAddr(0, 0);
this.dbgAddrAssemble = this.newAddr(0, 0);
/*
* aSymbolTable is an array of SymbolTable objects, one per ROM or other chunk of address space,
@ -1943,7 +1943,7 @@ class DebuggerX86 extends Debugger {
}
/**
* dumpHistory(sPrev, sLines)
* dumpHistory(sPrev, sLines, sComment)
*
* If sLines is not a number, it can be a instruction filter. However, for the moment, the only
* supported filter is "call", which filters the history buffer for all CALL and RET instructions
@ -1952,8 +1952,9 @@ class DebuggerX86 extends Debugger {
* @this {DebuggerX86}
* @param {string} [sPrev] is a (decimal) number of instructions to rewind to (default is 10)
* @param {string} [sLines] is a (decimal) number of instructions to print (default is, again, 10)
* @param {string} [sComment] (should be either "history" or "cycles"; default is "history")
*/
dumpHistory(sPrev, sLines)
dumpHistory(sPrev, sLines, sComment = "history")
{
var sMore = "";
var cHistory = 0;
@ -2021,10 +2022,8 @@ class DebuggerX86 extends Debugger {
*/
var dbgAddrNew = this.newAddr(dbgAddr.off, dbgAddr.sel, dbgAddr.addr, dbgAddr.type, dbgAddr.fData32, dbgAddr.fAddr32);
var sComment = "history";
var nSequence = nPrev--;
if (DEBUG && dbgAddr.cycleCount != null) {
sComment = "cycles";
if (dbgAddr.cycleCount != null && sComment == "cycles") {
nSequence = dbgAddr.cycleCount;
}
@ -2894,9 +2893,11 @@ class DebuggerX86 extends Debugger {
{
var state = new State(this);
state.set(0, this.packAddr(this.dbgAddrNextCode));
state.set(1, this.packAddr(this.dbgAddrAssemble));
state.set(2, [this.aPrevCmds, this.fAssemble, this.bitsMessage]);
state.set(3, this.aSymbolTable);
state.set(1, this.packAddr(this.dbgAddrNextData));
state.set(2, this.packAddr(this.dbgAddrAssemble));
state.set(3, [this.aPrevCmds, this.fAssemble, this.bitsMessage]);
state.set(4, this.aSymbolTable);
state.set(5, [this.aBreakExec, this.aBreakRead, this.aBreakWrite]);
return state.data();
}
@ -2912,15 +2913,27 @@ class DebuggerX86 extends Debugger {
restore(data)
{
var i = 0;
if (data[2] !== undefined) {
this.dbgAddrNextCode = this.unpackAddr(data[i++]);
this.dbgAddrAssemble = this.unpackAddr(data[i++]);
if (data[i]) this.dbgAddrNextCode = this.unpackAddr(data[i++]);
/*
* dbgAddrNextData wasn't saved until there were at least 6 elements, hence the check for data[5] instead of data[i]
*/
if (data[5]) this.dbgAddrNextData = this.unpackAddr(data[i++]);
if (data[i]) this.dbgAddrAssemble = this.unpackAddr(data[i++]);
if (data[i]) {
this.aPrevCmds = data[i][0];
if (typeof this.aPrevCmds == "string") this.aPrevCmds = [this.aPrevCmds];
this.fAssemble = data[i][1];
this.bitsMessage |= data[i][2]; // keep our current message bits set, and simply "add" any extra bits defined by the saved state
i++;
}
if (data[i]) {
this.aSymbolTable = data[i++];
}
if (data[i]) {
this.restoreBreakpoints(this.aBreakExec, data[i][0]);
this.restoreBreakpoints(this.aBreakRead, data[i][1]);
this.restoreBreakpoints(this.aBreakWrite, data[i][2]);
}
if (data[3]) this.aSymbolTable = data[3];
return true;
}
@ -3077,7 +3090,7 @@ class DebuggerX86 extends Debugger {
this.aaOpcodeCounts[bOpcode][1]++;
var dbgAddr = this.aOpcodeHistory[this.iOpcodeHistory];
this.setAddr(dbgAddr, cpu.getIP(), cpu.getCS());
if (DEBUG) dbgAddr.cycleCount = cpu.getCycles();
dbgAddr.cycleCount = cpu.getCycles();
if (++this.iOpcodeHistory == this.aOpcodeHistory.length) this.iOpcodeHistory = 0;
}
}
@ -3208,7 +3221,7 @@ class DebuggerX86 extends Debugger {
}
/**
* addBreakpoint(aBreak, dbgAddr, fTempBreak)
* addBreakpoint(aBreak, dbgAddr, fTempBreak, fQuiet)
*
* In case you haven't already figured this out, all our breakpoint commands use the address
* to identify a breakpoint, not an incrementally assigned breakpoint index like other debuggers;
@ -3232,9 +3245,10 @@ class DebuggerX86 extends Debugger {
* @param {Array} aBreak
* @param {DbgAddrX86} dbgAddr
* @param {boolean} [fTempBreak]
* @param {boolean} [fQuiet]
* @return {boolean} true if breakpoint added, false if already exists
*/
addBreakpoint(aBreak, dbgAddr, fTempBreak)
addBreakpoint(aBreak, dbgAddr, fTempBreak, fQuiet)
{
var fSuccess = true;
@ -3276,7 +3290,7 @@ class DebuggerX86 extends Debugger {
dbgAddr.fTempBreak = true;
}
else {
this.printBreakpoint(aBreak, aBreak.length-1, "set");
if (!fQuiet) this.printBreakpoint(aBreak, aBreak.length-1, "set");
this.historyInit();
}
}
@ -3363,6 +3377,22 @@ class DebuggerX86 extends Debugger {
this.println(aBreak[0] + ' ' + this.toHexAddr(dbgAddr) + (sAction? (' ' + sAction) : (dbgAddr.sCmd? (' "' + dbgAddr.sCmd + '"') : '')));
}
/**
* restoreBreakpoints(aBreak, aDbgAddr)
*
* @this {DebuggerX86}
* @param {Array} aBreak
* @param {Array} aDbgAddr
*/
restoreBreakpoints(aBreak, aDbgAddr)
{
if (aDbgAddr[0] != aBreak[0]) return;
for (var i = 1; i < aDbgAddr.length; i++) {
var dbgAddr = aDbgAddr[i];
this.addBreakpoint(aBreak, dbgAddr, dbgAddr.fTempBreak, true);
}
}
/**
* setTempBreakpoint(dbgAddr)
*
@ -4761,9 +4791,8 @@ class DebuggerX86 extends Debugger {
/**
* doDump(asArgs)
*
* The length parameter is interpreted as a number of bytes (in hex, by default).
* If the length is omitted/undefined, it defaults to 0x80 (128.) bytes, which normally
* translates to 8 lines of data.
* For memory dumps, the second parameter (sLen) is interpreted as a length (by default, in hex)
* only if it contains an 'l' prefix; otherwise it's interpreted as an ending address (inclusive).
*
* @this {DebuggerX86}
* @param {Array.<string>} asArgs (formerly sCmd, [sAddr], [sLen] and [sBytes])
@ -4878,12 +4907,10 @@ class DebuggerX86 extends Debugger {
}
}
if (!sAddr) sCmd = this.sCmdDumpPrev || "db";
} else {
this.sCmdDumpPrev = sCmd;
}
if (sCmd == "dh") {
this.dumpHistory(sAddr, sLen);
this.dumpHistory(sAddr, sLen, sBytes);
return;
}
@ -4900,16 +4927,27 @@ class DebuggerX86 extends Debugger {
return;
}
if (sCmd[1] && "bwd".indexOf(sCmd[1]) < 0) {
this.println("unrecognized dump command");
return;
}
this.sCmdDumpPrev = sCmd;
var dbgAddr = this.parseAddr(sAddr);
if (!dbgAddr || dbgAddr.sel == null && dbgAddr.addr == null) return;
var len = 0; // 0 is not a default; it triggers the appropriate default below
var len = 0;
if (sLen) {
if (sLen.charAt(0) == 'l') {
sLen = sLen.substr(1) || sBytes;
len = this.parseValue(sLen);
} else {
var dbgAddrEnd = this.parseAddr(sLen);
if (!dbgAddrEnd) return;
len = dbgAddrEnd.off - dbgAddr.off + 1;
}
len = this.parseValue(sLen) >>> 0; // negative lengths not allowed
if (len > 0x10000) len = 0x10000; // prevent bad user (or variable) input from producing excessive output
if (len < 0 || len > 0x10000) len = 0;
}
var sDump = "";
@ -4938,7 +4976,7 @@ class DebuggerX86 extends Debugger {
cb--;
}
if (sDump) sDump += '\n';
sDump += sAddr + " " + sData + ((i == 0)? (' ' + sChars) : "");
sDump += sAddr + " " + sData + Str.pad(sChars, sChars.length + i * 3 + 1, true);
}
if (sDump) this.println(sDump);

2
modules/shared/lib/diskapi.js
View file

@ -177,7 +177,7 @@ DiskAPI.GEOMETRIES = {
};
/*
* Media descriptor bytes for DOS-compatible FAT-formatted disks (stored in the first byte of the FAT)
* Media ID (descriptor) bytes for DOS-compatible FAT-formatted disks (stored in the first byte of the FAT)
*/
DiskAPI.FAT = {
MEDIA_160KB: 0xFE, // 5.25-inch, 1-sided, 8-sector, 40-track