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

Success running standard-mode Windows under WDEB386

Browse source
This commit is contained in:
Jeff Parsons 2015-08-08 09:09:36 -07:00
commit f72b8ddeaf
2 changed files with 24 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1712,22 +1712,19 @@ if (DEBUGGER) {
*
* @this {Debugger}
* @param {{DbgAddr}} dbgAddr
* @return {boolean}
*/
Debugger.prototype.checkLimit = function(dbgAddr)
{
if (dbgAddr.sel != null) {
var seg = this.getSegment(dbgAddr.sel, dbgAddr.fProt);
if (seg) {
dbgAddr.off &= seg.addrMask;
if ((dbgAddr.off >>> 0) >= seg.offMax) {
/*
* TODO: This automatic wrap-to-zero is OK for normal segments, but for expand-down segments, not so much.
*/
dbgAddr.off = 0;
dbgAddr.addr = null;
}
var off = dbgAddr.off & seg.addrMask;
if ((off >>> 0) >= seg.offMax) return false;
dbgAddr.off = off;
}
}
return true;
};
/**
@ -1745,7 +1742,10 @@ if (DEBUGGER) {
}
if (dbgAddr.sel != null) {
dbgAddr.off += inc;
this.checkLimit(dbgAddr);
if (!this.checkLimit(dbgAddr)) {
dbgAddr.off = 0;
dbgAddr.addr = null;
}
}
};
@ -4045,7 +4045,7 @@ if (DEBUGGER) {
}
dbgAddr = this.findSymbolAddr(sAddr);
if (dbgAddr && dbgAddr.off != null) return dbgAddr;
if (dbgAddr) return dbgAddr;
var iColon = sAddr.indexOf(":");
if (iColon < 0) {
@ -4066,7 +4066,10 @@ if (DEBUGGER) {
if (off != null) {
dbgAddr = this.newAddr(off, sel, addr);
if (!fNoChecks) this.checkLimit(dbgAddr);
if (!fNoChecks && !this.checkLimit(dbgAddr)) {
this.println("invalid offset: " + this.hexAddr(dbgAddr));
dbgAddr = null;
}
}
return dbgAddr;
};
@ -4372,13 +4375,12 @@ if (DEBUGGER) {
*
* @this {Debugger}
* @param {string} sSymbol
* @return {{DbgAddr}|null} a valid dbgAddr if a valid symbol, an empty dbgAddr if an unknown symbol, or null if not a symbol
* @return {{DbgAddr}|undefined}
*/
Debugger.prototype.findSymbolAddr = function(sSymbol)
{
var dbgAddr = null;
var dbgAddr;
if (sSymbol.match(/^[a-z_][a-z0-9_]*$/i)) {
dbgAddr = {};
var sUpperCase = sSymbol.toUpperCase();
for (var i = 0; i < this.aSymbolTable.length; i++) {
var addr = this.aSymbolTable[i][0];
@ -4395,10 +4397,7 @@ if (DEBUGGER) {
*/
var sel = symbol['s'];
if (sel === undefined) sel = addr >>> 4;
// dbgAddr = this.newAddr(off, sel);
dbgAddr.off = off;
dbgAddr.sel = sel;
if (symbol['p'] !== undefined) dbgAddr.addr = symbol['p'];
dbgAddr = this.newAddr(off, sel, symbol['p']);
}
/*
* The symbol matched, but it wasn't for an address (no "o" offset), and there's no point

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

@ -568,11 +568,15 @@ X86Seg.prototype.loadDesc8 = function(addrDesc, sel, fSuppress)
base = addrDesc = X86.ADDR_INVALID;
break;
}
this.fStackSwitch = true;
/*
* NOTE: We defer the actual stack switch to the end of this function, after we've called
* updateMode(), to ensure that the stack operations occur with the correct size information.
* It's critical that any stack switch occur with the operand size in effect at the time of
* the current instruction, BEFORE any calls to updateMode() and resetSizes(), otherwise the
* operand size (or operand override) in effect on an instruction like IRETD will be ignored.
*/
regSP = cpu.popWord();
cpu.setSS(cpu.popWord(), true);
cpu.setSP(regSP);
this.fStackSwitch = true;
}
fGate = false;
}
@ -787,16 +791,6 @@ X86Seg.prototype.loadDesc8 = function(addrDesc, sel, fSuppress)
this.ext = ext;
this.addrDesc = addrDesc;
this.updateMode(true, true, false);
if (fGate === false && this.fStackSwitch) {
/*
* NOTE: This is the deferred stack switch we mentioned above.
*/
cpu.resetSizes();
regSP = cpu.popWord();
cpu.setSS(cpu.popWord(), true);
cpu.setSP(regSP);
}
break;
}
if (!fSuppress) this.messageSeg(sel, base, limit, type, ext);