From fd949fb4cebb41dd08e5aa79b51dc3c2bdff1a0d Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Tue, 10 May 2016 22:58:59 -0700 Subject: [PATCH 1/9] 6502 ASSEMBLER/DISASSEMBLER listing moved --- pubs/c1p/programming/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubs/c1p/programming/README.md b/pubs/c1p/programming/README.md index 430f66537..224cd1ee7 100644 --- a/pubs/c1p/programming/README.md +++ b/pubs/c1p/programming/README.md @@ -25,4 +25,4 @@ Anyway, to satisfy the buyer, I sat down at my old manual typewriter and banged code" listing. I produced it mostly by using the program to disassemble itself, combined with information from hand-written notes (which I may still have somewhere). Here it is, many decades later, for your amusement. -[6502 Disassembler Listing (by Jeff Parsons, June 1980)](http://archive.pcjs.org/pubs/c1p/programming/pdfs/OSI_Assembler-Disassembler_Listing.pdf) +[6502 Disassembler Listing (by Jeff Parsons, June 1980)](http://archive.pcjs.org/apps/c1p/6502/jeffpar/assembler/pdfs/OSI_Assembler-Disassembler_Listing.pdf) From 3b17355693247216f4270d187481e8577478cd17 Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Wed, 25 May 2016 07:55:17 -0700 Subject: [PATCH 2/9] Fixed XSL Save Machine bug --- docs/about/README.md | 1 - docs/c1pjs/README.md | 4 ++-- docs/pcx86/examples/components.xsl | 2 +- modules/shared/templates/components.xsl | 6 +++--- versions/pc8080/1.23.0/components.xsl | 2 +- versions/pcx86/1.23.0/components.xsl | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/docs/about/README.md b/docs/about/README.md index fe24207bd..42fc48b51 100644 --- a/docs/about/README.md +++ b/docs/about/README.md @@ -25,7 +25,6 @@ capabilities can be found in the [Documentation](/docs/). The first PCjs simulation was [C1Pjs](/docs/c1pjs/), which emulates the Challenger 1P, a 6502-based microcomputer introduced by Ohio Scientific in 1978. - C1Pjs v1.0 was released in July 2012. More information about the first release of C1Pjs was [posted](http://osiweb.org/osiforum/viewtopic.php?f=3&t=103) on the [OSI Discussion Forum](http://osiweb.org/osiforum/index.php) at [osiweb.org](http://osiweb.org/). diff --git a/docs/c1pjs/README.md b/docs/c1pjs/README.md index eaedd4fc4..5eb21c2bc 100644 --- a/docs/c1pjs/README.md +++ b/docs/c1pjs/README.md @@ -15,8 +15,8 @@ C1Pjs Documentation --- C1Pjs is a JavaScript simulation of the Challenger 1P, an 8-bit 6502-based microcomputer -manufactured by Ohio Scientific in 1978. The base configuration included 4Kb of RAM and an -8Kb BASIC-in-ROM from Microsoft. Below is a simulation of the 8Kb model. +manufactured by Ohio Scientific in 1978. The base configuration included an 8Kb BASIC-in-ROM from Microsoft +and 4Kb of RAM (user-expandable to 8Kb). Below is a simulation of the 8Kb RAM configuration. After you've read the Documentation, check out our other [C1P Machine Configurations](/devices/c1p/machine/), learn how [Customize and Embed](embed/) your own machines, read the [Source Code](/modules/c1pjs/), and diff --git a/docs/pcx86/examples/components.xsl b/docs/pcx86/examples/components.xsl index 80c89ad4b..f5890ae5e 100644 --- a/docs/pcx86/examples/components.xsl +++ b/docs/pcx86/examples/components.xsl @@ -240,7 +240,7 @@
[XML]
- + diff --git a/modules/shared/templates/components.xsl b/modules/shared/templates/components.xsl index b7ca1b5f6..22420a87d 100644 --- a/modules/shared/templates/components.xsl +++ b/modules/shared/templates/components.xsl @@ -241,7 +241,7 @@
[XML]
- + @@ -1034,8 +1034,8 @@ - diff --git a/versions/pc8080/1.23.0/components.xsl b/versions/pc8080/1.23.0/components.xsl index fc2020a3a..7055266c9 100644 --- a/versions/pc8080/1.23.0/components.xsl +++ b/versions/pc8080/1.23.0/components.xsl @@ -240,7 +240,7 @@
[XML]
- + diff --git a/versions/pcx86/1.23.0/components.xsl b/versions/pcx86/1.23.0/components.xsl index a167031df..17c24c51b 100644 --- a/versions/pcx86/1.23.0/components.xsl +++ b/versions/pcx86/1.23.0/components.xsl @@ -240,7 +240,7 @@
[XML]
- + From fe93c5d80ed9988b907b9588367c1aac1b6dabf8 Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Wed, 25 May 2016 08:07:30 -0700 Subject: [PATCH 3/9] savePC() fix for PCx86 --- docs/pcx86/examples/pcx86-dbg.js | 2 +- docs/pcx86/examples/pcx86.js | 2 +- modules/shared/lib/save.js | 4 ++-- versions/pc8080/1.23.0/pc8080-dbg.js | 2 +- versions/pc8080/1.23.0/pc8080.js | 2 +- versions/pcx86/1.23.0/pcx86-dbg.js | 2 +- versions/pcx86/1.23.0/pcx86.js | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/pcx86/examples/pcx86-dbg.js b/docs/pcx86/examples/pcx86-dbg.js index 2ffae7e55..41c2d2d71 100644 --- a/docs/pcx86/examples/pcx86-dbg.js +++ b/docs/pcx86/examples/pcx86-dbg.js @@ -815,4 +815,4 @@ a):f("transformToFragment failed")):f("unable to transform XML: unsupported brow function us(a,b,c,d){if(!c&&b){d.push(b);a=eb[d[0]];b=null;for(var e in a)if(ha(e,"components.xsl")){b=e.replace(".xsl",".css");break}b?va(b,null,!0,function(a,b){vs(b,d)}):vs(null,d)}else w("Error ("+c+") requesting "+a)} function vs(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=eb[f],k={},l;for(l in h){var n=h[l],q=ga(l);if("xml"==q){for(q=/[ \t]*]*path=(['"])(.*?)\1.*?<\/disk>\n?/g;d=q.exec(h[l]);){var p=d[2];p&&(h[p]||(n=n.replace(d[0],"")))}d=l=fa(l)}else"xsl"==q&&(e=l=fa(l));k[l]=n}a&&(k[l="css"]=a);b[2]&&(k[l="parms"]=b[2]);b[3]&&(k[l="state"]=b[3]);d&&e?(l=JSON.stringify(k),g+=".js",c=c[1]+"var resources="+l+";"+c[2]+c[3],c=c.replace(/\u00A9/g, "©"),c=Ia(c,"javascript",!1,g),c=c+(', copy it to your web server as "'+g+'", and then add the following to your web page:\n\n')+('
\n'),c+="...\n",c+='