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

Added some more disk configurations

Browse source
This commit is contained in:
Jeff Parsons 2017-08-27 11:25:02 -07:00 • committed by Jeff Parsons
commit b730b915bf
31 changed files with 1002 additions and 963 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2094,14 +2094,14 @@ class CPUStatePDP11 extends CPUPDP11 {
* combination of the mode and whether the register is the Program Counter (R7).
*
* The eight modes are:-
* 0 R no valid virtual address
* 1 (R) operand from I/D depending if R = 7
* 2 (R)+ operand from I/D depending if R = 7
* 3 @(R)+ address from I/D depending if R = 7 and operand from D space
* 4 -(R) operand from I/D depending if R = 7
* 5 @-(R) address from I/D depending if R = 7 and operand from D space
* 6 x(R) x from I space but operand from D space
* 7 @x(R) x from I space but address and operand from D space
* 0 R no valid virtual address
* 1 (R) operand from I/D depending if R = 7
* 2 (R)+ operand from I/D depending if R = 7
* 3 @(R)+ address from I/D depending if R = 7 and operand from D space
* 4 -(R) operand from I/D depending if R = 7
* 5 @-(R) address from I/D depending if R = 7 and operand from D space
* 6 x(R) x from I space but operand from D space
* 7 @x(R) x from I space but address and operand from D space
*
* Also need to keep MMR1 updated as this stores which registers have been
* incremented and decremented so that the OS can reset and restart an instruction

20
modules/pdp11/lib/disk.js
View file

@ -39,7 +39,7 @@
* 6) writing data to a sector: write()
* 7) save disk deltas: save()
* 8) restore disk deltas: restore()
* 9) converting disk contents: toJSON()
* 9) converting disk contents: convertToJSON()
*
* More functionality may be factored out of the disk controller components later and moved here,
* to further reduce some of the duplication between them, but the above functionality is a good start.
@ -1110,7 +1110,7 @@ class DiskPDP11 extends Component {
}
/**
* toJSON()
* convertToJSON(fFormatted)
*
* We perform some RegExp massaging on the JSON data to eliminate unnecessary properties
* (eg, 'length' values of 512, 'pattern' values of 0, since those are defaults).
@ -1121,9 +1121,10 @@ class DiskPDP11 extends Component {
* so it doesn't hurt to check every sector.
*
* @this {DiskPDP11}
* @param {boolean} [fFormatted]
* @return {string} containing the entire disk image as JSON-encoded data
*/
toJSON()
convertToJSON(fFormatted)
{
var s, pba = 0, sector, sectorLast;
@ -1145,7 +1146,7 @@ class DiskPDP11 extends Component {
/*
* Eliminate unnecessary default properties (eg, 'length' values of 512, 'pattern' values of 0).
*/
s = s.replace(/,"length":512/gm, "").replace(/,"pattern":0/gm, "");
s = s.replace(/,"length":512/g, "").replace(/,"pattern":0/g, "");
/*
* I don't really want to strip quotes from disk image property names, since I would have to put them
@ -1154,19 +1155,20 @@ class DiskPDP11 extends Component {
* easily be stripped out, by virtue of their being the only quoted properties left. We then "requote"
* all the property names that remain.
*/
s = s.replace(/"(sector|length|data|pattern)":/gm, "$1:");
s = s.replace(/"(sector|length|data|pattern)":/g, "$1:");
/*
* The next line will remove any other numeric or boolean properties that were added at runtime, although
* they may have completely different ("minified") names if the code has been compiled.
*/
s = s.replace(/,"[^"]*":([0-9]+|true|false)/gm, "");
s = s.replace(/(sector|length|data|pattern):/gm, "\"$1\":");
s = s.replace(/,"[^"]*":([0-9]+|true|false)/g, "");
s = s.replace(/(sector|length|data|pattern):/g, "\"$1\":");
/*
* Last but not least, insert line breaks after every object definition, to ease the pain on text editors.
* Last but not least, insert line breaks after every object definition, to improve human readability
* (but only if the caller asks for it).
*/
s = s.replace(/([\]}]),/gm, "$1,\n");
if (fFormatted) s = s.replace(/([\]}]),/g, "$1,\n");
return s;
}