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

Internal PSW getter/setter are now getPSW/setPSW

Browse source
This commit is contained in:
Jeff 2016-09-22 08:03:43 -07:00 • committed by Jeff Parsons
commit 122ca78fd5
5 changed files with 301 additions and 317 deletions
Download patch file Download diff file Expand all files Collapse all files

40
modules/pdp11/lib/cpustate.js
View file

@ -457,17 +457,6 @@ CPUStatePDP11.prototype.setPC = function(addr)
this.regsGen[7] = addr;
};
/**
* getPSW()
*
* @this {CPUStatePDP11}
* @return {number}
*/
CPUStatePDP11.prototype.getPSW = function()
{
return (this.PSW & ~PDP11.PSW.FLAGS) | (this.getNF() | this.getZF() | this.getVF() | this.getCF());
};
/**
* getSP()
*
@ -583,13 +572,20 @@ CPUStatePDP11.prototype.interrupt = function(delay, priority, vector, callback)
};
/**
* readPSW()
* getPSW()
*
* @this {CPUStatePDP11}
* @return {number}
*/
CPUStatePDP11.prototype.readPSW = function()
CPUStatePDP11.prototype.getPSW = function()
{
/*
* I'm not sure why this function can't simply be written as:
*
* return (this.PSW & ~PDP11.PSW.FLAGS) | (this.getNF() | this.getZF() | this.getVF() | this.getCF());
*
* but for now, I'm keeping the same masking logic as pdp11.js.
*/
var mask = PDP11.PSW.CMODE | PDP11.PSW.PMODE | PDP11.PSW.REGSET | PDP11.PSW.PRI | PDP11.PSW.TF;
return this.PSW = (this.PSW & mask) | this.getNF() | this.getZF() | this.getVF() | this.getCF();
};
@ -640,20 +636,6 @@ CPUStatePDP11.prototype.setPSW = function(newPSW)
this.PSW = newPSW;
};
/**
* writePSW(newPSW)
*
* This is a stricter version of setPSW(), used for writes to ADDR_PSW, which preserves bits that
* should not be overwritten.
*
* @this {CPUStatePDP11}
* @param {number} newPSW
*/
CPUStatePDP11.prototype.writePSW = function(newPSW)
{
this.setPSW((newPSW & 0xf8ef) | (this.PSW & 0x0710));
};
/**
* panic(reason)
*
@ -684,7 +666,7 @@ CPUStatePDP11.prototype.trap = function(vector, reason)
{
var newPC, newPSW, doubleTrap = 0;
if (this.trapPSW < 0) {
this.trapPSW = this.readPSW();
this.trapPSW = this.getPSW();
} else {
if (!this.mmuMode) {
vector = 4;
@ -2261,7 +2243,7 @@ CPUStatePDP11.prototype.stepCPU = function(nMinCycles)
break;
//case 0106700: // MTFS 1064SS
// //LOG_INSTRUCTION(instruction, 1, "MFPS");
// src = this.readPSW() & 0xff;
// src = this.getPSW() & 0xff;
// if (instruction & 0x38) {
// if ((dstAddr = this.getAddrByMode(instruction, PDP11.WRITE_MODE | PDP11.BYTE_MODE)) >= 0) { // write byte
// if (this.writeByteByAddr(dstAddr, src) >= 0) {