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

PDPjs passes the first four PDP-10 Basic Instruction Diagnostics (finally)

Browse source
This commit is contained in:
Jeff 2017-03-27 19:00:10 -07:00 • committed by Jeff Parsons
commit ae30a5e93c
4 changed files with 191 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

32
modules/pdp10/lib/cpuops.js
View file

@ -3537,7 +3537,7 @@ PDP10.opAOSG = function(op, acc)
*/
PDP10.opSOJ = function(op, acc)
{
this.writeWord(acc, PDP10.doSUB.call(this, this.readWord(acc), 1));
this.writeWord(acc, PDP10.doADD.call(this, this.readWord(acc), PDP10.WORD_MASK));
};
/**
@ -3556,7 +3556,7 @@ PDP10.opSOJ = function(op, acc)
*/
PDP10.opSOJL = function(op, acc)
{
var dst = this.writeWord(acc, PDP10.doSUB.call(this, this.readWord(acc), 1));
var dst = this.writeWord(acc, PDP10.doADD.call(this, this.readWord(acc), PDP10.WORD_MASK));
if (PDP10.SIGN(dst) < 0) this.setPC(this.regEA);
};
@ -3576,7 +3576,7 @@ PDP10.opSOJL = function(op, acc)
*/
PDP10.opSOJE = function(op, acc)
{
var dst = this.writeWord(acc, PDP10.doSUB.call(this, this.readWord(acc), 1));
var dst = this.writeWord(acc, PDP10.doADD.call(this, this.readWord(acc), PDP10.WORD_MASK));
if (PDP10.SIGN(dst) == 0) this.setPC(this.regEA);
};
@ -3596,7 +3596,7 @@ PDP10.opSOJE = function(op, acc)
*/
PDP10.opSOJLE = function(op, acc)
{
var dst = this.writeWord(acc, PDP10.doSUB.call(this, this.readWord(acc), 1));
var dst = this.writeWord(acc, PDP10.doADD.call(this, this.readWord(acc), PDP10.WORD_MASK));
if (PDP10.SIGN(dst) <= 0) this.setPC(this.regEA);
};
@ -3616,7 +3616,7 @@ PDP10.opSOJLE = function(op, acc)
*/
PDP10.opSOJA = function(op, acc)
{
this.writeWord(acc, PDP10.doSUB.call(this, this.readWord(acc), 1));
this.writeWord(acc, PDP10.doADD.call(this, this.readWord(acc), PDP10.WORD_MASK));
this.setPC(this.regEA);
};
@ -3636,7 +3636,7 @@ PDP10.opSOJA = function(op, acc)
*/
PDP10.opSOJGE = function(op, acc)
{
var dst = this.writeWord(acc, PDP10.doSUB.call(this, this.readWord(acc), 1));
var dst = this.writeWord(acc, PDP10.doADD.call(this, this.readWord(acc), PDP10.WORD_MASK));
if (PDP10.SIGN(dst) >= 0) this.setPC(this.regEA);
};
@ -3656,7 +3656,7 @@ PDP10.opSOJGE = function(op, acc)
*/
PDP10.opSOJN = function(op, acc)
{
var dst = this.writeWord(acc, PDP10.doSUB.call(this, this.readWord(acc), 1));
var dst = this.writeWord(acc, PDP10.doADD.call(this, this.readWord(acc), PDP10.WORD_MASK));
if (PDP10.SIGN(dst) != 0) this.setPC(this.regEA);
};
@ -3676,7 +3676,7 @@ PDP10.opSOJN = function(op, acc)
*/
PDP10.opSOJG = function(op, acc)
{
var dst = this.writeWord(acc, PDP10.doSUB.call(this, this.readWord(acc), 1));
var dst = this.writeWord(acc, PDP10.doADD.call(this, this.readWord(acc), PDP10.WORD_MASK));
if (PDP10.SIGN(dst) > 0) this.setPC(this.regEA);
};
@ -3696,7 +3696,7 @@ PDP10.opSOJG = function(op, acc)
*/
PDP10.opSOS = function(op, acc)
{
var dst = this.writeWord(this.regEA, PDP10.doSUB.call(this, this.readWord(this.regEA), 1));
var dst = this.writeWord(this.regEA, PDP10.doADD.call(this, this.readWord(this.regEA), PDP10.WORD_MASK));
if (acc) this.writeWord(acc, dst);
};
@ -3716,7 +3716,7 @@ PDP10.opSOS = function(op, acc)
*/
PDP10.opSOSL = function(op, acc)
{
var dst = this.writeWord(this.regEA, PDP10.doSUB.call(this, this.readWord(this.regEA), 1));
var dst = this.writeWord(this.regEA, PDP10.doADD.call(this, this.readWord(this.regEA), PDP10.WORD_MASK));
if (PDP10.SIGN(dst) < 0) this.setPC(this.regPC + 1);
if (acc) this.writeWord(acc, dst);
};
@ -3737,7 +3737,7 @@ PDP10.opSOSL = function(op, acc)
*/
PDP10.opSOSE = function(op, acc)
{
var dst = this.writeWord(this.regEA, PDP10.doSUB.call(this, this.readWord(this.regEA), 1));
var dst = this.writeWord(this.regEA, PDP10.doADD.call(this, this.readWord(this.regEA), PDP10.WORD_MASK));
if (PDP10.SIGN(dst) == 0) this.setPC(this.regPC + 1);
if (acc) this.writeWord(acc, dst);
};
@ -3758,7 +3758,7 @@ PDP10.opSOSE = function(op, acc)
*/
PDP10.opSOSLE = function(op, acc)
{
var dst = this.writeWord(this.regEA, PDP10.doSUB.call(this, this.readWord(this.regEA), 1));
var dst = this.writeWord(this.regEA, PDP10.doADD.call(this, this.readWord(this.regEA), PDP10.WORD_MASK));
if (PDP10.SIGN(dst) <= 0) this.setPC(this.regPC + 1);
if (acc) this.writeWord(acc, dst);
};
@ -3779,7 +3779,7 @@ PDP10.opSOSLE = function(op, acc)
*/
PDP10.opSOSA = function(op, acc)
{
var dst = this.writeWord(this.regEA, PDP10.doSUB.call(this, this.readWord(this.regEA), 1));
var dst = this.writeWord(this.regEA, PDP10.doADD.call(this, this.readWord(this.regEA), PDP10.WORD_MASK));
this.setPC(this.regPC + 1);
if (acc) this.writeWord(acc, dst);
};
@ -3800,7 +3800,7 @@ PDP10.opSOSA = function(op, acc)
*/
PDP10.opSOSGE = function(op, acc)
{
var dst = this.writeWord(this.regEA, PDP10.doSUB.call(this, this.readWord(this.regEA), 1));
var dst = this.writeWord(this.regEA, PDP10.doADD.call(this, this.readWord(this.regEA), PDP10.WORD_MASK));
if (PDP10.SIGN(dst) >= 0) this.setPC(this.regPC + 1);
if (acc) this.writeWord(acc, dst);
};
@ -3821,7 +3821,7 @@ PDP10.opSOSGE = function(op, acc)
*/
PDP10.opSOSN = function(op, acc)
{
var dst = this.writeWord(this.regEA, PDP10.doSUB.call(this, this.readWord(this.regEA), 1));
var dst = this.writeWord(this.regEA, PDP10.doADD.call(this, this.readWord(this.regEA), PDP10.WORD_MASK));
if (PDP10.SIGN(dst) != 0) this.setPC(this.regPC + 1);
if (acc) this.writeWord(acc, dst);
};
@ -3842,7 +3842,7 @@ PDP10.opSOSN = function(op, acc)
*/
PDP10.opSOSG = function(op, acc)
{
var dst = this.writeWord(this.regEA, PDP10.doSUB.call(this, this.readWord(this.regEA), 1));
var dst = this.writeWord(this.regEA, PDP10.doADD.call(this, this.readWord(this.regEA), PDP10.WORD_MASK));
if (PDP10.SIGN(dst) > 0) this.setPC(this.regPC + 1);
if (acc) this.writeWord(acc, dst);
};

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

@ -1717,24 +1717,49 @@ class DebuggerPDP10 extends Debugger {
if (sOperands) {
var aOperands = sOperands.split(',');
for (var i = 0; i < aOperands.length; i++) {
var sOperand = aOperands[i].trim();
if (!sOperand) continue;
if (i > 1) {
this.println("too many operands: " + sOperands);
opCode = -1;
break;
}
var match = sOperand.match(/(@?)([^(]*)\(?([^)]*)\)?/);
if (!match) {
this.println("unknown operand: " + sOperand);
opCode = -1;
break;
}
/*
* If the operand contains an indirection operator (@) and/or index register (X), we parse those
* first and update the indirect (I) bit and index (X) bits as appropriate. The order is important,
* because if we parse them AFTER parsing the address expression, we might lose an undefined symbol
* indication, and if the caller needs to handle address fixups, that would be bad.
*/
if (match[1]) opCode += PDP10.OPCODE.I_BIT;
sOperand = match[3];
if (sOperand) {
operand = this.parseExpression(sOperand, fQuiet);
if (operand == undefined) {
opCode = -1;
break;
}
if (operand < 0 || operand > PDP10.OPCODE.X_MASK) {
operand &= PDP10.OPCODE.X_MASK;
if (MAXDEBUG) this.println("index (" + sOperand + ") truncated to " + this.toStrBase(operand));
}
opCode += operand << PDP10.OPCODE.X_SHIFT;
}
sOperand = match[2];
if (i || aOperands.length == 1) {
/*
* If this is NOT the first operand, then replace all periods NOT preceded
* by a digit with the current address.
* If this is NOT the first operand, replace all periods NOT preceded by a digit with the current address.
*/
if (!sOperand) {
sOperand = "0";
@ -1742,11 +1767,13 @@ class DebuggerPDP10 extends Debugger {
sOperand = sOperand.replace(/(^|[^0-9])\./g, "$1" + this.toStrOffset(addr));
}
}
var operand = this.parseExpression(sOperand, fQuiet);
if (operand == undefined) {
opCode = -1;
break;
}
if (!i && aOperands.length > 1) {
if (opMask == PDP10.OPCODE.OPIO) {
if (operand < 0 || operand > PDP10.OPCODE.IO_MASK) {
@ -1764,27 +1791,26 @@ class DebuggerPDP10 extends Debugger {
}
continue;
}
if (sOpcode) {
/*
* I came across what I believe is a typo in the DEC "DAKAC" diagnostic:
*
* CAME [0,-1] ;PASS TEST IF C(AC)=0,,-1
*
* Based on the comment, it's clear what they really meant was either "[0,,-1]" or "[XWD 0,-1]".
* However, they still got the desired result, which means when the assembler parses an mnemonic-less
* instruction like "0,-1", it must truncate the second (address) operand.
*
* TODO: Determine if I should ALWAYS truncate. I'm trying to retain the flexibility of allowing
* a full 36-bit instruction to be encoded with a single numeric expression (ie, one operand).
*/
if (sOpcode || i) {
if (operand < 0 || operand > PDP10.OPCODE.Y_MASK) {
operand &= PDP10.ADDR_MASK;
if (MAXDEBUG) this.println("address (" + sOperand + ") truncated to " + this.toStrBase(operand));
}
}
opCode += operand;
sOperand = match[3];
if (sOperand) {
operand = this.parseExpression(sOperand, fQuiet);
if (operand == undefined) {
opCode = -1;
break;
}
if (operand < 0 || operand > PDP10.OPCODE.X_MASK) {
operand &= PDP10.OPCODE.X_MASK;
if (MAXDEBUG) this.println("index (" + sOperand + ") truncated to " + this.toStrBase(operand));
}
opCode += operand << PDP10.OPCODE.X_SHIFT;
}
if (match[1]) opCode += PDP10.OPCODE.I_BIT;
}
}
//