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

Fixed 32-bit INC, DEC, NEG, NOT, TEST, MOVSB and MOVSW

Browse source 
(several things that slipped through the cracks during 32-bit development)
This commit is contained in:
Jeff Parsons 2015-07-16 13:14:34 -07:00
commit 31e316d636
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -448,9 +448,9 @@ X86.fnDECb = function DECb(dst, src)
*/ */
X86.fnDECr = function DECr(w) X86.fnDECr = function DECr(w)
{ {
var result = ((w & this.dataMask) - 1)|0; var result = (w - 1)|0;
this.setArithResult(w, 1, result, X86.RESULT.WORD | X86.RESULT.NOTCF, true); this.setArithResult(w, 1, result, this.dataType | X86.RESULT.NOTCF, true);
this.nStepCycles -= 2; // the register form of INC takes 2 cycles on all CPUs this.nStepCycles -= 2; // the register form of DEC takes 2 cycles on all CPUs
return (w & ~this.dataMask) | (result & this.dataMask); return (w & ~this.dataMask) | (result & this.dataMask);
}; };
@ -465,9 +465,9 @@ X86.fnDECr = function DECr(w)
X86.fnDECw = function DECw(dst, src) X86.fnDECw = function DECw(dst, src)
{ {
var w = (dst - 1)|0; var w = (dst - 1)|0;
this.setArithResult(dst, 1, w, X86.RESULT.WORD | X86.RESULT.NOTCF, true); this.setArithResult(dst, 1, w, this.dataType | X86.RESULT.NOTCF, true);
this.nStepCycles -= (this.regEA === X86.ADDR_INVALID? this.cycleCounts.nOpCyclesIncR : this.cycleCounts.nOpCyclesIncM); this.nStepCycles -= (this.regEA === X86.ADDR_INVALID? this.cycleCounts.nOpCyclesIncR : this.cycleCounts.nOpCyclesIncM);
return w & 0xffff; return w & this.dataMask;
}; };
/** /**
@ -1168,8 +1168,8 @@ X86.fnINCb = function INCb(dst, src)
*/ */
X86.fnINCr = function INCr(w) X86.fnINCr = function INCr(w)
{ {
var result = ((w & this.dataMask) + 1)|0; var result = (w + 1)|0;
this.setArithResult(w, 1, result, X86.RESULT.WORD | X86.RESULT.NOTCF); this.setArithResult(w, 1, result, this.dataType | X86.RESULT.NOTCF);
this.nStepCycles -= 2; // the register form of INC takes 2 cycles on all CPUs this.nStepCycles -= 2; // the register form of INC takes 2 cycles on all CPUs
return (w & ~this.dataMask) | (result & this.dataMask); return (w & ~this.dataMask) | (result & this.dataMask);
}; };
@ -1185,9 +1185,9 @@ X86.fnINCr = function INCr(w)
X86.fnINCw = function INCw(dst, src) X86.fnINCw = function INCw(dst, src)
{ {
var w = (dst + 1)|0; var w = (dst + 1)|0;
this.setArithResult(dst, 1, w, X86.RESULT.WORD | X86.RESULT.NOTCF); this.setArithResult(dst, 1, w, this.dataType | X86.RESULT.NOTCF);
this.nStepCycles -= (this.regEA === X86.ADDR_INVALID? this.cycleCounts.nOpCyclesIncR : this.cycleCounts.nOpCyclesIncM); this.nStepCycles -= (this.regEA === X86.ADDR_INVALID? this.cycleCounts.nOpCyclesIncR : this.cycleCounts.nOpCyclesIncM);
return w & 0xffff; return w & this.dataMask;
}; };
/** /**
@ -1858,9 +1858,9 @@ X86.fnNEGb = function NEGb(dst, src)
X86.fnNEGw = function NEGw(dst, src) X86.fnNEGw = function NEGw(dst, src)
{ {
var w = (-dst)|0; var w = (-dst)|0;
this.setArithResult(0, dst, w, X86.RESULT.WORD | X86.RESULT.ALL, true); this.setArithResult(0, dst, w, this.dataType | X86.RESULT.ALL, true);
this.nStepCycles -= (this.regEA === X86.ADDR_INVALID? this.cycleCounts.nOpCyclesNegR : this.cycleCounts.nOpCyclesNegM); this.nStepCycles -= (this.regEA === X86.ADDR_INVALID? this.cycleCounts.nOpCyclesNegR : this.cycleCounts.nOpCyclesNegM);
return w & 0xffff; return w & this.dataMask;
}; };
/** /**
@ -1888,7 +1888,7 @@ X86.fnNOTb = function NOTb(dst, src)
X86.fnNOTw = function NOTw(dst, src) X86.fnNOTw = function NOTw(dst, src)
{ {
this.nStepCycles -= (this.regEA === X86.ADDR_INVALID? this.cycleCounts.nOpCyclesNegR : this.cycleCounts.nOpCyclesNegM); this.nStepCycles -= (this.regEA === X86.ADDR_INVALID? this.cycleCounts.nOpCyclesNegR : this.cycleCounts.nOpCyclesNegM);
return dst ^ 0xffff; return dst ^ this.dataMask;
}; };
/** /**
@ -3169,14 +3169,14 @@ X86.fnSUBw = function SUBw(dst, src)
}; };
/** /**
* fnTEST8(dst, src) * fnTESTib(dst, src)
* *
* @this {X86CPU} * @this {X86CPU}
* @param {number} dst * @param {number} dst
* @param {number} src (null; we have to supply the source ourselves) * @param {number} src (null; we have to supply the source ourselves)
* @return {number} * @return {number}
*/ */
X86.fnTEST8 = function TEST8(dst, src) X86.fnTESTib = function TESTib(dst, src)
{ {
src = this.getIPByte(); src = this.getIPByte();
this.setLogicResult(dst & src, X86.RESULT.BYTE); this.setLogicResult(dst & src, X86.RESULT.BYTE);
@ -3186,17 +3186,17 @@ X86.fnTEST8 = function TEST8(dst, src)
}; };
/** /**
* fnTEST16(dst, src) * fnTESTiw(dst, src)
* *
* @this {X86CPU} * @this {X86CPU}
* @param {number} dst * @param {number} dst
* @param {number} src (null; we have to supply the source ourselves) * @param {number} src (null; we have to supply the source ourselves)
* @return {number} * @return {number}
*/ */
X86.fnTEST16 = function TEST16(dst, src) X86.fnTESTiw = function TESTiw(dst, src)
{ {
src = this.getIPWord(); src = this.getIPWord();
this.setLogicResult(dst & src, X86.RESULT.WORD); this.setLogicResult(dst & src, this.dataType);
this.nStepCycles -= (this.regEA === X86.ADDR_INVALID? this.cycleCounts.nOpCyclesTestRI : this.cycleCounts.nOpCyclesTestMI); this.nStepCycles -= (this.regEA === X86.ADDR_INVALID? this.cycleCounts.nOpCyclesTestRI : this.cycleCounts.nOpCyclesTestMI);
this.opFlags |= X86.OPFLAG.NOWRITE; this.opFlags |= X86.OPFLAG.NOWRITE;
return dst; return dst;
@ -3228,7 +3228,7 @@ X86.fnTESTb = function TESTb(dst, src)
*/ */
X86.fnTESTw = function TESTw(dst, src) X86.fnTESTw = function TESTw(dst, src)
{ {
this.setLogicResult(dst & src, X86.RESULT.WORD); this.setLogicResult(dst & src, this.dataType);
this.nStepCycles -= (this.regEAWrite === X86.ADDR_INVALID? (this.regEA === X86.ADDR_INVALID? this.cycleCounts.nOpCyclesTestRR : this.cycleCounts.nOpCyclesTestRM) : this.cycleCounts.nOpCyclesTestRM); this.nStepCycles -= (this.regEAWrite === X86.ADDR_INVALID? (this.regEA === X86.ADDR_INVALID? this.cycleCounts.nOpCyclesTestRR : this.cycleCounts.nOpCyclesTestRM) : this.cycleCounts.nOpCyclesTestRM);
this.opFlags |= X86.OPFLAG.NOWRITE; this.opFlags |= X86.OPFLAG.NOWRITE;
return dst; return dst;

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

@ -2549,7 +2549,7 @@ X86.opMOVSb = function MOVSb()
} }
if (nReps--) { if (nReps--) {
var nInc = ((this.regPS & X86.PS.DF)? -1 : 1); var nInc = ((this.regPS & X86.PS.DF)? -1 : 1);
this.setSOByte(this.segES, this.regEDI & this.addrMask, this.getSOByte(this.segData, this.regESI)); this.setSOByte(this.segES, this.regEDI & this.addrMask, this.getSOByte(this.segData, this.regESI & this.addrMask));
this.regESI = (this.regESI & ~this.addrMask) | ((this.regESI + nInc) & this.addrMask); this.regESI = (this.regESI & ~this.addrMask) | ((this.regESI + nInc) & this.addrMask);
this.regEDI = (this.regEDI & ~this.addrMask) | ((this.regEDI + nInc) & this.addrMask); this.regEDI = (this.regEDI & ~this.addrMask) | ((this.regEDI + nInc) & this.addrMask);
this.nStepCycles -= nCycles; this.nStepCycles -= nCycles;
@ -2584,7 +2584,7 @@ X86.opMOVSw = function MOVSw()
} }
if (nReps--) { if (nReps--) {
var nInc = ((this.regPS & X86.PS.DF)? -this.dataSize : this.dataSize); var nInc = ((this.regPS & X86.PS.DF)? -this.dataSize : this.dataSize);
this.setSOWord(this.segES, this.regEDI & this.addrMask, this.getSOWord(this.segData, this.regESI)); this.setSOWord(this.segES, this.regEDI & this.addrMask, this.getSOWord(this.segData, this.regESI & this.addrMask));
this.regESI = (this.regESI & ~this.addrMask) | ((this.regESI + nInc) & this.addrMask); this.regESI = (this.regESI & ~this.addrMask) | ((this.regESI + nInc) & this.addrMask);
this.regEDI = (this.regEDI & ~this.addrMask) | ((this.regEDI + nInc) & this.addrMask); this.regEDI = (this.regEDI & ~this.addrMask) | ((this.regEDI + nInc) & this.addrMask);
this.nStepCycles -= nCycles; this.nStepCycles -= nCycles;
@ -4210,12 +4210,12 @@ X86.aOpGrp2d = [
]; ];
X86.aOpGrp3b = [ X86.aOpGrp3b = [
X86.fnTEST8, X86.fnGRPUndefined, X86.fnNOTb, X86.fnNEGb, // 0xF6(reg=0x0-0x3) X86.fnTESTib, X86.fnGRPUndefined, X86.fnNOTb, X86.fnNEGb, // 0xF6(reg=0x0-0x3)
X86.fnMULb, X86.fnIMULb, X86.fnDIVb, X86.fnIDIVb // 0xF6(reg=0x4-0x7) X86.fnMULb, X86.fnIMULb, X86.fnDIVb, X86.fnIDIVb // 0xF6(reg=0x4-0x7)
]; ];
X86.aOpGrp3w = [ X86.aOpGrp3w = [
X86.fnTEST16, X86.fnGRPUndefined, X86.fnNOTw, X86.fnNEGw, // 0xF7(reg=0x0-0x3) X86.fnTESTiw, X86.fnGRPUndefined, X86.fnNOTw, X86.fnNEGw, // 0xF7(reg=0x0-0x3)
X86.fnMULw, X86.fnIMULw, X86.fnDIVw, X86.fnIDIVw // 0xF7(reg=0x4-0x7) X86.fnMULw, X86.fnIMULw, X86.fnDIVw, X86.fnIDIVw // 0xF7(reg=0x4-0x7)
]; ];