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

Fix pushing/popping at the limits of the stack segment

Browse source
This commit is contained in:
Jeff Parsons 2015-06-02 15:39:13 -07:00
commit badaaa307e
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3542,8 +3542,8 @@ X86CPU.prototype.popWord = function()
* There's no such thing as an SS fault on the 8086/8088, and I'm assuming that, on newer
* processors, when the stack segment limit is set to the maximum, it's OK for the stack to wrap.
*/
if (this.model <= X86.MODEL_8088 || this.segSS.limit == this.segSS.addrMask) {
this.setSP(this.regLSP - this.segSS.base);
if (this.model <= X86.MODEL_8088 || !this.segSS.fExpDown && this.segSS.limit == this.segSS.addrMask || this.segSS.fExpDown && !this.segSS.limit) {
this.setSP((this.regLSP - this.segSS.base) & this.segSS.addrMask);
} else if (off < -1) { // fudge factor
X86.fnFault.call(this, X86.EXCEPTION.SS_FAULT, 0);
}
@ -3570,11 +3570,10 @@ X86CPU.prototype.pushWord = function(w)
if (((this.regLSP - this.regLSPLimitLow)|0) < 0 && (this.regLSPLimitLow ^ this.regLSP) >= 0) {
/*
* There's no such thing as an SS fault on the 8086/8088, and I'm assuming that, on newer
* processors, when the stack segment is expand-down and the limit is set to the "maximum" of
* zero, it's OK for the stack to wrap.
* processors, when the stack segment limit is set to the maximum, it's OK for the stack to wrap.
*/
if (this.model <= X86.MODEL_8088 || this.segSS.fExpDown && !this.segSS.limit) {
this.setSP(this.regLSP - this.segSS.base);
if (this.model <= X86.MODEL_8088 || !this.segSS.fExpDown && this.segSS.limit == this.segSS.addrMask || this.segSS.fExpDown && !this.segSS.limit) {
this.setSP((this.regLSP - this.segSS.base) & this.segSS.addrMask);
} else {
X86.fnFault.call(this, X86.EXCEPTION.SS_FAULT, 0);
}