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

Added another PDP-10 KA10 diagnostic (DAKAL)

Browse source
This commit is contained in:
Jeff 2017-03-31 19:52:11 -07:00 • committed by Jeff Parsons
commit 26de8bbb1a
10 changed files with 23874 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/pdp10/lib/debugger.js
View file

@ -1621,16 +1621,17 @@ class DebuggerPDP10 extends Debugger {
}
/**
* parseInstruction(sOpcode, sOperands, addr, fQuiet)
* parseInstruction(sOpcode, sOperands, addr, fQuiet, fPrelim)
*
* @this {DebuggerPDP10}
* @param {string} sOpcode
* @param {string} [sOperands]
* @param {number} [addr] of memory where this instruction is being assembled
* @param {boolean} [fQuiet]
* @param {boolean} [fPrelim] (true if this is a preliminary call and error messages should be suppressed)
* @return {number} (opcode, or -1 if unrecognized instruction)
*/
parseInstruction(sOpcode, sOperands, addr, fQuiet)
parseInstruction(sOpcode, sOperands, addr, fQuiet, fPrelim)
{
var opCode = -1;
var opMask, opNum;
@ -1828,7 +1829,7 @@ class DebuggerPDP10 extends Debugger {
// }
}
if (opCode < 0 && !fQuiet) {
if (opCode < 0 && !fPrelim) {
this.println("unknown instruction: " + sOpcode + ' ' + sOperands);
}

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

@ -527,7 +527,7 @@ class Macro10 {
* And last but not least, perform all fixups.
*/
this.aFixups.forEach(function processFixup(sValue, nLocation) {
let value = macro10.parseExpression(sValue, undefined, nLocation);
let value = macro10.parseExpression(sValue, false, nLocation);
if (value === undefined) {
macro10.error("unable to parse expression '" + sValue + "'");
return;
@ -1021,6 +1021,7 @@ class Macro10 {
if (nLocation === undefined) {
nLocation = (this.nLocationScope >= 0? this.nLocationScope : this.nLocation);
}
/*
* The SIXBIT (and presumably ASCII; not sure about ASCIZ) pseudo-ops can also be used in expressions
* (or at least assignments), so we check for those in the given expression and convert them to quoted
@ -1028,13 +1029,22 @@ class Macro10 {
*/
sExp = sExp.replace(/SIXBIT\s*(\S)(.*?)\1/g, "'$2'").replace(/ASCII\s*(\S)(.*?)\1/g, '"$2"');
var sOperator = "";
var sOperands = sExp;
if (match = sExp.match(/^([^\s]+)\s*(.*?)\s*$/)) {
sOperator = match[1];
sOperands = match[2];
/*
* If this is NOT a first-pass call, then let's not waste time calling parseInstruction(); not only
* may it generate redundant error messages, but it shouldn't be necessary, because we should be down
* to fixup expressions.
*/
result = -1;
if (fPass1 !== false) {
var sOperator = "";
var sOperands = sExp;
if (match = sExp.match(/^([^\s]+)\s*(.*?)\s*$/)) {
sOperator = match[1];
sOperands = match[2];
}
result = this.dbg.parseInstruction(sOperator, sOperands, nLocation, fPass1, true);
}
result = this.dbg.parseInstruction(sOperator, sOperands, nLocation, true);
if (result < 0) {
/*
* Check for the "period" syntax that MACRO-10 uses to represent the value of the current location.
@ -1047,6 +1057,7 @@ class Macro10 {
* is (I think) as the decimal point within a floating-point number, so here we only replace
* periods that are not FOLLOWED by a decimal digit.
*/
if (fPass1 === false) fPass1 = undefined;
result = this.dbg.parseExpression(sExp.replace(/\.([^0-9]|$)/g, this.dbg.toStrBase(nLocation, -1) + "$1"), fPass1);
if (result === undefined) {
this.error("unable to parse expression '" + sExp + "'");