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

Merge branch 'master' into gh-pages

Browse source
This commit is contained in:
Jeff Parsons 2017-01-28 23:39:21 -08:00
commit 191ddc371f
13 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
devices/pc8080/machine/vt100/debugger/machine-right.xml
View file

@ -2,7 +2,7 @@
<?xml-stylesheet type="text/xsl" href="/versions/pc8080/1.32.2/machine.xsl"?>
<machine id="vt100" class="pc8080 machine-right" border="1" pos="center" background="#FAEBD7">
<name pos="center">VT100 Terminal</name>
<computer id="computer" busWidth="16" resume="1"/>
<computer id="computer" busWidth="16"/>
<cpu id="cpu8080" model="8080" cycles="2764800" autoStart="true"/>
<rom id="rom" addr="0x0000" size="0x2000" file="/devices/pc8080/rom/vt100/VT100.json"/>
<ram id="ram" addr="0x2000" size="0x0C00"/>

2
devices/pc8080/machine/vt100/debugger/machine.xml
View file

@ -2,7 +2,7 @@
<?xml-stylesheet type="text/xsl" href="/versions/pc8080/1.32.2/machine.xsl"?>
<machine id="vt100" class="pc8080" border="1" pos="center" background="#FAEBD7">
<name pos="center">VT100 Terminal</name>
<computer id="computer" busWidth="16" resume="1"/>
<computer id="computer" busWidth="16"/>
<cpu id="cpu8080" model="8080" cycles="2764800" autoStart="true"/>
<rom id="rom" addr="0x0000" size="0x2000" file="/devices/pc8080/rom/vt100/VT100.json"/>
<ram id="ram" addr="0x2000" size="0x0C00"/>

2
devices/pc8080/machine/vt100/machine-right.xml
View file

@ -2,7 +2,7 @@
<?xml-stylesheet type="text/xsl" href="/versions/pc8080/1.32.2/machine.xsl"?>
<machine id="vt100" class="pc8080 machine-right" border="1" pos="center" background="#FAEBD7">
<name pos="center">VT100 Terminal</name>
<computer id="computer" busWidth="16" resume="1"/>
<computer id="computer" busWidth="16"/>
<rom id="rom" addr="0x0000" size="0x2000" file="/devices/pc8080/rom/vt100/VT100.json"/>
<ram id="ram" addr="0x2000" size="0x0C00"/>
<video id="video" screenWidth="1600" screenHeight="960" smoothing="false" interruptRate="60"

2
devices/pc8080/machine/vt100/machine.xml
View file

@ -2,7 +2,7 @@
<?xml-stylesheet type="text/xsl" href="/versions/pc8080/1.32.2/machine.xsl"?>
<machine id="vt100" class="pc8080" border="1" pos="center" background="#FAEBD7">
<name pos="center">VT100 Terminal</name>
<computer id="computer" busWidth="16" resume="1"/>
<computer id="computer" busWidth="16"/>
<rom id="rom" addr="0x0000" size="0x2000" file="/devices/pc8080/rom/vt100/VT100.json"/>
<ram id="ram" addr="0x2000" size="0x0C00"/>
<video id="video" screenWidth="1600" screenHeight="960" smoothing="false" interruptRate="60"

2
devices/pdp11/machine/1170/vt100/README.md
View file

@ -7,10 +7,12 @@ machines:
type: pdp11
config: /devices/pdp11/machine/1170/vt100/machine-left.xml
connection: dl11->vt100.serialPort
resume: 1
- id: vt100
type: pc8080
config: /devices/pc8080/machine/vt100/machine-right.xml
connection: serialPort->test1170.dl11
resume: 1
---
This VT100 Terminal is connected to the PDP-11/70 below.

2
devices/pdp11/machine/1170/vt100/debugger/README.md
View file

@ -8,11 +8,13 @@ machines:
debugger: true
config: /devices/pdp11/machine/1170/vt100/debugger/machine-left.xml
connection: dl11->vt100.serialPort
resume: 1
- id: vt100
type: pc8080
debugger: true
config: /devices/pc8080/machine/vt100/debugger/machine-right.xml
connection: serialPort->test1170.dl11
resume: 1
---
This VT100 Terminal is connected to the PDP-11/70 below.

2
devices/pdp11/machine/1170/vt100/debugger/machine-left.xml
View file

@ -2,7 +2,7 @@
<?xml-stylesheet type="text/xsl" href="/versions/pdpjs/1.32.2/machine.xsl"?>
<machine id="test1170" class="pdp11 machine-left" border="1" pos="center" background="#FAEBD7">
<name pos="center">PDP-11/70 with 256Kb, Front Panel, and Debugger</name>
<computer id="computer" busWidth="22" resume="1"/>
<computer id="computer" busWidth="22"/>
<cpu id="cpu" model="1170" cycles="6666667" autoStart="true"/>
<ram id="ram" addr="0x00000" size="0x40000" file="/apps/pdp11/boot/monitor/BOOTMON.json"/>
<device id="default" type="default"/>

2
devices/pdp11/machine/1170/vt100/machine-left.xml
View file

@ -2,7 +2,7 @@
<?xml-stylesheet type="text/xsl" href="/versions/pdpjs/1.32.2/machine.xsl"?>
<machine id="test1170" class="pdp11 machine-left" border="1" pos="center" background="#FAEBD7">
<name pos="center">PDP-11/70 with 256Kb and Front Panel</name>
<computer id="computer" busWidth="22" resume="1"/>
<computer id="computer" busWidth="22"/>
<cpu id="cpu" model="1170" cycles="6666667" autoStart="true"/>
<ram id="ram" addr="0x00000" size="0x40000" file="/apps/pdp11/boot/monitor/BOOTMON.json"/>
<device id="default" type="default"/>

6
modules/pc8080/lib/computer.js
View file

@ -206,12 +206,10 @@ class Computer8080 extends Component {
}
var sStatePath = null;
var sResume = parmsComputer['resume'];
var sResume = this.getMachineParm('resume', parmsComputer);
if (sResume !== undefined) {
/*
* DEPRECATE: This goofiness is a holdover from when the 'resume' property was a string (either a
* single-digit string or a path); now it's always a number, so it never has a 'length' property and
* the call to parseInt() is unnecessary.
* Decide whether the 'resume' property is a number or the path of a state file to resume.
*/
if (sResume.length > 1) {
sStatePath = this.sResumePath = sResume;

4
modules/pcx86/lib/computer.js
View file

@ -231,9 +231,7 @@ function Computer(parmsComputer, parmsMachine, fSuspended) {
var sResume = parmsComputer['resume'];
if (sResume !== undefined) {
/*
* DEPRECATE: This goofiness is a holdover from when the 'resume' property was a string (either a
* single-digit string or a path); now it's always a number, so it never has a 'length' property and
* the call to parseInt() is unnecessary.
* Decide whether the 'resume' property is a number or the path of a state file to resume.
*/
if (sResume.length > 1) {
sStatePath = this.sResumePath = sResume;

6
modules/pdp11/lib/computer.js
View file

@ -195,12 +195,10 @@ class ComputerPDP11 extends Component {
}
var sStatePath = null;
var sResume = this.getMachineParm('resume', parmsComputer);
var sResume = /** @type {string} */ (this.getMachineParm('resume', parmsComputer));
if (sResume !== undefined) {
/*
* DEPRECATE: This goofiness is a holdover from when the 'resume' property was a string (either a
* single-digit string or a path); now it's always a number, so it never has a 'length' property and
* the call to parseInt() is unnecessary.
* Decide whether the 'resume' property is a number or the path of a state file to resume.
*/
if (sResume.length > 1) {
sStatePath = this.sResumePath = sResume;

12
versions/pc8080/1.32.2/pc8080-dbg.js
View file

File diff suppressed because one or more lines are too long

4
versions/pc8080/1.32.2/pc8080.js
View file

File diff suppressed because one or more lines are too long