From f88a2a2ae8cbe67c82f43b20eebcb391bd548f27 Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Sat, 22 Oct 2016 10:16:29 -0700 Subject: [PATCH] Minor website tweaks --- README.md | 2 +- _config.yml | 4 ++-- _includes/footer.html | 2 +- _posts/2016-10-21-booting-pdp-11-basic.md | 2 +- apps/README.md | 2 ++ apps/pdp11/tapes/README.md | 3 +++ apps/pdp11/tapes/basic/README.md | 15 ++++++++++++--- blog/README.md | 2 +- devices/pdp11/pc11/README.md | 13 ++++++------- disks/README.md | 2 -- docs/README.md | 2 +- docs/pcx86/examples/pcx86-dbg.js | 3 ++- docs/pcx86/examples/pcx86.js | 3 ++- index.md | 2 +- versions/pcx86/1.30.2/pcx86-dbg.js | 3 ++- versions/pcx86/1.30.2/pcx86.js | 3 ++- versions/pdpjs/1.30.2/pdp11-dbg.js | 1 + versions/pdpjs/1.30.2/pdp11.js | 1 + 18 files changed, 41 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index af350beb4..a57dd2262 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ includes: * [C1Pjs](/docs/c1pjs/), an emulation of the 6502-based [Ohio Scientific Challenger 1P](/devices/c1p/) * [PDPjs](/modules/pdp11/), a PDP-11 machine emulator currently in development (e.g., [PDP-11/20 and PDP-11/70](/devices/pdp11/machine/)) -All PCjs computer simulations are written entirely in [JavaScript](/modules/). No Flash, Java or other plugins are +All PCjs machine simulations are written entirely in [JavaScript](/modules/). No Flash, Java or other plugins are required. Supported browsers include modern versions of Chrome, Safari, Firefox, Internet Explorer (v9.0 and up), Edge, and assorted mobile browsers. diff --git a/_config.yml b/_config.yml index 52b879803..1c4214ac7 100644 --- a/_config.yml +++ b/_config.yml @@ -6,7 +6,7 @@ description: > Welcome to PCjs, home of the original IBM PC in a web browser. PCjs provides a variety of computer emulators written in JavaScript, including PCx86 for x86-based machines (up through the 80386), C1Pjs for the 6502-based Ohio Scientific Challenger 1P, PC8080 for 8080-based machines - such as Space Invaders and the DEC VT100 Terminal, and PDPjs for PDP-11 machines like the 11/45 and 11/70. + such as Space Invaders and the DEC VT100 Terminal, and PDPjs for PDP-11 machines from the PDP-11/20 to the PDP-11/70. PCjs also provides an archive of selected historical PC software, publications, and reference materials. baseurl: "" # "/pcjs" when using http://jeffpar.github.io or "" when using http://www.pcjs.org url: "http://www.pcjs.org" # "http://jeffpar.github.io" or "http://www.pcjs.org" @@ -33,7 +33,7 @@ gems: pcjs: domain: pcjs.org # whereas site.url is used for linking purposes, site.pcjs.domain is used for display purposes - version: 1.30.1 # IMPORTANT: keep pcjs.version in sync with package.json:version + version: 1.30.2 # IMPORTANT: keep pcjs.version in sync with package.json:version compiled: true # by default, the compiled pcjs.version scripts will be used (eg, pcx86.js or pcx86-dbg.js) c1p_scripts: # if pcjs.compiled is false, the following scripts will be included instead, in the order listed - /modules/shared/lib/defines.js diff --git a/_includes/footer.html b/_includes/footer.html index e92272433..1739f8f2d 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -51,7 +51,7 @@

{{ site.pcjs.domain }} website © 2012-2016 by @{{ site.twitter_username }}
- PCjs and C1Pjs released under GPL version 3 + All PCjs machines released under GPL version 3

diff --git a/_posts/2016-10-21-booting-pdp-11-basic.md b/_posts/2016-10-21-booting-pdp-11-basic.md index bf8fb5e92..6cb7f4c89 100644 --- a/_posts/2016-10-21-booting-pdp-11-basic.md +++ b/_posts/2016-10-21-booting-pdp-11-basic.md @@ -15,7 +15,7 @@ machines: models, and since it had no MMU, it was limited to a maximum of 56Kb of RAM (or as DEC would say, 28K words), since the top 8Kb (or 4K words) of its 16-bit address space was reserved for UNIBUS devices. -The first PDPjs test of a PDP-11/20 configuration was attempting to run [PDP-11 BASIC](/apps/pdp11/tapes/basic/), by loading +The first PDPjs test of a PDP-11/20 machine was running [PDP-11 BASIC](/apps/pdp11/tapes/basic/), by loading it directly into memory from the original paper tape image. This required changes to the [RAM](/modules/pdp11/lib/ram.js) component, including a new *loadImage()* interface that understands DEC's paper tape format. diff --git a/apps/README.md b/apps/README.md index a5db449c9..7c53e3da8 100644 --- a/apps/README.md +++ b/apps/README.md @@ -1,6 +1,8 @@ --- layout: page title: Software Archives +menu_title: Software +menu_order: 7 permalink: /apps/ --- diff --git a/apps/pdp11/tapes/README.md b/apps/pdp11/tapes/README.md index b1af34d92..d3b5b2128 100644 --- a/apps/pdp11/tapes/README.md +++ b/apps/pdp11/tapes/README.md @@ -12,6 +12,9 @@ We have archived the following DEC PDP-11 Tapes: - [Absolute Loader](absloader/) - [BASIC (Single User)](basic/) +along with a copy of the [DEC PDP-11 Bootstrap Loader](bootstrap/), which is required if you actually want to +load any of the above tapes into memory using the [PC11 High-Speed Paper Tape Reader/Punch](/devices/pdp11/pc11/). + To make it easy for PDPjs machines to load these tapes, we created the following High-Speed Paper Tape Reader (PC11) configurations: diff --git a/apps/pdp11/tapes/basic/README.md b/apps/pdp11/tapes/basic/README.md index eb5cc8363..4bb612983 100644 --- a/apps/pdp11/tapes/basic/README.md +++ b/apps/pdp11/tapes/basic/README.md @@ -2,14 +2,23 @@ layout: page title: DEC PDP-11 BASIC permalink: /apps/pdp11/tapes/basic/ +machines: + - id: test1120 + type: pdp11 + debugger: true + autoMount: '' + config: /devices/pdp11/machine/1120/basic/debugger/machine.xml --- DEC PDP-11 BASIC ---------------- -To see DEC PDP-11 BASIC in action, try the [PDP-11/20 BASIC Demo](/devices/pdp11/machine/1120/basic/debugger/). +The first PCjs machine to run DEC PDP-11 BASIC was this [PDP-11/20](/devices/pdp11/machine/1120/basic/debugger/), +shown below. -PCjs has archived the following DEC PDP-11 BASIC resources: +{% include machine.html id="test1120" %} + +PCjs has archived these DEC PDP-11 BASIC resources: - [BASIC (Single User) Tape Image](DEC-11-AJPB-PB.json) - [LISTING OF BASIC/PTS (March 1974)](http://archive.pcjs.org/pubs/dec/pdp11/basic/AB-2045B-SC_BASIC_PTS_Listing_Mar77.pdf) @@ -17,7 +26,7 @@ PCjs has archived the following DEC PDP-11 BASIC resources: Third-party resources include: -- "[PDP-11 Paper Tape BASIC](http://www.avitech.com.au/ptb/ptb.html)", written March 24, 2013 +- "[PDP-11 Paper Tape BASIC](http://www.avitech.com.au/ptb/ptb.html)", March 24, 2013 --- diff --git a/blog/README.md b/blog/README.md index 04146f85b..f4652ab1c 100644 --- a/blog/README.md +++ b/blog/README.md @@ -2,7 +2,7 @@ layout: blog title: Blog menu_title: Blog -menu_order: 2 +menu_order: 1 permalink: /blog/ --- diff --git a/devices/pdp11/pc11/README.md b/devices/pdp11/pc11/README.md index 0435ce0a5..8e745d201 100644 --- a/devices/pdp11/pc11/README.md +++ b/devices/pdp11/pc11/README.md @@ -9,8 +9,12 @@ PC11 High-Speed Paper Tape Reader/Punch PDPjs implements the PC11 component in [pc11.js](/modules/pdp11/lib/pc11.js). -A variety of [Paper Tape Images](/apps/pdp11/tapes/) have been archived, and they are typically collected in a -configuration file such as [demo.xml](demo.xml): +A selection of [Paper Tape Images](/apps/pdp11/tapes/) have been archived for use by PDPjs machines: + +- [Bootstrap Loader Demo](/devices/pdp11/machine/1120/bootstrap/) (with [Debugger](/devices/pdp11/machine/1120/bootstrap/debugger/)) +- [PDP-11/20 BASIC Demo](/devices/pdp11/machine/1120/basic/) (with [Debugger](/devices/pdp11/machine/1120/basic/debugger/)) + +The tape images are typically listed in a common configuration file that all machines can use, such as [demo.xml](demo.xml): @@ -28,8 +32,3 @@ configuration file such as [demo.xml](demo.xml): Tape Progress - -The above configuration is used by PDPjs machines such as: - -- [Bootstrap Loader Demo](/devices/pdp11/machine/1120/bootstrap/) (with [Debugger](/devices/pdp11/machine/1120/bootstrap/debugger/)) -- [PDP-11/20 BASIC Demo](/devices/pdp11/machine/1120/basic/) (with [Debugger](/devices/pdp11/machine/1120/basic/debugger/)) diff --git a/disks/README.md b/disks/README.md index a597a6705..235deb4bd 100644 --- a/disks/README.md +++ b/disks/README.md @@ -1,8 +1,6 @@ --- layout: page title: Disk Libraries -menu_title: Disks -menu_order: 4 permalink: /disks/ --- diff --git a/docs/README.md b/docs/README.md index c6c967b2e..c9ca3926d 100644 --- a/docs/README.md +++ b/docs/README.md @@ -2,7 +2,7 @@ layout: page title: Documentation menu_title: Docs -menu_order: 8 +menu_order: 5 permalink: /docs/ --- diff --git a/docs/pcx86/examples/pcx86-dbg.js b/docs/pcx86/examples/pcx86-dbg.js index 8978606ef..1fe9fd40d 100644 --- a/docs/pcx86/examples/pcx86-dbg.js +++ b/docs/pcx86/examples/pcx86-dbg.js @@ -1,4 +1,5 @@ (function(){/* + http://pcjs.org/modules/shared/lib/nodebug.js (C) Jeff Parsons 2012-2016 http://pcjs.org/modules/shared/lib/diskapi.js (C) Jeff Parsons 2012-2016 http://pcjs.org/modules/shared/lib/dumpapi.js (C) Jeff Parsons 2012-2016 http://pcjs.org/modules/shared/lib/reportapi.js (C) Jeff Parsons 2012-2016 @@ -865,4 +866,4 @@ a):f("transformToFragment failed")):f("unable to transform XML: unsupported brow function ws(a,b,c,d){if(!c&&b){d.push(b);a=lb[d[0]];b=null;for(var e in a)if(ma(e,"components.xsl")){b=e.replace(".xsl",".css");break}b?Aa(b,null,!0,function(a,b){xs(b,d)}):xs(null,d)}else w("Error ("+c+") requesting "+a)} function xs(a,b){var c,d,e,f=b[0],g=b[1];c=b[4];c=c.match(/^(\s*\(function\(\)\{)([\s\S]*)(}\)\(\);\s*)$/);var h=lb[f],k={},m;for(m in h){var n=h[m],t=ka(m);if("xml"==t){for(t=/[ \t]*]*path=(['"])(.*?)\1.*?<\/disk>\n?/g;d=t.exec(h[m]);){var q=d[2];q&&(h[q]||(n=n.replace(d[0],"")))}d=m=ja(m)}else"xsl"==t&&(e=m=ja(m));k[m]=n}a&&(k[m="css"]=a);b[2]&&(k[m="parms"]=b[2]);b[3]&&(k[m="state"]=b[3]);d&&e?(a=JSON.stringify(k),g+=".js",c=c[1]+"var resources="+a+";"+c[2]+c[3],c=c.replace(/\u00A9/g, "©"),a=Na(c,"javascript",!1,g),a=a+(', copy it to your web server as "'+g+'", and then add the following to your web page:\n\n')+('
\n')+"...\n",a=a+('