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

DAKAG PDP-10 diagnostic passes now (fixed the relative addressing location used within literal scopes)

Browse source
This commit is contained in:
Jeff 2017-03-29 13:59:50 -07:00 • committed by Jeff Parsons
commit 15417ca686
2 changed files with 72 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -832,7 +832,7 @@ class Macro10 {
});
this.aWords = [];
this.aFixups = [];
this.nLocationScope = this.nLocation;
if (this.nLocationScope < 0) this.nLocationScope = this.nLocation;
this.nLocation = 0;
}
@ -960,7 +960,9 @@ class Macro10 {
*/
var match = sOperand.match(/^([^,]*),,([^,]*)$/);
if (!match) {
if (nLocation === undefined) nLocation = (this.nLocationScope >= 0? this.nLocationScope : this.nLocation);
if (nLocation === undefined) {
nLocation = (this.nLocationScope >= 0? this.nLocationScope : this.nLocation);
}
/*
* Check for the "period" syntax that MACRO-10 uses to represent the value of the current location.
* The Debugger's parseInstruction() method understands that syntax, but its parseExpression() method
@ -1428,7 +1430,8 @@ class Macro10 {
var sExp = (sOperator + sSeparator + sOperands).trim();
if (sOperands.indexOf(",,") < 0) {
w = this.dbg.parseInstruction(sOperator, sOperands, this.nLocation, true);
var nLocation = this.nLocationScope >= 0? this.nLocationScope : this.nLocation;
w = this.dbg.parseInstruction(sOperator, sOperands, nLocation, true);
}
if (w < 0) {