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

Added a minor improvement to the simplistic MACRO-10 fixup support in PDPjs

Browse source
This commit is contained in:
Jeff 2017-04-04 16:34:03 -07:00 • committed by Jeff Parsons
commit 7e1fc5586e
8 changed files with 169 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

42
modules/pdp10/lib/macro10.js
View file

@ -688,7 +688,7 @@ class Macro10 {
break;
case Macro10.PSEUDO_OP.EXP:
this.defEXP(sOperands);
this.defWord(sOperands);
break;
case Macro10.PSEUDO_OP.LIT:
@ -1722,25 +1722,6 @@ class Macro10 {
}
}
/**
* defEXP()
*
* Processes the EXP pseudo-op.
*
* @this {Macro10}
* @param {string} sOperands
*/
defEXP(sOperands)
{
var aUndefined = [];
var w = this.parseExpression(sOperands, aUndefined);
if (w !== undefined) {
this.genWord(w, aUndefined[0]);
} else {
this.error("unrecognized EXP expression '" + sOperands + "'");
}
}
/**
* defLocation(sOperands)
*
@ -1759,15 +1740,15 @@ class Macro10 {
*
* Processes the XWD pseudo-op.
*
* Since the XWD pseudo-op appears to be equivalent to two values separated by two commas, which defEXP() must also
* support, we can piggy-back on defExp().
* Since the XWD pseudo-op appears to be equivalent to two values separated by two commas, which defWord() must also
* support, we can piggy-back on defWord().
*
* @this {Macro10}
* @param {string} sOperands
*/
defXWD(sOperands)
{
this.defEXP(sOperands.replace(",", ",,"));
this.defWord(sOperands.replace(",", ",,"));
}
/**
@ -1775,16 +1756,23 @@ class Macro10 {
*
* @this {Macro10}
* @param {string} sOperator
* @param {string} sSeparator
* @param {string} sOperands
* @param {string} [sSeparator]
* @param {string} [sOperands]
*/
defWord(sOperator, sSeparator, sOperands)
defWord(sOperator, sSeparator = "", sOperands = "")
{
var aUndefined = [];
var sExp = (sOperator + sSeparator + sOperands).trim();
var w = this.parseExpression(sExp, aUndefined);
if (w !== undefined) {
this.genWord(w, aUndefined[0]);
if (!aUndefined.length) {
this.genWord(w);
} else if (aUndefined.length == 1) {
this.genWord(w, aUndefined[0]);
}
else {
this.genWord(0, sExp);
}
} else {
this.error("unrecognized word expression '" + sExp + "'");
}

9
modules/shared/lib/debugger.js
View file

@ -1075,8 +1075,13 @@ class Debugger extends Component
if (aUndefined) {
aUndefined.push(sUndefined);
} else {
this.println(sValue + " is undefined (" + sUndefined + ")");
value = undefined;
var valueUndefined = this.parseExpression(sUndefined, false);
if (valueUndefined !== undefined) {
value += valueUndefined;
} else {
this.println(sValue + " = " + this.toStrBase(value) + " + (" + sUndefined + ")");
value = undefined;
}
}
}
} else {