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

Fix restartability of POP [mem] when a page fault occurs

Browse source
This commit is contained in:
Jeff Parsons 2015-10-22 18:00:16 -07:00
commit 823c9062ed
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/pcjs/lib/x86ops.js
View file

@ -2361,6 +2361,13 @@ X86.opPOPmw = function POPmw()
* Like other MOV operations, the destination does not need to be read, just written. * Like other MOV operations, the destination does not need to be read, just written.
*/ */
this.opFlags |= X86.OPFLAG.NOREAD; this.opFlags |= X86.OPFLAG.NOREAD;
/*
* If the word we're about to pop FROM the stack gets popped INTO a not-present page, this
* instruction will not be restartable unless we snapshot regLSP first.
*/
this.opLSP = this.regLSP;
/* /*
* A "clever" instruction like this: * A "clever" instruction like this:
* *
@ -2376,7 +2383,9 @@ X86.opPOPmw = function POPmw()
* BEFORE the push, which occurs through our normal ModRM processing. * BEFORE the push, which occurs through our normal ModRM processing.
*/ */
this.regXX = this.popWord(); this.regXX = this.popWord();
this.aOpModGrpWord[this.getIPByte()].call(this, X86.aOpGrpPOPw, X86.fnSRCxx); this.aOpModGrpWord[this.getIPByte()].call(this, X86.aOpGrpPOPw, X86.fnSRCxx);
this.opLSP = X86.ADDR_INVALID;
}; };
/** /**