diff --git a/.gitignore b/.gitignore index e15d6c8f7..ae018efb6 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ .settings node_modules npm-debug.log +archive/ /books /notes /states @@ -18,7 +19,6 @@ npm-debug.log /web private/ src/ -static/ tmp/ _site .sass-cache diff --git a/README.md b/README.md index e2668de52..34f8d655f 100644 --- a/README.md +++ b/README.md @@ -306,7 +306,7 @@ Updating PCjs To start developing features for a new version of PCjs, here are the recommended steps: -1. Change the version number in the root [package.json](/package.json) +1. Change the version number in the root [package.json](package.json) and [_config.yml](_config.yml) 2. Run the "grunt promote" task to bump the version in all the machine XML files 3. Make changes 4. Run "grunt" to build new versions of the apps (eg, "/versions/pcjs/1.x.x/pc.js") diff --git a/_config.yml b/_config.yml index c921bd525..0526423ec 100644 --- a/_config.yml +++ b/_config.yml @@ -17,7 +17,7 @@ right_brace: "}" # Build settings -exclude: ["index.html", "**/index.html", "logs", "node_modules", "**/c64", "**/private", "src", "**/src", "**/static", "tmp", "videos", "web", ".git", ".idea"] +exclude: ["index.html", "**/index.html", "**/archive", "logs", "node_modules", "**/c64", "**/private", "src", "**/src", "tmp", "videos", "web", ".git", ".idea"] markdown: kramdown kramdown: input: GFM @@ -31,7 +31,7 @@ gems: pcjs: domain: pcjs.org # whereas site.url is used for linking purposes, site.pcjs.domain is used for display purposes - version: 1.20.8 # IMPORTANT: keep pcjs.version in sync with package.json:version + version: 1.20.9 # IMPORTANT: keep pcjs.version in sync with package.json:version compiled: true # by default, the compiled pcjs.version scripts will be used (eg, pc.js or pc-dbg.js) pc_scripts: # if pcjs.compiled is false, the following scripts will be included instead, in the order listed - /modules/shared/lib/defines.js @@ -79,6 +79,7 @@ pcjs: - /modules/pcjs/lib/state.js - /modules/pcjs/lib/computer.js - /modules/shared/lib/embed.js + - /modules/shared/lib/save.js c1p_scripts: - /modules/shared/lib/defines.js - /modules/shared/lib/dumpapi.js diff --git a/_developer.yml b/_developer.yml index 1beee110a..367fd759b 100644 --- a/_developer.yml +++ b/_developer.yml @@ -2,3 +2,91 @@ developer: true pcjs: compiled: false + # + # Since pcjs.compiled is false, the following scripts will be included instead, in the order listed; + # and since nodebug.js is included immediately after defines.js, DEBUG code is disabled by default. + # + # Note that the Node web server is considerably smarter than the Jekyll templates we're using; Node + # will automatically skip (or include) nodebug.js depending on whether the server is in DEBUG mode, + # and will include nodebugger.js (and skip debugger.js) if DEBUGGER is disabled. The Node server + # also ensures that only one uncompiled copy of each of JavaScript file is included on a given page, + # regardless how many different machines are loaded on the page. + # + # But, you're a developer, otherwise you wouldn't be starting Jekyll like this: + # + # bundle exec jekyll serve --config _config.yml,_developer.yml + # + # so deal with it! ;-) + # + # NOTE: If you're debugging PCjs source code, you'll probably be happier using a JetBrains IDE like WebStorm, + # launching PCjs pages via Node rather than Jekyll, and using the JetBrains Chrome debugger plug-in. + # + pc_scripts: + - /modules/shared/lib/defines.js + - /modules/shared/lib/nodebug.js + - /modules/shared/lib/diskapi.js + - /modules/shared/lib/dumpapi.js + - /modules/shared/lib/reportapi.js + - /modules/shared/lib/userapi.js + - /modules/shared/lib/strlib.js + - /modules/shared/lib/usrlib.js + - /modules/shared/lib/weblib.js + - /modules/shared/lib/component.js + - /modules/pcjs/lib/defines.js + - /modules/pcjs/lib/x86.js + - /modules/pcjs/lib/interrupts.js + - /modules/pcjs/lib/messages.js + - /modules/pcjs/lib/panel.js + - /modules/pcjs/lib/bus.js + - /modules/pcjs/lib/memory.js + - /modules/pcjs/lib/cpu.js + - /modules/pcjs/lib/x86seg.js + - /modules/pcjs/lib/x86cpu.js + - /modules/pcjs/lib/x86fpu.js + - /modules/pcjs/lib/x86func.js + - /modules/pcjs/lib/x86ops.js + - /modules/pcjs/lib/x86op0f.js + - /modules/pcjs/lib/x86modb.js + - /modules/pcjs/lib/x86modw.js + - /modules/pcjs/lib/x86modb16.js + - /modules/pcjs/lib/x86modw16.js + - /modules/pcjs/lib/x86modb32.js + - /modules/pcjs/lib/x86modw32.js + - /modules/pcjs/lib/x86modsib.js + - /modules/pcjs/lib/chipset.js + - /modules/pcjs/lib/rom.js + - /modules/pcjs/lib/ram.js + - /modules/pcjs/lib/keyboard.js + - /modules/pcjs/lib/video.js + - /modules/pcjs/lib/parallelport.js + - /modules/pcjs/lib/serialport.js + - /modules/pcjs/lib/mouse.js + - /modules/pcjs/lib/disk.js + - /modules/pcjs/lib/fdc.js + - /modules/pcjs/lib/hdc.js + - /modules/pcjs/lib/debugger.js + - /modules/pcjs/lib/state.js + - /modules/pcjs/lib/computer.js + - /modules/shared/lib/embed.js + - /modules/shared/lib/save.js + c1p_scripts: + - /modules/shared/lib/defines.js + - /modules/shared/lib/nodebug.js + - /modules/shared/lib/dumpapi.js + - /modules/shared/lib/reportapi.js + - /modules/shared/lib/strlib.js + - /modules/shared/lib/usrlib.js + - /modules/shared/lib/weblib.js + - /modules/shared/lib/component.js + - /modules/c1pjs/lib/defines.js + - /modules/c1pjs/lib/panel.js + - /modules/c1pjs/lib/cpu.js + - /modules/c1pjs/lib/rom.js + - /modules/c1pjs/lib/ram.js + - /modules/c1pjs/lib/keyboard.js + - /modules/c1pjs/lib/video.js + - /modules/c1pjs/lib/serial.js + - /modules/c1pjs/lib/disk.js + - /modules/c1pjs/lib/debugger.js + - /modules/c1pjs/lib/computer.js + - /modules/shared/lib/embed.js diff --git a/_includes/build.html b/_includes/build.html new file mode 100644 index 000000000..15a1e8bf6 --- /dev/null +++ b/_includes/build.html @@ -0,0 +1 @@ +
diff --git a/_includes/machine-engines.html b/_includes/machine-engines.html index 1179183e6..4b86c82c1 100644 --- a/_includes/machine-engines.html +++ b/_includes/machine-engines.html @@ -1,5 +1,33 @@ +{% comment %} +As documented in /modules/markout/lib/markout.js, our Node web server recognizes the following machine properties +in the Front Matter of Markdown files, for compatibility with the Jekyll web server: + + 'id' (eg, "ibm5150") + 'name' (eg, "IBM PC (Model 5150) with Monochrome Display") + 'type' (eg, "pc" or "pc-dbg") + 'config' (eg, "machine.xml") + 'template' (eg, "machine.xsl") + 'uncompiled' (eg, true) + 'parms' + +And the following properties (along with any property not listed above) will be added to the 'parms' property: + + 'autopower' (eg, "true") + 'automount' (eg, {"A":{"name":"OS/2 FOOTBALL Boot Disk (v7.68.17)","path":"/disks/pc/os2/misc/football/debugger/FOOTBALL-7.68.17.json"}}) + 'state' (eg, "state.json") + 'messages' (eg, "disk") + +And all our JavaScript components expect multi-word property names to use camelCase, so that conversion happens both +here and in markout.js. Examples include 'autopower' ('autoPower') and 'automount' ('autoMount'). + +{% endcomment %} {% for machine in page.machines %} {% capture machine_embed %}window.embed{{ machine.type | remove:'-dbg' | upcase }}{% endcapture %} + {% if machine.autopower == nil %} + {% assign machine_autopower = "true" %} + {% else %} + {% capture machine_autopower %}{{ machine.autopower }}{% endcapture %} + {% endif %} {% unless machine.config %} {% assign machine_config = "machine.xml" %} {% else %} @@ -10,7 +38,7 @@ {% else %} {% assign machine_template = machine.template %} {% endunless %} - {% capture machine_parms %}{{ site.left_brace }}state:"{{ machine.state }}",autoMount:{{ machine.automount|jsonify }},messages:"{{ machine.messages }}"{{ site.right_brace }}{% endcapture %} + {% capture machine_parms %}{{ site.left_brace }}autoPower:{{ machine_autopower }},state:"{{ machine.state }}",autoMount:{{ machine.automount|jsonify }},messages:"{{ machine.messages }}"{{ site.right_brace }}{% endcapture %} {% if site.pcjs.compiled == true and machine.uncompiled != true %} {% capture machine_script %}{% endcapture %} {% unless machine_scripts contains machine_script %} @@ -35,4 +63,8 @@ {% endif %} {% endif %} + {% if page.build %} + + + {% endif %} {% endfor %} diff --git a/_includes/machine.html b/_includes/machine.html index 69a0ef37f..7b1e4619e 100644 --- a/_includes/machine.html +++ b/_includes/machine.html @@ -1 +1,10 @@ -
+
+ {% assign machine_name = "PCjs: The Virtual IBM PC" %} + {% for machine in page.machines %} + {% if include.id == machine.id and machine.name%} + {% assign machine_name = machine.name %} + {% break %} + {% endif %} + {% endfor %} + [{{ machine_name }}] +
diff --git a/_layouts/viewer.html b/_layouts/viewer.html index 7cda7240e..2d185d246 100644 --- a/_layouts/viewer.html +++ b/_layouts/viewer.html @@ -38,7 +38,7 @@ var totalPages = parseInt(aParms['total'], 10) || 999; var frame = document.getElementById('framePDF'); if (pdf && frame) { - pdf = pdf.replace('/static/', '/'); + pdf = pdf.replace('/archive/', '/'); var i = pdf.indexOf("/pages/"); if (i > 0) { var sReturnLink = pdf.substr(0, i+1); diff --git a/_posts/2015-06-01-debugging-the-ibm-vga-rom.md b/_posts/2015-06-01-debugging-the-ibm-vga-rom.md index b7db6fdb5..2f2b8b7b1 100644 --- a/_posts/2015-06-01-debugging-the-ibm-vga-rom.md +++ b/_posts/2015-06-01-debugging-the-ibm-vga-rom.md @@ -21,7 +21,7 @@ could only be used in PC, XT, and AT-compatible systems. I'll refer to it here The VGA ROM used here is assumed to have come from an original IBM VGA. It's unknown if IBM ever made any revisions to the VGA ROM. With the introduction of the PS/2 family and the VGA, IBM decided to no longer publish the source code for its ROMs, so I've created some assemblable source code from the IBM VGA ROM -[here](/devices/pc/video/ibm/vga/ibm-vga.nasm). +[here](/devices/pc/video/ibm/vga/). I've finally started debugging a machine configuration that uses the IBM VGA ROM. Since the VGA and the 80386 are contemporaries, I'm using an [80386 machine configuration](/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml). diff --git a/_posts/2016-02-17-saving-disks-and-machines.md b/_posts/2016-02-17-saving-disks-and-machines.md new file mode 100644 index 000000000..4dcd38380 --- /dev/null +++ b/_posts/2016-02-17-saving-disks-and-machines.md @@ -0,0 +1,121 @@ +--- +layout: post +title: "Saving Disks and Machines" +date: 2016-02-17 14:00:00 +permalink: /blog/2016/02/17/ +--- + +PCjs (v1.20.9) now offers some new, *much* easier ways to save disks and machines, thanks to the new +[Save Disk](/blog/2016/02/17/#saving-disks) and [Save Machine](/blog/2016/02/17/#saving-machines) features. +With one click, PCjs can now generate a single download containing everything you need to embed any of our +IBM PC demos on your own web page. + +Saving Disks +--- + +Floppy disk images can now be saved to your desktop computer by simply clicking the **Save** button next +to the floppy disk controls. Select the drive first, and then whatever diskette is shown as being "loaded" +in that drive will be saved in your local machine's Downloads folder when you click **Save**. + +If you made any changes to that disk after it was loaded, those changes will be included, so if you want a pristine +copy of the disk, click the **Load** button first. PCjs will ask you to confirm that you really want to reload the +disk and discard any changes. + +Note that the disk *should* be downloaded as an **.img** file, which is nothing more than a sector-by-sector binary +dump of the disk. For example, a 360Kb double-sided double-density (DSDD) disk contains 9 512-byte sectors on each +of the 40 tracks on each of its 2 sides, so when you **Save** a 360Kb disk, the downloaded file should be exactly +368,640 bytes large. + +The Mac OS X operating system can automatically mount most **.img** files (from disks created by DOS 2.0 or later). +Older 1.x DOS disks, along with most non-DOS disks, do not have a BIOS Parameter Block (BPB) in the boot sector, so +most modern operating systems won't recognize the disk format. Other operating systems, like Windows, may require +third-party software in order to mount an **.img** file, and some third-party software may prefer a different extension, +such as **.ima** or **.bin**. + +It's also recommended that make your **.img** files *read-only*, so that if you do mount them on your desktop +computer, neither you nor the operating system will inadvertently modify the contents of the disk. On OS X, this is +easily done with the **chmod** utility. + +For example, if you saved the disk named "PC-DOS 2.00 (Disk 1)", it should have been downloaded as "PCDOS200-DISK2.img" +in your Downloads folder, so the OS X Terminal command `chmod -w PCDOS200-DISK2.img` will make it read-only, and +`chmod +w PCDOS200-DISK2.img` will make it writable again. + +Saving Machines +--- + +Saving the entire state of any existing IBM PC machine is also possible with a single click. You can choose to save +a machine in its initial state, or make changes to any of the machine's disks and then save it. All your changes should +be preserved. + +Under the bottom-left corner of any IBM PC on the PCjs [website](/), you should now see a +[**Save Machine**] link. When you click that link, PCjs will generate a large "blob" of JavaScript containing +everything that machine needs to run, including: + + * The machine XML configuration file (eg, "machine.xml") + * The machine XSL transformation file (eg, "components.xsl") + * The machine CSS stylesheet file (eg, "components.css") + * The machine state file (eg, "state.json") + * The PCjs machine emulation script (eg, "pc.js") + * Copies of all the disk images mounted by the machine + +Let's say you want to save the IBM PC on the PCjs [home page](/). When you click **Save Machine**, two things should +happen: + + * A file will be downloaded ("pc.json") + * A popup will appear with some markup to copy-and-paste + +The popup should provide the following information: + + Check your Downloads folder for "pc.json", copy it to your web server as "pc.js", + and then add the following to your web page: + +
+ ... + + + + The machine should appear where the
is located. + +Rename the downloaded file from **pc.json** to **pc.js**, copy it to your own web server, then create or edit +a web page and insert the above text. If **pc.js** and your web page are in different folders, then you'll also +need to change *src* to indicate the location of **pc.js**. + +Some notes: + + * PCjs asks the browser to name the downloaded file **pc.json** instead of **pc.js** because a file with a ".js" + extension may cause the Chrome web browser to block the download. And not all browsers support named downloads; + PCjs will attempt to open a new window/tab if that seems to be the case. + + * Your version of Chrome may also impose size limitations on the download. If nothing downloads, the machine may + be too large for your browser, so try a different browser (eg, Firefox or Safari). + + * If you have modified any floppy disks mounted by the machine *or* any of the machine's hard disks, those + modifications should be saved along with the machine. + + * Any floppy disks mounted during the lifetime of the machine will be added to the machine's state. So, for example, + if you want your copy of the machine to include all the Windows 1.01 SDK disks, make sure you have loaded each disk + once before clicking **Save Machine**. + + * Any floppy disks *not* mounted during the lifetime of the machine will be *removed* from the machine's list of + available disks; we don't want machines running on other websites to be consuming our bandwidth. + + * The machine's current state, including memory and screen contents, are included as part of the saved + machine state. So, even if the original machine always powers on from scratch, the *copied* machine will always + resume at the point it was saved. This behavior, however, can be disabled by passing a *parms* object as the + 4th parameter to the *embedPC()* call, overriding the 'state' property: + + + +While the [PCjs Documentation](/docs/pcjs/) explains how to create a *new* machine, by writing your own machine +XML file and manually copying all the other pieces, the new **Save Machine** feature is the best way to save +any *existing* IBM PC and embed it on any other website. + +**WARNING**: While this feature is still "hot of the press," there will probably be some kinks to work out. Every +browser seems to have its own idiosyncrasies in terms of what can be downloaded and/or how large it can be. It's +also quite possible that certain machine features or modifications may not be properly preserved. + +If you're having trouble with a particular browser or a particular machine, be sure to +[let me know](mailto:Jeff@pcjs.org), and then try another browser and/or machine. + +*[@jeffpar](http://twitter.com/jeffpar)* +*February 17, 2016* diff --git a/apps/README.md b/apps/README.md index 4d9521f35..5a19797c1 100644 --- a/apps/README.md +++ b/apps/README.md @@ -82,7 +82,7 @@ have saved that JSON-encoded image as static file on the server, and then added <disk> entry: - + ... diff --git a/apps/pc/1981/visicalc/manifest.xml b/apps/pc/1981/visicalc/manifest.xml index 74a7714af..ef6cb5e83 100644 --- a/apps/pc/1981/visicalc/manifest.xml +++ b/apps/pc/1981/visicalc/manifest.xml @@ -1,5 +1,5 @@ - + VisiCalc @@ -12,7 +12,7 @@ December 16, 1981 Lotus Development - + VC.COM README.md VisiCalc License diff --git a/apps/pc/1982/esuite/manifest.xml b/apps/pc/1982/esuite/manifest.xml index 5ee5fca0c..3315d2f22 100644 --- a/apps/pc/1982/esuite/manifest.xml +++ b/apps/pc/1982/esuite/manifest.xml @@ -1,5 +1,5 @@ - + Executive Suite @@ -8,7 +8,7 @@ Armonk Corporation 1982 - + Executive Suite (1982) ESUITE.COM GAME.DAT diff --git a/apps/pc/1985/rogue/manifest.xml b/apps/pc/1985/rogue/manifest.xml index 843890118..eadad71d4 100644 --- a/apps/pc/1985/rogue/manifest.xml +++ b/apps/pc/1985/rogue/manifest.xml @@ -1,5 +1,5 @@ - + Rogue @@ -12,7 +12,7 @@ Ken Arnold Jon Lane Michael Toy - + Rogue (1985) MKOPT.EXE ROGUE.COM diff --git a/apps/pc/1987/thinktank/manifest.xml b/apps/pc/1987/thinktank/manifest.xml index dae73977f..70c69df3b 100644 --- a/apps/pc/1987/thinktank/manifest.xml +++ b/apps/pc/1987/thinktank/manifest.xml @@ -1,5 +1,5 @@ - + ThinkTank 2.41NP @@ -7,7 +7,7 @@ Productivity Living Videotext September 25, 1987 - + ThinkTank 2.41NP AUTOEXEC.BAT READ_ME.DB diff --git a/apps/pc/1988/moria/manifest.xml b/apps/pc/1988/moria/manifest.xml index fbc13d125..f72c06c41 100644 --- a/apps/pc/1988/moria/manifest.xml +++ b/apps/pc/1988/moria/manifest.xml @@ -1,5 +1,5 @@ - + The Dungeons of Moria 4.872 @@ -14,7 +14,7 @@ D. G. Kneller MSDOS port - + Moria v4.872 CONFIG.DOC GOD diff --git a/apps/pc/1992/moria/manifest.xml b/apps/pc/1992/moria/manifest.xml index 8de060385..c2866882b 100644 --- a/apps/pc/1992/moria/manifest.xml +++ b/apps/pc/1992/moria/manifest.xml @@ -1,5 +1,5 @@ - + The Dungeons of Moria 5.5 @@ -92,7 +92,7 @@ Ben Schreiber Macintosh port for Think C - + Moria 5.5 EXP.DOC MORIA.CNF diff --git a/apps/pc/README.md b/apps/pc/README.md index 9d2e18cb5..b41c04374 100644 --- a/apps/pc/README.md +++ b/apps/pc/README.md @@ -32,12 +32,12 @@ Next, the [manifest](1981/visicalc/manifest.xml) required a disk image containin (VC.COM). We used the [DiskDump](/modules/diskdump/) module to create that disk image: cd apps/pc/1981/visicalc - node ../../../../modules/diskdump/bin/diskdump --path="static/VC.COM;../README.md" --format=json --output=disk.json --manifest + node ../../../../modules/diskdump/bin/diskdump --path="archive/VC.COM;../README.md" --format=json --output=disk.json --manifest The DiskDump command created a disk image named "disk.json" containing two files ("VC.COM" from the "static" subdirectory, and "README.md" from the "static" parent directory) and automatically added that disk image to the demo's [manifest](1981/visicalc/manifest.xml): - + VC.COM README.md diff --git a/devices/c1p/machine/32kb/machine.xml b/devices/c1p/machine/32kb/machine.xml index 82f2bfa20..e7c87d3c0 100644 --- a/devices/c1p/machine/32kb/machine.xml +++ b/devices/c1p/machine/32kb/machine.xml @@ -1,5 +1,5 @@ - + OSI Challenger 1P (32Kb) with Disk Support diff --git a/devices/c1p/machine/8kb/all/debugger/machine.xml b/devices/c1p/machine/8kb/all/debugger/machine.xml index 52c7db3a1..92d1e2d86 100644 --- a/devices/c1p/machine/8kb/all/debugger/machine.xml +++ b/devices/c1p/machine/8kb/all/debugger/machine.xml @@ -1,5 +1,5 @@ - + OSI Challenger 1P (8Kb, Additional Software) diff --git a/devices/c1p/machine/8kb/array/README.md b/devices/c1p/machine/8kb/array/README.md index 2c0799f9f..77f392778 100644 --- a/devices/c1p/machine/8kb/array/README.md +++ b/devices/c1p/machine/8kb/array/README.md @@ -33,7 +33,7 @@ machines: redirect_from: - /configs/c1p/machines/array/ - /configs/c1p/machines/8kb/array/ - - /devices/other/c1p/array.xml + - /devices/other/c1p/array.xml/ --- Challenger 1P (8Kb) "Server Array" diff --git a/devices/c1p/machine/8kb/array/machine.xml b/devices/c1p/machine/8kb/array/machine.xml index c7b736a8e..a59ab4b10 100644 --- a/devices/c1p/machine/8kb/array/machine.xml +++ b/devices/c1p/machine/8kb/array/machine.xml @@ -1,5 +1,5 @@ - + Challenger 1P (8Kb) "Server Array" diff --git a/devices/c1p/machine/8kb/large/debugger/machine.xml b/devices/c1p/machine/8kb/large/debugger/machine.xml index a16758d26..da9933b9b 100644 --- a/devices/c1p/machine/8kb/large/debugger/machine.xml +++ b/devices/c1p/machine/8kb/large/debugger/machine.xml @@ -1,5 +1,5 @@ - + OSI Challenger 1P (8Kb) with Debugger diff --git a/devices/c1p/machine/8kb/large/machine.xml b/devices/c1p/machine/8kb/large/machine.xml index 344c98bd2..e9dbb25e5 100644 --- a/devices/c1p/machine/8kb/large/machine.xml +++ b/devices/c1p/machine/8kb/large/machine.xml @@ -1,5 +1,5 @@ - + OSI Challenger 1P (circa 1978) diff --git a/devices/c1p/machine/8kb/small/machine.xml b/devices/c1p/machine/8kb/small/machine.xml index 7ca77bb27..f4b045022 100644 --- a/devices/c1p/machine/8kb/small/machine.xml +++ b/devices/c1p/machine/8kb/small/machine.xml @@ -1,5 +1,5 @@ - + diff --git a/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml b/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml index fe8cf3c3f..df8667fbb 100644 --- a/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml +++ b/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150), CGA, 384K diff --git a/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml b/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml index 54edc4f76..acb85421f 100644 --- a/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml +++ b/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150), CGA, 64K diff --git a/devices/pc/machine/5150/cga/64kb/donkey/machine.xml b/devices/pc/machine/5150/cga/64kb/donkey/machine.xml index b1b4f5885..3dd17faee 100644 --- a/devices/pc/machine/5150/cga/64kb/donkey/machine.xml +++ b/devices/pc/machine/5150/cga/64kb/donkey/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150), CGA, 64K diff --git a/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml b/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml index 9ea866c57..698afc3bc 100644 --- a/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml +++ b/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150), CGA, 64K diff --git a/devices/pc/machine/5150/dual/64kb/machine.xml b/devices/pc/machine/5150/dual/64kb/machine.xml index 730006b16..c607b2813 100644 --- a/devices/pc/machine/5150/dual/64kb/machine.xml +++ b/devices/pc/machine/5150/dual/64kb/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150) with Dual Display diff --git a/devices/pc/machine/5150/mda/64kb/debugger/machine.xml b/devices/pc/machine/5150/mda/64kb/debugger/machine.xml index 5429ba8c2..7c68be895 100644 --- a/devices/pc/machine/5150/mda/64kb/debugger/machine.xml +++ b/devices/pc/machine/5150/mda/64kb/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC Model 5150 with Monochrome Display diff --git a/devices/pc/machine/5150/mda/64kb/machine.xml b/devices/pc/machine/5150/mda/64kb/machine.xml index 3e42f0a31..725394d4e 100644 --- a/devices/pc/machine/5150/mda/64kb/machine.xml +++ b/devices/pc/machine/5150/mda/64kb/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150) with Monochrome Display diff --git a/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml b/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml index f95274684..a3b99da17 100644 --- a/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml +++ b/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150), MDA, 64K diff --git a/devices/pc/machine/5160/cga/256kb/array/machine.xml b/devices/pc/machine/5160/cga/256kb/array/machine.xml index 944ffdf3b..0b8bd7bfa 100644 --- a/devices/pc/machine/5160/cga/256kb/array/machine.xml +++ b/devices/pc/machine/5160/cga/256kb/array/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 256K, 10Mb Drive diff --git a/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml b/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml index 8fdbd8fd8..4caf4fc67 100644 --- a/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml +++ b/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 256Kb, 10Mb Drive diff --git a/devices/pc/machine/5160/cga/256kb/demo/machine.xml b/devices/pc/machine/5160/cga/256kb/demo/machine.xml index 0c69c7c97..b184e4b70 100644 --- a/devices/pc/machine/5160/cga/256kb/demo/machine.xml +++ b/devices/pc/machine/5160/cga/256kb/demo/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 256Kb, 10Mb Drive diff --git a/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml b/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml index 32fe50145..6bb946d60 100644 --- a/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml +++ b/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 256K, 10Mb Drive diff --git a/devices/pc/machine/5160/cga/256kb/win101/README.md b/devices/pc/machine/5160/cga/256kb/win101/README.md index 9a59bef13..728ba5cc6 100644 --- a/devices/pc/machine/5160/cga/256kb/win101/README.md +++ b/devices/pc/machine/5160/cga/256kb/win101/README.md @@ -4,7 +4,7 @@ title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display running Win permalink: /devices/pc/machine/5160/cga/256kb/win101/ redirect_from: - /configs/pc/machines/5160/cga/256kb/win101/ - - /demos/pc/cga-win101/xt-cga-win101.xml + - /demos/pc/cga-win101/xt-cga-win101.xml/ - /demos/pc/cga-win101/ machines: - type: pc diff --git a/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml index 9f9ebd4f0..db3e12096 100644 --- a/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml +++ b/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160) running Windows v1.01 diff --git a/devices/pc/machine/5160/cga/256kb/win101/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/machine.xml index f185edd2f..c1448500e 100644 --- a/devices/pc/machine/5160/cga/256kb/win101/machine.xml +++ b/devices/pc/machine/5160/cga/256kb/win101/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160) running Windows v1.01 diff --git a/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml index aedcfb244..cc1ab5c69 100644 --- a/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml +++ b/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 256K, WIN101 diff --git a/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml b/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml index 0cd5f1fc4..389c29de1 100644 --- a/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml +++ b/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 512K, WIN101 diff --git a/devices/pc/machine/5160/cga/640kb/debugger/machine.xml b/devices/pc/machine/5160/cga/640kb/debugger/machine.xml index 2cf38c09d..486d3a5c3 100644 --- a/devices/pc/machine/5160/cga/640kb/debugger/machine.xml +++ b/devices/pc/machine/5160/cga/640kb/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 640K, 10Mb Drive @@ -12,7 +12,7 @@ - + diff --git a/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml b/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml index e5f88598e..6db7a20b9 100644 --- a/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml +++ b/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 640K, 10Mb Drive diff --git a/devices/pc/machine/5160/cga/640kb/machine.xml b/devices/pc/machine/5160/cga/640kb/machine.xml index 1579ec2ab..23d79aa33 100644 --- a/devices/pc/machine/5160/cga/640kb/machine.xml +++ b/devices/pc/machine/5160/cga/640kb/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 640K, 10Mb Drive diff --git a/devices/pc/machine/5160/ega/256kb/debugger/machine.xml b/devices/pc/machine/5160/ega/256kb/debugger/machine.xml index ca649d001..89ba0e636 100644 --- a/devices/pc/machine/5160/ega/256kb/debugger/machine.xml +++ b/devices/pc/machine/5160/ega/256kb/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), 64K EGA, 256K RAM, 10Mb Hard Drive diff --git a/devices/pc/machine/5160/ega/640kb/array/machine.xml b/devices/pc/machine/5160/ega/640kb/array/machine.xml index 81128b882..04b4553a3 100644 --- a/devices/pc/machine/5160/ega/640kb/array/machine.xml +++ b/devices/pc/machine/5160/ega/640kb/array/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive diff --git a/devices/pc/machine/5160/ega/640kb/debugger/machine.xml b/devices/pc/machine/5160/ega/640kb/debugger/machine.xml index 14fcac502..0b5245924 100644 --- a/devices/pc/machine/5160/ega/640kb/debugger/machine.xml +++ b/devices/pc/machine/5160/ega/640kb/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive diff --git a/devices/pc/machine/5160/ega/640kb/machine.xml b/devices/pc/machine/5160/ega/640kb/machine.xml index 2df579460..17436bd44 100644 --- a/devices/pc/machine/5160/ega/640kb/machine.xml +++ b/devices/pc/machine/5160/ega/640kb/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive diff --git a/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml b/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml index 7f0fb9440..61a696f3d 100644 --- a/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml +++ b/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive diff --git a/devices/pc/machine/5160/ega/640kb/win101/machine.xml b/devices/pc/machine/5160/ega/640kb/win101/machine.xml index ca6462278..ab4771c21 100644 --- a/devices/pc/machine/5160/ega/640kb/win101/machine.xml +++ b/devices/pc/machine/5160/ega/640kb/win101/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive diff --git a/devices/pc/machine/5160/mda/256kb/debugger/machine.xml b/devices/pc/machine/5160/mda/256kb/debugger/machine.xml index 3227603fd..da2f1fd93 100644 --- a/devices/pc/machine/5160/mda/256kb/debugger/machine.xml +++ b/devices/pc/machine/5160/mda/256kb/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive diff --git a/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml b/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml index fbd9f9bcd..600b9c76f 100644 --- a/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml +++ b/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive diff --git a/devices/pc/machine/5160/mda/256kb/fake188/machine.xml b/devices/pc/machine/5160/mda/256kb/fake188/machine.xml index 4965962dd..673010788 100644 --- a/devices/pc/machine/5160/mda/256kb/fake188/machine.xml +++ b/devices/pc/machine/5160/mda/256kb/fake188/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive diff --git a/devices/pc/machine/5160/mda/256kb/machine.xml b/devices/pc/machine/5160/mda/256kb/machine.xml index c85d1c616..c18b80ee4 100644 --- a/devices/pc/machine/5160/mda/256kb/machine.xml +++ b/devices/pc/machine/5160/mda/256kb/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive diff --git a/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml b/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml index 17a86c9dc..0182c859b 100644 --- a/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml +++ b/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), MDA, 64K, 10Mb Drive diff --git a/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml index 765f13de5..882ed4798 100644 --- a/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml +++ b/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC AT (6Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml index 0b4d73647..8a33c562e 100644 --- a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml +++ b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml @@ -1,5 +1,5 @@ - + IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml index 31215ffa2..ec57a439c 100644 --- a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml +++ b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk diff --git a/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml b/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml index e450db3ab..f560a1294 100644 --- a/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml +++ b/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC AT, 128K EGA, 640K RAM diff --git a/devices/pc/machine/5170/ega/640kb/rev1/debugger/manifest.xml b/devices/pc/machine/5170/ega/640kb/rev1/debugger/manifest.xml index 798c1bf70..bb34dacdc 100644 --- a/devices/pc/machine/5170/ega/640kb/rev1/debugger/manifest.xml +++ b/devices/pc/machine/5170/ega/640kb/rev1/debugger/manifest.xml @@ -1,10 +1,10 @@ - + IBM PC AT References IBM 5170 Technical Reference (March 1984) - + I/O Address Map CMOS Addresses BIOS Map @@ -16,7 +16,7 @@ 80286 and 80287 Programmers Reference Manual (1987) - + Memory Organization and Segmentation VERR/VERW diff --git a/devices/pc/machine/5170/ega/640kb/rev1/machine.xml b/devices/pc/machine/5170/ega/640kb/rev1/machine.xml index 1f88c990e..b57bc3e1a 100644 --- a/devices/pc/machine/5170/ega/640kb/rev1/machine.xml +++ b/devices/pc/machine/5170/ega/640kb/rev1/machine.xml @@ -1,5 +1,5 @@ - + IBM PC AT, 128K EGA, 640K RAM diff --git a/devices/pc/machine/README.md b/devices/pc/machine/README.md index 1a937f4c7..ccba4847c 100644 --- a/devices/pc/machine/README.md +++ b/devices/pc/machine/README.md @@ -39,13 +39,14 @@ Machines from our [IBM PC Application Archive](/apps/pc/): And here are some machines from our [IBM PC Disk Archive](/disks/pc/): +* [CP/M-86 v1.1B](/disks/pc/cpm/1.1b/) * [PC-DOS 1.00](/disks/pc/dos/ibm/1.00/) * [PC-DOS 1.10](/disks/pc/dos/ibm/1.10/) * [IBM Diagnostics](/disks/pc/diags/ibm/2.20/) -* [Multitasking MS-DOS](/disks/pc/dos/microsoft/4.0M/) -* [OS/2 Prototype Disks](/disks/pc/os2/misc/) -* [CP/M-86 v1.1B](/disks/pc/cpm/1.1b/) * [Infocom Zork I](/disks/pc/games/infocom/zork1/) +* [Multitasking MS-DOS](/disks/pc/dos/microsoft/4.0M/) +* [Microsoft Windows 95](/disks/pc/windows/win95/4.00.950/) +* [OS/2 Prototype Disks](/disks/pc/os2/misc/) --- diff --git a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml index a5055827f..d69cd966d 100644 --- a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml +++ b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml @@ -1,5 +1,5 @@ - + Compaq DeskPro 386 (16Mhz), 128Kb EGA, 2048Kb RAM diff --git a/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml index 6399b01a1..e8948d3f6 100644 --- a/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml +++ b/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml @@ -1,5 +1,5 @@ - + Compaq DeskPro 386 (16Mhz), 256Kb EGA, 4096Kb RAM diff --git a/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml index c7d068b4f..c556edf97 100644 --- a/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml +++ b/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml @@ -1,5 +1,5 @@ - + Compaq DeskPro 386 (16Mhz), Compaq VGA, 2048Kb RAM diff --git a/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml index aba4e6fb3..aa9312eb4 100644 --- a/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml +++ b/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml @@ -1,5 +1,5 @@ - + Compaq DeskPro 386 (16Mhz), IBM VGA, 2048Kb RAM, 20Mb Hard Disk diff --git a/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml b/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml index 884ddeb08..d927ffffe 100644 --- a/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml +++ b/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml @@ -1,5 +1,5 @@ - + Compaq DeskPro 386 (16Mhz), IBM VGA, 2048Kb RAM, 20Mb Hard Disk diff --git a/devices/pc/machine/custom/README.md b/devices/pc/machine/custom/README.md new file mode 100644 index 000000000..0bc1852e2 --- /dev/null +++ b/devices/pc/machine/custom/README.md @@ -0,0 +1,20 @@ +--- +layout: page +title: Build Your Own PC +permalink: /devices/pc/machine/custom/ +machines: + - type: pc + name: Custom PC + id: custom-pc + uncompiled: true + autopower: false +build: build-pc +sitemap: false +--- + +Build Your Own PC +--- + +{% include build.html id="build-pc" %} + +{% include machine.html id="custom-pc" %} diff --git a/devices/pc/machine/custom/machine.xml b/devices/pc/machine/custom/machine.xml new file mode 100644 index 000000000..b0123db81 --- /dev/null +++ b/devices/pc/machine/custom/machine.xml @@ -0,0 +1,18 @@ + + + + IBM PC (Model 5150) with Monochrome Display + + + + + diff --git a/devices/pc/rom/compaq/bios/deskpro386/README.md b/devices/pc/rom/compaq/bios/deskpro386/README.md index b85c36e27..4287f9ad4 100644 --- a/devices/pc/rom/compaq/bios/deskpro386/README.md +++ b/devices/pc/rom/compaq/bios/deskpro386/README.md @@ -53,8 +53,8 @@ Similarly, [1989-04-14.json](1989-04-14/1989-04-14.json) was generated by first from the two 16Kb BIN files provided by [Al Kossow](http://www.vintage-computer.com/vcforum/member.php?2256-Al-Kossow): cd 1989-04-14 - filedump --file=static/109592-005.U11.bin --merge=static/109591-005.U13.bin --output=static/1989-04-14.rom --format=rom - filedump --file=static/1989-04-14.rom --output=1989-04-14.json + filedump --file=archive/109592-005.U11.bin --merge=archive/109591-005.U13.bin --output=archive/1989-04-14.rom --format=rom + filedump --file=archive/1989-04-14.rom --output=1989-04-14.json Dumping the ROMs --- diff --git a/devices/pc/video/README.md b/devices/pc/video/README.md index 99e8ba46f..54f771248 100644 --- a/devices/pc/video/README.md +++ b/devices/pc/video/README.md @@ -16,6 +16,7 @@ PCjs supports the following IBM PC video adapters: More detailed information is available for the following IBM-compatible video adapters: +* [ATI VGA](/devices/pc/video/ati/vga/) * [Compaq EGA](/devices/pc/video/compaq/ega/) * [Compaq VGA](/devices/pc/video/compaq/vga/) * [Paradise VGA](/devices/pc/video/paradise/vga/) diff --git a/devices/pc/video/ati/vga/README.md b/devices/pc/video/ati/vga/README.md new file mode 100644 index 000000000..ead515096 --- /dev/null +++ b/devices/pc/video/ati/vga/README.md @@ -0,0 +1,50 @@ +--- +layout: page +title: "ATI VGA Wonder-16" +permalink: /devices/pc/video/ati/vga/ +--- + +ATI VGA Wonder-16 +--- + +Thanks to the [OS/2 Museum](http://www.os2museum.com/wp/so-this-actually-works/), +we now have the contents of the ROMs on the ATI VGA Wonder-16; specifically, the 1988 "REV 2" board (P/N 109004800) +containing ROM version V3-1.02. + +Each ROM chip apparently contains 32Kb of data, but only the upper 16Kb of each chip is used. So we take the two +32Kb files: + + VGA_Wonder_V3-1.02_EVEN.BIN + VGA_Wonder_V3-1.02_ODD.BIN + +and merge them into a single 64Kb file, using the PCjs [FileDump](/modules/filedump/lib/) utility: + + filedump --file=VGA_Wonder_V3-1.02_EVEN.BIN --merge=VGA_Wonder_V3-1.02_ODD.BIN --format=rom --output=VGA_Wonder_V3-1.02.rom + +Then, within the resulting 64Kb file, we extract the ROM code+data from the upper 32Kb: + + filedump --file=VGA_Wonder_V3-1.02.rom --offset=32768 --format=json --output=VGA_Wonder_V3-1.02.json + +And now we have a JSON-encoded ROM image that PCjs machines can load. + +--- + +To create a human-readable dump, you can use the following command: + + filedump --file=VGA_Wonder_V3-1.02.json --format=bytes --comments + +Here are the first 12 lines from that dump: + + 0x55,0xAA,0x40,0xEB,0x63,0x37,0x34,0x30,0x30,0x3E,0xFF,0xFF,0x81,0x00,0x88,0x2C, // 0x00000000 U.@.c7400......, + 0xCE,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x49,0x42, // 0x00000010 ..............IB + 0x4D,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 0x00000020 M............... + 0x20,0x37,0x36,0x31,0x32,0x39,0x35,0x35,0x32,0x30,0x00,0x00,0x00,0x00,0x00,0x00, // 0x00000030 761295520...... + 0x33,0x31,0x01,0x31,0x4D,0x20,0xB0,0x00,0x00,0x00,0x00,0x00,0x01,0x02,0x00,0x00, // 0x00000040 31.1M .......... + 0x31,0x39,0x38,0x38,0x2F,0x31,0x31,0x2F,0x31,0x31,0x20,0x31,0x37,0x3A,0x31,0x31, // 0x00000050 1988/11/11 17:11 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE8,0x40,0x00,0xCB,0x0E,0x07,0xBD,0x81, // 0x00000060 .........@...... + 0x00,0xB8,0x01,0x13,0xBB,0x07,0x00,0xB9,0x29,0x00,0x90,0xBA,0x00,0x00,0xCD,0x6D, // 0x00000070 ........)......m + 0xC3,0x0D,0x0A,0x41,0x54,0x49,0x20,0x56,0x47,0x41,0x20,0x57,0x6F,0x6E,0x64,0x65, // 0x00000080 ...ATI VGA Wonde + 0x72,0x20,0x42,0x69,0x6F,0x73,0x2C,0x20,0x56,0x65,0x72,0x73,0x69,0x6F,0x6E,0x20, // 0x00000090 r Bios, Version + 0x56,0x33,0x2D,0x31,0x2E,0x30,0x32,0x20,0x0D,0x0A,0x00,0x1E,0x06,0x57,0x56,0x55, // 0x000000A0 V3-1.02 .....WVU + 0x52,0x51,0x53,0x50,0xBA,0xE8,0x46,0xB0,0x16,0xEE,0xBA,0x02,0x01,0xB0,0x01,0xEE, // 0x000000B0 RQSP..F......... + diff --git a/devices/pc/video/ati/vga/VGA_Wonder_V3-1.02.json b/devices/pc/video/ati/vga/VGA_Wonder_V3-1.02.json new file mode 100644 index 000000000..d6c9bbb39 --- /dev/null +++ b/devices/pc/video/ati/vga/VGA_Wonder_V3-1.02.json @@ -0,0 +1,514 @@ +{"data":[ +-348083627,808728419,-49616,747110529,462,0,0,1112080384,77,0,0,0,825636640,892680498,12338,0, +822161715,11542605,0,513,943208753,791753007,824193329,825309751,0,0,-889175832,-2118318322,318879744,-1191180357,-1164967895,1842151424, +1091177923,1444956500,1461731655,1701080687,1765941362,539784047,1936876886,544108393,825045846,540160046,503319053,1431721734,1347637586,-1337530182,45805078,-301879295, +-1337530182,-826610162,-833570813,-1320044305,64666351,-289393940,854375090,-1062015296,-1308315410,-994906430,-283115080,-99095576,-1544526408,12058888,17474544,8128199, +244073262,113705086,1194197260,17698444,28575431,244067167,113705398,727646272,4329100,78120647,244067338,719848618,460908545,1956429834,398387203,-401105944, +-471334573,1915086963,-253185616,1946265641,548845574,-1658210840,-1964506251,-15931386,1499158779,1600019802,-389865721,512366444,-477952888,-1484116465,-1112538736,-941092939, +28751913,-785807896,788378083,27305983,-1069514752,-530538464,-800026608,-261050320,30409152,30409168,32637408,35062276,35062295,37683754,39060052,39060052, +-186121808,-2029117435,98428932,-1023050520,-454557264,-2029117435,95938564,-1023054616,-722992976,147977733,-402356466,-2115500652,11584261,-167394584,-2029123375,92465156, +-1023059480,-1326972496,-2029117435,87812100,-402286872,-1329395849,94234625,75959840,-402315032,1692927341,11584263,-167408920,-2029123375,87746564,-402307096,-1329395889, +91613184,235459062,266863751,87222277,-1022936344,-401167128,-389867863,1048643403,305398898,-1145567628,684386320,-857164624,-1229959128,1344849640,-1207511576,-1595346757, +36038696,-1327461800,682289334,-1327461800,681765044,76409027,-826670413,1004464129,-461315190,-1057193792,-466484619,1068874672,-2128046616,872706622,-1207012334,1978138806, +11843624,-349671448,-390811589,-662034321,1760081584,1408797224,-1207536152,1089011385,-390352856,-662034345,1527172840,1946403830,46396947,-940176524,-385649662,686358885, +13691137,-826670669,997386241,-2146441344,75366655,-1006742296,-826670413,996075521,-266025078,-388962096,-388962096,813023242,-2146441344,158600191,168074728,-350325312, +75884551,360038410,76031616,-2009200400,-1993965564,-478089468,-1994520560,21358852,1819658494,-2146441344,1014238207,1946681216,150962222,-8377996,-2145094647,142476287, +2114322304,18737423,168050408,-2145356352,468387527,168051176,-1223395904,-401544437,-1073085386,132851573,168042216,-2145487424,-268138458,76037640,76097152,28424431, +-1205384728,1139286198,-39851993,14019011,1366673662,168034792,-1963821632,-2147186658,-880742173,-2011265015,-390352892,254027599,91554876,76031616,78756094,1206451893, +-43522009,63355642,-1327975700,-1191449047,-135790156,79214630,-1205407256,15261617,57665575,1976106691,60680246,1970651146,76029578,-2131696768,512232395,-1313340280, +652077310,-84073240,-335296838,699447474,-1262945298,649390082,-402343752,-20765010,-398559800,-1073085597,512375669,-478149496,197886192,76029576,-1257983560,650701054, +-402475336,-488102266,-960824580,-1196233725,-68277840,-402475848,-1195891086,644671492,-54007613,-54269757,-21382973,-1205439768,1474823611,1085847590,-400141848,434635769, +1225180692,266863364,-1157647357,-1073085484,-21756812,-1991199566,-1157340394,118361082,1477448936,-335295302,-1004342492,-387005774,-1326968780,309913616,-1190875416,-397343768, +-497483256,63355641,-1141981134,-1914173842,-1183615743,-1014824955,25356292,-152934283,-398413128,-617470490,-1341930822,12185092,-318840318,-472903644,145807370,33602030, +619511522,182702096,-322129192,-1028459740,56879342,-75496523,-1258130144,-1174293753,434635214,-253263815,-8387151,-1324321712,-788561907,162597236,1955659648,-1979520254, +-370832663,-2034564901,18016262,96015989,79921920,1963001832,-2131303925,268732686,-1175780939,-398413128,378217826,364381283,381218717,-1162285154,626059272,-1172129304, +-5241914,-1207912210,12566670,-18432,-213909319,1662421931,113410820,-1262439700,-289109503,-17948496,284983492,347140988,-301944594,-1293016912,-215683892,-387005774, +-555220728,-167726080,1433735363,73602699,-335101309,28623026,-1326529398,-989925880,2081488000,-300633869,-1326577488,-860688864,-1307833108,-773263678,11003904,-1007287628, +-1205963760,-1064388608,855638207,1073789376,-1243042829,9168896,-1007287628,-1274907376,-1326402300,618719419,1290329226,303219459,336859154,338497556,756285460,336855060, +757923885,302252077,302256132,303960068,755236868,369360900,21,378212352,-1031601053,145288198,-1460864139,1392210952,-1070413646,-1976679698,-1976635897,787349831, +-301840502,27847770,-1028457611,-1978653460,852013792,-297603392,-1863413616,841936528,851641191,1662421979,113410052,-335543111,-76217944,-322784686,-329582454,125108648, +168880000,-487724065,-1957510170,-2096864490,-4651326,27847807,-102628747,1946265836,1526325762,-1174293565,1374159310,266829879,2113994624,78889729,-402534726,-478136512, +-1967476729,-386353693,-2134694914,805572622,73598663,129500084,-1019032320,68167296,269385935,113713156,64226403,-855637064,645972802,-2133916656,268701710,-855637576, +243319618,-953154544,-1274780922,505859,-2134676019,-821817306,68161152,1661388576,-1207708668,1842151427,270958787,243322628,-1206909936,1842151425,-527806269,-335295302, +-1005912540,1492042418,63748803,-1308554004,-1263341886,-1022186520,-335295302,-1028456924,-388713746,-1329392996,592570551,24445352,-1174293565,-2048392754,-2133118410,-8384537, +-1291288832,30325250,-1187613720,-860178432,27847683,-1330314635,-930299506,12572814,140754448,-306578038,-1527541760,1975058304,520039943,99289179,1595866926,1975519752, +-272910328,-350037272,280737798,-1088242200,548933632,67156231,12823539,12058640,-156237808,527696323,-1960836929,33602039,-617437709,-1090477080,-141877248,-217972551, +197145255,-1291356983,9365512,1389035952,30325329,-930353414,-18038018,-1965018422,-449646655,-503275335,-1598427138,-1949136112,-67444032,1371757145,-1297067950,-301871430, +-1460878594,-28347328,-289886006,-1964195074,-2132768024,-1196362780,-1326462210,-1023480133,-1159689492,-1964244020,-789109560,149192940,67945482,-1192312142,619233202,-1598467806, +1509876224,1374601610,-503275335,-826648066,-1967607807,1515778021,-826621095,-289886207,-1964195074,-2132768024,-1196362780,-1158690050,-1964244020,183968968,-1308357437,-1296503102, +-11802560,-1158758006,-1196424754,-1007688310,-402607944,-1313332768,566618113,-398413128,-1279778348,567207936,-402606920,-1246223928,566421504,-402606408,-1195892292,565635072, +-399394376,-1162337872,564848643,-390352701,254026155,91488572,125108648,-1995538237,-2134702588,-117143258,50379203,839108794,-1874661696,-69037842,146389187,-400470552, +113643288,-2147416951,-1007284253,-955091967,168077318,-1441887188,33259524,1340814452,-1475950704,-1943246844,-2147177970,1064567035,1946352512,83591226,113653109,-1335884665, +76063480,184406504,-1338215232,76063483,113653227,-1335884665,76063483,76091008,-39458814,527745034,-2002585168,-971445500,1610909446,-2002585168,-40048636,125091850, +-2002584656,-2147423484,268732686,30325443,-285560144,-1974801342,-2135772960,-452271644,-1161561105,-1297088050,-331157766,-1327461814,-102465358,-68164342,405311683,151519240, +1661075459,-1876416723,532652075,117884672,0,344952476,-1548118497,33620223,100992003,303108103,370480147,251660311,0,235929600,405339904,151519240, +1661075459,-1876416723,532652075,117884672,0,344952476,-1548118497,33620223,100992003,303108103,370480147,251660311,0,235929600,407961344,17825800, +1661075459,-2108666017,532644181,117884672,0,680496796,-1548118497,33620223,100992003,303108103,370480147,251660311,0,235929600,407961344,17825800, +1661075459,-2108666017,532644181,117884672,0,680496796,-1548118497,33620223,100992003,303108103,370480147,251660311,0,235929600,405339904,155189256, +1661075459,-1876416723,532643883,49408,0,344952476,-1564895744,353566975,100925975,303108103,370480147,50331927,0,254803968,405339904,155189256, +1661075459,-1876416723,532643883,49408,0,344952476,-1564895744,353566975,100925975,303108103,370480147,50331927,0,254803968,407961344,20971528, +1661337601,-2108666017,532643924,49408,0,680496796,-1028024832,387383551,387389207,387389207,387389207,16777495,0,218103808,407961344,1048590, +-1509752829,-2108666017,532644181,202067200,0,677217667,-1548066035,134742271,134744072,404230152,404232216,251661848,8,168820736,407961344,17825808, +1644298243,-2108666017,532644438,235753216,0,680496796,-1548118497,134742271,134744072,404230152,404232216,251660824,0,168820736,405339904,151519248, +1661075459,-1876416723,532652075,235753216,0,344952476,-1548118497,33620223,335873027,976828423,1044200507,251660351,0,235929600,407961344,17825808, +1661075459,-2108666016,532644952,235753216,0,680496796,-1548118497,33620223,335873027,976828423,1044200507,251660351,0,235929600,5308160,687865856, +1644560399,-2108666017,532644181,16384,0,680496796,-474376673,255,0,0,0,251658559,251658240,84410368,5308175,687865856, +1661337615,-2108666017,532644181,16384,0,680496796,-474376673,255,0,0,0,251658559,251658240,84410368,405339919,153092104, +1661337615,-1876416723,532643883,49152,0,344952476,-474376704,33620223,100992003,303108103,370480147,251658519,0,83886080,407961359,20971528, +1661337615,-2108666017,532643924,49152,0,680496796,-474376704,33620223,100992003,303108103,370480147,251658519,0,83886080,407961359,92274702, +-1577058289,441864032,527491152,0,0,341651038,-1955701248,524543,1579008,524288,1572864,83888896,0,118489088,407961359,92274702, +-1493172209,391335771,527219280,0,0,341650270,-1962254577,65791,459776,65536,459776,83886336,0,118489088,407961359,25165838, +-1576665073,-2108666017,532643924,16384,0,677217667,-474324209,524543,1579008,524288,1572864,83888896,0,83886080,407961349,25165838, +-1559887857,-2108666017,532643924,16384,0,677217667,-474324209,33620223,335873027,976828423,1044200507,251658559,0,83886080,405339919,151519246, +-1560150013,-1876416723,532652075,202067200,0,341673347,-1548066017,33620223,335873027,976828423,1044200507,251660351,0,235929600,405339904,151519246, +-1560150013,-1876416723,532652075,202067200,0,341673347,-1548066017,33620223,335873027,976828423,1044200507,251660351,0,235929600,407961344,17825806, +-1560150013,-2108666017,532644181,202067200,0,677217667,-1548066017,33620223,335873027,976828423,1044200507,251660351,0,235929600,407961344,17825806, +-1560150013,-2108666017,532644181,202067200,0,677217667,-1548066017,33620223,335873027,976828423,1044200507,251660351,0,235929600,405339904,134742032, +1728184323,-1876416723,532652075,235753216,0,344952476,-1548118497,33620223,335873027,976828423,1044200507,251661375,8,235929600,407961344,1048592, +1728184323,-2108666017,532644181,235753216,0,680496796,-1548118497,33620223,335873027,976828423,1044200507,251661375,8,235929600,407961344,1048592, +1711407107,-2108666017,532644181,235753216,0,680496796,-1548118513,134742271,134744072,404230152,404232216,251661848,8,168820736,491847424,27262992, +-486146033,-2108666017,1040941140,16384,0,685739242,-1023088896,1061093631,1061109567,1061109567,1061109567,251658559,0,83886080,491847425,27262992, +-486146033,-2108666017,1040941140,16384,0,685739242,-486217984,33620223,335873027,976828423,1044200507,251658559,0,83886080,405339919,18874376, +1661599759,-2108666017,532643924,16640,0,680496796,-1548118464,33620223,100992003,168364039,235736075,251674895,0,88080384,491847439,17825808, +-486408189,-2108666017,1040745047,235753216,0,685740010,-1559959808,33620223,335873027,976828423,1044200507,251660351,8,235929600,411369216,18874382, +-436076541,-1685748834,527237777,202067200,0,1113557347,-1553178081,134742271,134744072,404230152,404232216,251660824,0,168820736,411369216,18874382, +-419299325,-1685748834,527237777,202067200,0,1113557347,-1553178081,33620223,335873027,976828423,1044200507,251660351,0,235929600,730136320,20971528, +-436011005,-1685748834,527237777,117851904,0,1113557347,-1553178081,134742271,134744072,404230152,404232216,251661848,8,168820736,730136320,20971528, +-419299325,-1685748834,527237777,117851904,0,1113557347,-1553178081,33620223,335873027,976828423,1044200507,251660351,0,235929600,405339904,151519240, +1661075587,-1876416723,283090988,117851904,0,348692430,-1478701281,33620223,100992003,303108103,370480147,251660311,0,235929600,407961344,17825800, +1661075587,-2108666017,283083607,117851904,0,684236750,-1478701281,33620223,100992003,303108103,370480147,251660311,0,235929600,-1190723840,12533760, +1207314104,259326259,155711014,-1190365951,12519424,855960496,-1207702592,-946993376,-1410072781,102679303,-1341837336,63224321,-322765074,-299889584,75958006,-1606257280, +12125257,-1207910592,860354086,638350593,17385462,12524405,1008135088,-1089569274,12165120,2115189888,2103524356,-339725536,119584771,-13383794,72105603,-217943040, +-527804245,-994442832,520613635,1279165379,-311164924,-1912600391,1373909703,-387151280,-13371861,12173363,1487664000,46432345,-315430430,-336193816,1228832968,377358084, +860354086,-1274055423,1207313923,41222409,646449076,-1966930871,-402372314,-2134701514,33851150,637777082,17385462,-726530188,75966080,1662421501,1309067012,-973078524, +287238,-1090516807,503710800,-205507833,-1977219157,-1545326073,-1977220022,-2069757625,1200236036,75866882,55020326,637815971,-2045491317,73442244,-6559549,-1023409688, +-1342058822,-331157832,609280138,1253617915,222554351,-402644760,-924319668,-434065408,42788896,-401370648,-2141712934,91489508,401127600,1405352726,-1174027389,12059588, +79294209,637644800,-461363318,-29102305,653583040,-1028520054,-397190162,-994963672,-285015880,-1179073701,368437375,30325498,1122940080,-1337306900,-270257484,180585299, +73602699,-1207955015,854536209,663365312,-1057078289,-1977157662,818708519,506351,650182211,-487643254,-826647561,-527804415,-1326467920,30325425,-1460911378,-1961266175, +-2147196138,45352642,1963501804,145288443,-855704716,-1006898571,73602699,-1977216592,-68215961,-1996032317,594806788,868451155,73602699,-335101312,-1062072140,1947335808, +-289109495,-1977170690,-498864633,1405311983,-1960590461,1662422003,113410052,-1157988116,347680628,-1293667840,-289109312,-1977170690,-498864633,-289109260,518963250,74835974, +158657803,280567327,1185215232,1528760228,-390352701,-527821529,-461369564,1946303680,1946238145,-1141142595,-557967522,16547862,71044213,1589322101,386842135,1689983467, +384744983,1950416000,392870670,-2145976642,57966844,639033022,17843702,235305844,1946265607,133663492,-1062055930,838865081,-289109276,-1977170690,-498668028,-1475913484, +-1304136703,-285232954,-1293108558,-402542400,1059324478,-17905486,126496450,1200238318,-1976635903,-1293024697,-1062015814,535301552,-1304484862,-1023480120,55020078,1200238318, +-1976635900,-1947335353,-2080928801,79237315,-323309056,250155188,1086751743,117473515,1061095168,117456703,1056966400,33570560,842138112,33567282,838861312,637547008, +909518336,637548086,905979392,922760704,1061107456,922763071,1056978688,117456640,117901063,1061095175,1061109567,33570623,33686018,842138114,842150450,637547058, +640034342,909518374,909522486,922760758,926365495,1061107511,1061109567,707411775,1061109546,520104448,355472703,1392384,-1308379565,-289393972,28363442,935560174, +163172018,650129920,1139746698,-136134402,-397360293,-1460928181,1492874248,-997801806,-352261138,-289110528,15409328,-1007812373,989145682,839024112,-1610563648,-1017460850, +-2146368072,251939134,116787826,1952449671,17152003,-1161131069,45614020,-779358449,-315441101,1605038935,-427111797,-994442576,-779358461,855637944,-1426892819,-2053061793, +-1964771836,517508087,-924311802,1274872831,-994379659,251836419,1405296623,73539210,1526844904,-785647477,16892545,-1014307790,1960512195,717654577,-2061044029,1388874500, +-1157661208,-1292958770,251836612,102652655,-386518497,1377764156,-1157667352,-855768114,-1712825617,-561331201,-620037909,-561380235,-964022549,-162348246,839157030,-1948059658, +-12785464,-284963142,45663410,509275919,-1527570682,669536799,63879935,1525665022,-167475808,-134860061,516459490,1464934150,-1207712582,871304962,1605039040,-1327003047, +-4657406,-1163201537,45614020,-1021317361,1122957980,1256980715,860930973,1490587328,-768401725,378264206,-1031797661,516103942,-628174285,73602699,-1185823969,199753729, +1371756800,-402652487,-1017577470,-1229958832,867189734,95437542,1642349286,51175562,-1185848858,-997556224,-497419038,1499588341,1394525016,-6100910,-13443190,-2020875311, +266863696,-338604032,-150713183,-1039967517,-1021355174,-1596945582,-453639094,-1039927758,-1017454383,-444340085,-1500893681,-393537151,-305009199,-305009199,772793731,427918986, +201523395,1009987599,-859586497,-51121969,76228351,12247174,-1060833664,-703987084,-523112752,-243932975,1157650056,1662421955,-2033874428,-510988320,-1007697666,73602699, +-528038518,-18773265,1388572608,-997535605,71968502,-523116335,-1039927758,-1974221990,-771804449,1351060451,-387198716,-1017446398,852527954,-997567754,653780018,653722698, +56231045,-13479742,-150713183,-1039967517,-1957510310,71999696,-164436746,-523124221,72222211,-930350895,73602699,-443937104,-18773265,-1017450560,653771403,-108329910, +-271454255,-133959727,175439626,-466434166,72099575,-511641597,-763317241,-2132229140,-389812994,-1062010888,-1007804240,-1291849752,-301944640,-1472281405,2110006788,197495812, +-1336687633,-28776434,263250058,-1946271256,-1441875752,1427093743,-401690385,-1438843342,263196020,1023289832,839152725,-1329374272,-270038514,-477445890,1526837487,1343134915, +1448543774,1397838421,-1957343152,450410732,1561740937,278063448,-25630525,72222211,16892545,-315436757,71970443,-125049391,-1957498741,-136039741,-620078363,-661979965, +-1599078210,807666704,57946172,-1900543810,-389968954,41287619,-268181878,71964218,520488564,-1023397656,1290280710,-1963146496,-1342128424,604246176,1949318192,-1207910909, +-1047869810,-1863784822,-1979550209,735967198,-400619792,1405288449,-886387062,165932338,-489556430,-788517912,548428010,-212350326,-50110549,-193606658,-964013117,108315434, +-930356490,1347986931,-930356490,-215961512,-1957575765,732230602,66202618,1509753845,-1950093086,3074264,-1900543814,583240410,-1461464097,805532800,-671694052,-148753270, +478731786,-386102589,12189708,-1965388104,585683460,682673095,-1024007434,84112385,-242540584,-288231727,2131099520,-152042740,65110225,62382544,65982915,-2133723408, +28772321,-661979965,-1900543816,-389968960,41222252,-268181878,-1023400728,-1193768196,-1064388608,-427114102,1962955752,-136410622,-255426083,-255360768,-386913536,-1966931967, +-473224498,-896904928,-1527556266,-248788342,-964560597,-947838976,-1527570432,-184328609,-497419005,-1966634272,-1426892854,-114570614,536921985,56601331,1976303357,1256768490, +29524477,1372662529,-422444367,844751826,5291501,71908992,-805014522,115397090,-1946645729,-162483984,-1009055005,-2114180120,872706622,839087378,468239296,-1157647125, +-1073085484,-21756812,-1991199566,-1207672042,-1075311090,-132126719,63748696,-1295768852,-1058476350,-130094856,-386234904,12123518,-1898410336,309696,1359020219,3926099, +-1073063589,-405797259,-270351362,-1195068848,-1192292860,-1192292606,-269995856,1095949,-24381901,-1974118984,984394436,-167086652,-1191910700,-739761989,-1161603059,45089732, +-1292900470,-1979404082,32042979,-1430732032,1763498,360038410,-397060680,-1073086448,520489845,864026553,-205507841,-1174617174,-13402113,-164386061,-1971322951,-1003311904, +-102628747,-78452541,73404041,1613022602,494149800,975110329,168850921,-1609599763,-922876795,108849210,-385829911,-1595342659,-2029586944,-545980156,71908992,-2146929657, +67389758,-154992260,134514438,-387382412,-2060023283,-19494396,2129214154,-391008215,27790683,-922046091,-376787596,-906047862,982546923,-1972079414,66945230,-376830852, +-906039856,-109025813,-1973387773,182790881,973764068,-28871471,1959869130,180718132,2126920385,50102282,-41938306,-2134343934,-1082326020,-889268598,578079290,-906047862, +-376780290,-25105366,-33128696,-339345727,-391008230,27790567,-1040313996,-1313862165,-1475552536,-33262591,-1174344755,-1196424754,1357660910,158598312,-461315958,1253617915, +-401951505,-1470563545,-1979157500,30325472,-1007699792,78126788,-1960852442,2112096979,-1146043647,604804840,1946265615,988303401,-633645056,121386101,468190325,87868161, +921175157,222085889,552076405,154977025,-2115501195,71090945,37488756,-1058535308,-2031566078,367575809,-2134654206,1803486204,604276896,2114075663,1946696760,1946565684, +1946631216,-391008212,78122035,27803765,116787061,1963984009,-163532789,-2116549660,-1023098685,-321896272,-670833418,96519041,-391008061,27790343,-321909388,-453623632, +142656385,-1329342461,65336896,1085326296,-453579568,-1014900733,-2134703552,712771580,-1313856641,-1475619096,-1474988796,-167283455,268732678,-1014954635,-2117926464,-1023000381, +33604481,234651843,803735420,1960459008,-58670335,-2146402541,-855765020,-453623632,-1014900733,-2134702464,91578876,1907147649,1660715203,-1014954635,-1010601492,2131688576, +-163532793,-1009253404,2131819648,-2143244278,-453639484,-1010575357,1969618048,-322731771,-58670221,-2130348697,-1015796541,1711046851,-1014954635,-389844052,-2134704127,91575548, +1928119169,1744601283,-1014954635,-2134674580,91579900,1932313473,1543274691,-1014954635,-2134702272,91564028,125879169,603750595,-1014954635,-2134702144,91568124,134267777, +872186051,-1014954635,-2134702016,91579388,1923924865,-58670141,-2130348716,-1015911229,1969486976,751010053,-2134654094,947848188,604276896,2114075663,1946696729,1946565653, +1946631185,-801066995,65337068,-2134670888,1085326090,-167582592,-1009253404,-461356880,-154862078,-1009253404,1963457664,-391008237,78121611,-1014954635,-2117924096,-1022672701, +2131164288,-163532793,-1009253404,2081291392,251429114,-58658946,-1341227248,200048704,-670833418,176210817,670859459,-1014954635,-2134701056,91563004,205570945,-1031683133, +-628423104,2130967680,76062775,37490468,138156158,104600692,121376884,1085279348,-33364864,65337028,1085326296,-167582592,-1009253404,-461356880,-154862078,-1009253404, +1963457664,-391008237,78121459,-1014954635,-2117926464,-1023278909,2131164288,-163532793,-1009253404,2081291392,284983310,1085278847,-167449472,-1009253404,1965554816,1086554373, +-58670333,-2130348765,-1023180605,1966603392,-1060929275,-58670333,-2130348749,-1023147837,66879683,-2002771841,1007625220,1007713794,1007449096,1007186950,-2130414585,-1341865789, +65336896,-58670120,2081783559,-391008232,78121323,-1014954635,-2117926464,-1023278909,2081291392,284983304,-806878081,-58670083,-2130348761,-1023262525,1965292672,-2134671099, +-58670334,-2130348745,-1023033149,1966341248,12812549,-1195130106,-994443008,-1330057469,150857921,-398478408,-165279497,1971337287,1065362974,-1340181148,151120059,259268776, +927462950,-1207405120,-1075298125,-1207506168,-1209530192,-1062029304,-1207384344,-1058535503,2142615560,-1207387416,-1259804746,50378760,-284965702,-389039432,-1195898713,144828660, +-394808136,-1146091365,604549864,1946265615,146454547,-1207405080,-2065154119,-38684664,-1022853400,61978704,-1207410200,1894268857,3954696,-1162344587,139520008,-138757949, +-1022861592,1961409456,-1475402744,-385649407,-165281560,1948256327,-2135574491,-1207423512,669522102,1069070344,638072552,268978166,-1296561036,135587841,-398413384,-165279730, +1954559815,816887815,-1022885400,927462950,-1207471040,-202889552,-165231865,1947219783,146192403,-1207441944,-538443342,1085388807,-1022895640,82358704,1946265608,548583548, +-402142744,378271124,1048577123,1946682501,-2059501555,544477188,-277080648,-165278741,1946235719,-1676298236,45201647,638033384,-32610422,-284905276,-402081608,-1263007858, +126412936,323483174,639333760,-2147072010,-1313337739,125102128,-394218568,216729454,-394218568,-1313339546,123791400,155711014,-1207536383,1407716280,-1202666745,1273503922, +3954695,-165276555,1963002183,-2001422324,-1207485976,870845368,37536519,-1279773067,120121472,155711014,-1205701631,468191928,-2001422329,-1207495192,266870970,682735623, +105379366,-1274907264,117499952,45660355,-1022952984,762643516,-394218568,-165280018,1947207751,28489758,-1207508504,-605536079,280672262,-1207511576,-806877000,-2001422330, +-351876632,-1146043519,-1475939608,639071233,-2146940938,1592264053,-1207505948,-1410842446,-348081914,-165244907,1971324999,1085454344,-351888920,-465573885,-1977188175,-461372057, +16548032,-1977214347,203688263,276759612,138933798,638154208,272058358,-511049099,1068873904,-1022975512,-394217032,-1229453730,106489984,-394284104,1048577639,2114126921, +1228832782,108332804,-389566024,650315347,-1173133430,162530260,1739700463,-1341766936,106555579,27791140,1048583796,1947206789,-391008247,27788871,-1313339531,101509128, +-2135836477,-1023015448,393543740,323455526,121376548,-1313338252,99674128,-390088264,1019414015,639530242,605243274,1946631183,280082445,-1207577112,-454508615,-1313291515, +97052800,1963211971,1405338369,73602699,-1979334016,-2147202786,816848867,2131229568,-2146929617,41223931,-1561444432,-13499290,-961391878,-1976673556,-1574595961,-494926747, +378269432,-1031797661,-1062015994,-68280144,674022235,774514989,1392912670,71902858,1526785768,-326909177,-95268856,-1173568381,45089732,-322765074,-1336882434,-1023480316, +1355480812,95473330,-322765074,-1336882434,-1023480314,1355480812,-83563389,-285211208,-284948808,45663410,79228676,1482354439,176104528,237139136,-1177406713,71041280, +280430453,-346700099,1976106512,-1123109113,99305262,784140471,2549823,1954588760,27387907,1476644538,112255114,-527804177,1492059568,-527776590,1492059312,45146250, +519881711,12066566,1371573920,-91552335,-1336285229,-478129344,1541666307,1946469366,-2044722174,63998944,-470447110,-2034224614,1375679227,-1527526517,1948318595,2144519, +-1426863317,535618137,-133633853,38242854,862423590,1946273014,1194245409,242486844,1012254397,-1123585008,138166062,780730484,244056332,518521102,-2118860032,208932412, +272401588,45352564,7604284,11781258,-385952792,-1966931642,1342458150,1053054726,-1004141400,-980677507,812969739,-947654773,92939783,611647292,57984058,-1947014329, +92940029,-2069706498,1166747140,75866881,58573862,17579657,17696396,-1017641121,860354086,-1023314943,78126788,140493862,-1022639988,197071988,25830912,175439676, +1225144391,-386763516,-1950154751,-2147196138,57988346,-84994896,-17954384,-534451006,75835018,-1005925122,646642670,602408009,1200301815,-155124223,-2062120220,1358099972, +75769482,1979710592,75801095,75763454,1357051480,73602699,-17954384,-889262910,-161953654,41189569,-527769391,313576702,71999727,75769482,-453589762,385233, +72131329,1392910019,-389313966,646639884,-1075313591,1207314166,175440133,1947138432,284786698,1532635508,1522736903,247138139,1429126656,1015750414,292880139,16770945, +-754601658,-1946549273,-341511221,1522737129,280692571,2129051136,-622125298,71902858,1343218816,1053054726,-1004141400,-980678531,1081405195,-947654773,92939787,880082748, +57984058,-1947014329,1032464125,22907430,38636326,72715046,172329510,41221948,-2069706498,-2059499516,2110006788,-1326478586,-46995456,-1017641121,76089078,-1023314936, +-1192707152,-1475402750,-2131463167,-1274780866,20726389,-389873292,-1185742311,-927334336,-1965346045,-1947272509,-772812293,-2081435153,-1976695833,-30806139,-1869549886,-292515602, +-20709637,1541202634,-1341930310,-331158015,-1007755484,57934140,-393194773,1235222997,16300292,1014507199,1008825363,1008563297,1008301154,-1189776285,-205586368,2098215977, +1200236043,1963473922,708034307,-1160039597,-1014365240,-1976635654,-289210879,-1863413616,-17043824,-490012989,-1662297111,76089078,-352160766,24897702,-1090238048,322730278, +1631338356,1648114548,1664890740,1698444148,272383860,-1977199235,138150471,-1185723019,-617414648,1359202490,-1090516807,-1007211901,57933840,-399860801,-497483445,1206475754, +12145663,-1160039679,954729416,938040065,280581119,-1160039680,-396950584,-1184956121,-617414640,1526809064,1409228265,855654585,63486683,-285555830,-271451253,-410783791, +-2054541809,-1023530381,-74715504,-410783791,-2054541809,-292541837,-410780789,-2054541809,-292541837,-20709637,1539957450,16701929,4128810,136057093,36185355,253762311, +204220436,338306321,255210014,455878419,104412192,321134347,154151960,354820365,322121242,523250455,238893092,540159256,4143140,136057093,1577995,136057093, +236459019,540159256,239024164,540159256,4143140,136057093,1577995,136057093,236459019,540159256,239024164,540159256,4143140,2752554,355074090,356455743, +4134207,0,2752554,707406336,2752512,1387050,355084842,353703189,356455743,1061109525,356455701,356466495,-1170260161,28312516,216810222,-5181920, +-301742406,-87848253,92942062,-1869561090,-1976678418,-292515835,92941895,-68251504,-20709817,-1008803126,-285555830,-33191378,-292515646,92941895,1206816912,-1878685138, +1207692944,-32455805,-1008868662,-826650286,-1964049919,183255752,1254197984,1515846639,-1169075517,-285605426,-331167606,-1047863262,1509683018,-1168981158,1525613006,-826649917, +1122957825,-1017447444,-826650286,-1964049919,585908936,-1965028667,-68203839,-71083431,1460018940,1364350294,-2041556909,-773573920,2112992,1027177616,880017446,-1879033154, +1962943549,855343113,-380107659,-1336930861,-5642060,108266408,-1879039810,-1313862165,-1459643672,-1107004415,1485832232,142460475,777580683,735094015,1499158616,1600019802, +1120739079,1499158735,1600019802,-1865474297,915877004,919287470,772156927,783822391,825175881,994783539,881406915,921122088,923155528,985937991,734342085,734342085, +734342085,1939043090,175797604,49152,0,0,740950016,49152,0,0,1703936,-1073730492,0,0,0,0, +0,524560,16777216,16908800,17040384,84018432,100730368,134219269,117442561,101123842,-1073715770,0,0,0,0,0, +0,0,745024522,-2131997720,-217807066,75826887,113639432,-954727292,771820550,235834431,-2115991039,1968526845,10610947,-2065124176,1946331390,-2132508666, +-1610101632,807666704,376778812,2133116042,242487100,175376188,108856380,-2139036544,-997586996,-1971379120,-240588576,618695256,2114403455,1976777479,16836867,63748688, +-1313557780,1207313968,208929033,548525234,930415016,116066741,796131752,1642597301,1975519981,-2010742773,772337668,468386952,-2029092776,37488644,54266236,243271039, +-2147220345,134514446,-2130809111,-821817306,68161032,-2132508584,75966080,-2027550593,-1327461884,-36312908,578028456,2131229824,1227261978,-421533692,-1947802392,-402366450, +-957812733,-148838153,-370806808,646512183,-58719159,-2130280941,1951749629,-424155133,63748858,-1159689492,-1158937658,-990510152,-1174178815,-1070464040,-1343685650,-425727764, +-387514904,-571934764,-142612251,63355642,1662421996,79855620,-68239310,1072190214,-402170887,-1313806765,-1459793176,-1962445822,-402366450,1793650575,-329062164,1493026537, +-380632908,65600959,-38147840,-1561670680,-466484126,1277622096,72262404,1048627339,1996948553,-1258696446,-343807988,-1947807394,-402370428,868477916,-1965125898,-2147202778, +326567932,-58718860,-402227453,1961487535,-307107587,-2130874647,41686012,1340616308,-1948742935,-374085439,-2061043886,1244067588,66554628,780884720,372900938,108266570, +-370561304,-504824513,-46536215,-1964432920,-389968936,-405673595,-405674031,1244564306,-773467900,-135933467,-150698714,66554853,-1847043344,-49419965,-561056205,71902858, +1946680448,-2146339065,108987388,-370384920,1206451443,-51516947,2081684608,-399739902,-661985074,-427114102,787006718,653742825,653722757,1043006538,-141884342,-1956974549, +-150713810,-383129379,-386090263,-661985118,-427114102,48809214,1245588457,-773336828,1390924263,75835127,71968503,-523116335,-141827887,-1956974549,-788248018,-773467675, +-388106267,2095661824,-1896467460,-1207910690,71908992,-2146468349,117721406,12457852,-385649488,-963772262,-1947613208,-1960421160,1357467655,-1580822788,1323828304,-1141863446, +-483721208,1048636555,1963328585,309537,-2012968410,642056262,536904842,1157645960,-498022781,33601771,-352288582,-422473704,-402651975,-964564517,-722984960,-1326546455, +-336535009,-991220768,369167422,-1946842337,-212379957,1952341926,62979611,-277525765,242535678,-991366168,-1342145474,8436352,-1070409237,-486283893,-924233637,14150139, +71908992,1947696147,1228832879,-311140092,71908992,-2132380574,1661225278,12115828,-390033760,-259266120,75832971,-326376661,-1190656584,-826671099,1228832771,443682564, +75958006,-1273793184,29816586,-1274907392,-284708859,-1189608008,1374617861,-1977169013,-1999571452,54853702,-503035338,-1192273679,12189952,-11671295,-1902116680,72393152, +-164441973,851741266,1244067812,-2061043964,-1039967740,512487563,-483720059,-1957434229,1325681214,-405674031,-422451247,-422451503,838863033,76162788,-1073027888,-864025740, +-236829183,1157654152,1967912707,12082147,16824833,-1191252247,-1064394752,-1947664408,-2061595664,-1948046588,-829729812,1049297841,-749796278,-742010137,-439332378,-400628352, +-1319511733,652489224,-456129398,57982986,1174523008,-277493250,1157654152,41154307,1967900158,12082132,16824833,872322793,-1123816467,-13434879,12574606,1227262648, +66879492,12520830,133988528,1098646900,-1979617303,-946974493,-13443190,-2020875311,-338688944,1252053131,853865988,-1950219274,182964728,-1593215781,-134020020,-92943362, +1978469208,-374607099,1202387515,887749858,12079354,-1581216072,786957392,1492683752,141852840,918912804,99287164,239021758,855411231,-773795356,65065440,117407984, +-405709196,1437660042,-167517312,-1965520157,-167464200,561348806,-410457940,-2081903445,-2054609177,-947707906,1976237646,149849067,20901761,-857089054,1743301881,650322919, +-391379663,-1021057186,8728870,1355252512,-445265154,-2130121085,-503234833,-106567244,-1007287118,-1407355776,-1408946138,8728614,1355252512,-276837634,-2130121085,-503234577, +-108926497,648850092,536839560,-28326013,-2081325110,-276756242,-991821505,1358522089,-1902116680,72393152,-164441973,-997524853,653780018,653722698,-134019963,-405674031, +780920785,378209413,-162003894,-989559514,50400310,-489600272,-489561391,-846507689,-1968437067,-792229152,-1979550748,-838948157,-100404363,1599728354,721995651,-371334411, +-58656509,1947630611,1643937942,-58717068,-2146995102,41182204,2028667883,12079248,-390033760,-125049096,75837067,1245088600,653678084,918881413,-268238580,-1007287370, +-1303808640,251836612,1465015023,-980692693,-1070407542,61535057,-855746054,-1168116107,45089732,1542448010,-1957603509,-1977176883,-83645915,1599731682,-487249081,-1194413332, +-1292959741,251836612,-126227985,62443186,-873730280,-1610565552,1352777870,852527876,-997567754,653780018,653722698,56558725,-2060547080,1242991364,653678596,918881413, +-268238580,-846507689,-812951727,-976092239,-444545584,1390924574,1524019944,-1342175047,639928960,-528204408,-2010774668,-389003491,1499460066,-486931642,1197431247,-991759061, +871891689,-1965125898,-2147202778,276236284,-58718092,-402424317,-387323959,8382967,2081684608,-2141424623,-244030980,1952644224,1677492460,-661985420,-1159315992,145753038, +-1610565393,-1007232882,-1306626688,-16598844,-970618129,-477495291,-1272608017,-282752769,146329266,-1662390273,402897143,-1329286417,-270300670,-4971126,-1292950136,243918, +1356852207,-1902116680,71999936,-523116335,-487071535,-125058813,92808792,1358391017,-1902116680,71999936,-523116335,-487071535,41140483,-125058306,-439293302,-400628352, +643356107,1021904264,-1896467465,1227262686,133988356,175378295,2114190464,-416946171,552161371,335315191,947130748,1952578688,1660715086,-58701452,-398166941,-863312518, +-1902116680,63879896,79232818,-405737725,-652075638,-813694092,2110586369,-947234576,-152966832,-788247903,-773795360,65206240,-1191670847,-661741568,1342540376,-1577662743, +-523172790,-523116335,-1056709897,-1023540621,-359991157,-444537392,-718149602,-1902116680,92952792,-157423280,-644953805,73547402,-506409078,50614462,-1978364943,839141646, +867812,74791551,267113010,443877948,75773498,-286719115,-1983447552,133791764,-1031076481,-370889752,121435739,-1830287755,-162403869,141887548,-545992182,-605304066, +-2135424833,192807929,-2135949121,57935865,-1953464597,-1962653154,-964013878,-315431946,-506345469,72224259,-108279922,-372135336,985857601,-1995213613,1662421780,-1978748924, +-510988315,-370163458,-768412165,909822763,108266628,-888944898,344579563,73602699,-443937104,-18773265,-405672000,23431718,1312721744,-772568316,-1594424346,-470416252, +520538251,-880040461,-215961512,-172627541,508563100,1431721734,1347637586,716827787,307136822,-385875527,-1023476983,71964218,344524148,854953705,-1982713089,-2076820972, +-30706684,-1981027386,-1207910636,2114189696,-1342128371,1946679680,-335597051,-1031041007,-1897680920,-1946580025,-385594850,-919339140,75773578,71964298,245156606,1460018768, +1364350294,-326414253,-1992911688,28840518,-140252922,-386584855,116843072,1963459719,-466462710,-421664688,-369812759,703132939,853510882,-1981558273,-805023593,1646147819, +-1962576636,-481630014,-386598167,-544546292,-472776910,72390539,73404043,-998024360,1600019716,-389079289,-2019499536,176169988,-1979430650,-1979430362,-2096864706,1515783364, +123690589,-773271777,618695393,-789786609,-789786388,266633452,359982090,846515454,58051838,-24091157,-385649204,-1796669249,1946369268,2130983946,-294983677,-1158379799, +12059588,61927169,-1192238198,-370212096,71103603,1397810807,75761350,-297342721,-544581541,-1073021134,246615668,141820220,37488819,280167028,75832969,-376779894, +15257086,-272373530,183778025,-32279360,-31558456,-29461304,-29199160,-381258552,780792867,109838460,417923198,-1899459340,181075648,839349467,-1752551681,780744657, +109838604,243859726,378012805,-186055548,403505395,1194245418,-352317767,1060027856,-352319303,1439088072,-352317255,1975519936,-2062644295,-2078897660,134184964,-8372361, +169637633,-1006209537,-352289746,204391472,774564609,775892551,-967496125,243197525,853510663,48988415,-75242543,-1341555702,-217454415,91554472,330271534,-2091165640, +1599997636,-2117132513,1968506619,-527767525,1072226442,995972070,-1123846678,1532559359,1583241817,-820043937,1964047232,24701187,1965095808,27060483,821788752,-1313862284, +-1460487448,1476686849,1492335337,1949367168,10873091,1021330408,-1220709120,63748616,1963043052,64272920,182573032,-1609861696,807666704,276115516,-1662451017,68198400, +809250852,45548149,76029578,183559040,-2011264801,-1870730492,1383399740,76097152,-1173768209,-1460927540,-1222871807,68198411,809250852,162998388,-402402118,-1073028732, +95886452,-1601169173,807666704,242561084,-1262875721,-513087485,41205770,512361399,-478149496,-1998648592,-352024546,37523496,243279733,-351271799,838566056,-1712841099, +1946172639,1963015179,-1995538420,99289092,76097152,313546999,-227940016,1966275456,1189657109,91602954,-336720208,1976106728,-301944600,-75440149,-400984781,3989340, +20712308,645975925,-335739767,-1995538232,-1041563132,1966406528,-549525476,125108284,75966080,1018096638,-2146994943,17073934,283747307,905674994,149488501,922452210, +549135221,1946238207,-553600247,41156668,-1157987349,28312516,-322765074,-1022703838,1894382574,-237114881,-1277235224,-1174358269,-1460927540,-1224575743,76062721,78766218, +254143698,1489537807,-997997686,1583176196,-820050081,-86064152,1312455,244070974,-369426410,844296607,-1328401436,-166212339,141896132,-768351182,399313584,102679386, +1381324375,-397388975,1048632976,1946223872,444002,512360709,-13499294,-74718255,72385931,-1963576752,839156750,-1957608979,839141902,-5314350,1965671670,-1991093950, +-1274785643,168873224,-1342016064,852636448,-166212124,628435396,1505951322,-956375070,-389291431,-1070399616,1476722850,72385929,1491034088,1566202203,520576862,1499028175, +-454295632,58459196,1408301801,-2032268312,-771804421,-1946448925,1527009461,72390025,-470774954,642994513,1157645962,963906876,896797244,829687612,762579004,182007, +-1977219724,-1186660258,162791425,-18895128,1242970818,839547908,-2076820782,-33000444,1351977414,-1341396220,-401689590,-1785995377,1499137104,-145051678,1962934726,1351977220, +1350929156,-557127676,-386893079,1048632716,1957954659,63748619,1963043052,-262543098,-1326423319,-271193932,108265896,-385828632,15265875,1979648735,-2132571620,645930980, +148898918,-402364890,512360499,-478149530,-771378912,1228833003,461243140,604268192,31686879,537657972,604268194,167906320,4450520,-386920727,149544617,-2142219280, +-74838045,-478026800,-552990960,71908992,-1274119164,-389838336,-317989960,-2010774668,-389838307,-318046197,-2010774412,1532498013,-401492797,-389817444,-90383129,1963501804, +145288443,-1062012044,-1275067463,-289109503,200197002,1191474413,-31619034,46366916,548465634,-1597792786,-16120730,-551284364,1946272758,-1574958078,-642120602,616820227, +535003360,-269761782,1021087720,1344110340,63748690,1510058220,-2146798504,-737909954,1625885300,1665040623,-160058364,-226550980,-393485262,-13703727,-1287881818,-482554308, +1648170556,1648124476,1329411900,1648186173,1648124476,1648124476,-2143526340,-1841536451,1648212285,1648229692,1648233788,708600380,-398568642,-1014243905,-706158458,1961692122, +851937799,25700095,-371354648,-1528238345,-578098979,417908618,1961692159,2106074859,115731217,534613736,125103371,297398923,-1952124160,1709767410,145288413,-466420876, +-1174400839,-997588032,-17912594,-1393040700,-67182872,1172878059,62962397,-1343737680,-2131286821,-553360090,1946221440,-2146956281,537158926,-393090066,-1014309596,-1061543924, +-611522557,1532545163,1347680650,-1275102743,-1947931887,-586749702,838865081,62962404,-285555574,-2010715070,1254424069,-498598930,296811247,-68402450,-402290650,2011946213, +76089078,-402426878,-1014352611,-382385944,-91492813,650349393,-1977207414,-1977220755,116785741,1946289289,888924163,-2093670168,1497564103,216653538,1977289454,-593565669, +-1341931334,-620173264,-940146908,201487361,-399461248,535550396,511036414,-1159954456,816841664,-287643160,74809512,-405739568,-947243852,-388391960,-924197788,-389838099, +1532507374,1560593539,520576862,1375374287,-605502581,898115124,23955494,38635558,1124321155,-370613671,837348763,62962396,-1679280976,-285701414,-1813499728,-1476283430, +-1291422336,-789590016,-602740497,1347639384,1374515945,-1746353269,877389876,1127510248,-370089383,-863965857,-1185812734,-18743280,-35356583,-1185809425,-18743280,-1325743271, +-331157832,-1327461814,-461352776,1392242683,-1207712582,1525612800,-290213638,-527766462,-72110006,-2130722840,-2131755292,-2131819316,-386987828,-863961168,-1444352255,30179583, +-6100753,-268508032,-2130732056,-386924828,-461308012,-1914114050,-167462913,108265923,-285094784,-461372181,2045308926,-18099969,-2132249137,-386924828,861011820,1096155, +-1327247024,-331157833,1946724426,30114563,-11343784,-2141590814,-386926620,-461308088,-1168969733,12059588,1482354435,50159,0,-2122448896,-1715633755,-25395583, +-20530474,-289013636,947715838,940572688,947715708,940572688,284093968,2084044856,275578622,402653240,406617660,-402718720,-406617661,402718719,1013343804,-402718696, +-1013343805,236912615,-864537058,-1015121716,2115534531,438179864,1880627230,1044275440,1727411766,1020988446,1013376870,-1065352997,-1057949456,100794496,102645278,1008205826, +1014896766,1717960728,6710886,-612433818,454769531,1715208219,946629688,30924,-16908288,1008206078,1014896766,1008238104,404232318,404226072,1014896664,402653208, +404553244,805306368,812711536,0,-20922176,603979776,610729830,268435456,-25396168,-33554432,272137340,0,0,1008205824,1579068,1819017240, +108,1819017216,1828613374,2115502188,-66683712,-973078504,1613764620,1815609542,-859015624,404226166,48,806879232,811622496,811597848,806885400,-301989792, +-293798276,402653184,404258328,0,404226048,48,65024,0,939524096,201719864,-1067438056,-964951936,-420028722,2014838908,404232216,-964951938, +1714427916,-964951810,-972669946,470548604,218000444,-1057095668,-972683524,-964951940,-960037696,-956432260,404229126,-964952040,-960070458,-964951940,-972652858,469762172, +469762076,402653212,402653208,403451928,405823536,12,-33554178,811597824,806882328,-964951968,1575942,-964952040,-1059266874,1815609470,-956381498,1727791302, +1717992550,1715208444,1723908288,1828192316,1818650214,-1023541000,-1027540800,1660813566,1616936032,-964951824,-958480192,-960102276,-960037178,406585542,404232216,406585404, +-656926696,-859438992,-858197800,1626341574,1650483296,-289013506,-958998786,-423231290,-824248602,-964951866,-960051514,1727791228,1616936038,-964951824,-691616058,-956561796, +-858194746,-964951866,-972653376,1518207100,404232216,-960102340,-960051514,-960102276,946652870,-960102384,-285288746,1824915654,1815623736,1717960902,404241510,-2030174148, +1647319052,1618739454,1616928864,1623195772,101455920,209453058,202116108,940572796,50796,0,0,808517376,24,0,-864285576,1625292926, +1717986940,252,-960444804,203161724,-858993540,126,-1057044868,907804796,808516656,120,2126958198,1625324550,1717986940,1573094,404232248,786492, +202116124,1625323724,1819831398,406323430,404232216,60,-690553236,198,1717987036,102,-960051588,124,2087085788,61536,2093796470,7692, +1616930524,240,108839036,808452220,909127932,28,-858993460,118,946652870,16,-19478842,108,1815637190,198,1993262790,31750, +1680906492,403570940,404254744,404226062,404226072,409993240,404229656,-596246416,0,268435456,1819031608,1715208446,406611648,-973047604,-825833984,917622, +-1057044868,-964951940,-864285576,12976254,-864285576,14680190,-864285576,943194238,-864285576,126,410828924,-964937620,-1057044868,12976252,-1057044868,14680188, +-1057044868,6684796,404232248,-964952004,404232248,14680124,404232248,952500284,-956381588,943194310,-20546560,917702,-1057439490,254,-662791572,-662830994, +-656867624,-964951842,-960070656,-973078404,-960070656,-536870788,-960070656,-964951940,-825833984,-536870794,-825833984,-973078410,1993262592,952531974,1824966252,12976184, +-960051514,402653308,2128140414,1815609368,-161025952,1724055660,1008238140,-956563432,-857813764,504103118,404258328,946392,-864285576,1835134,404232248,234881084, +-960070656,234881148,-590558208,-67108746,1718008832,16646374,-822679866,1815609542,8257598,-964952064,8126588,1572864,1717579800,60,1616935936,0, +202144768,-859832320,914108632,-859816436,1013723352,1576062,1010571288,905969688,913102956,-671088640,-663996820,-2011037696,-2011002846,-1437235166,-1437226411,2011015765, +2011002845,404256733,404232216,404232216,418912280,404232216,418912504,909514776,922105398,13878,922615808,13878,418912504,909514776,922093302,909522486, +909522486,13878,922093310,909522486,16647926,909508608,16660022,404226048,16259320,0,418906112,404232216,2037784,404226048,16717848,0, +419364864,404232216,404690968,6168,16711680,404226048,419371032,404232216,404690975,909514776,909588022,909522486,4141111,0,909586495,909522486, +16711927,0,922157311,909522486,909586487,13878,16711935,909508608,922157303,404239926,16711935,909508608,16725558,0,419365119,6168, +922681344,909522486,4142646,404226048,2037791,0,404690975,6168,910098432,909522486,922695222,404239926,419371263,404232216,16259096,0, +404684800,-59368,-1,65535,-65536,-252641281,-252645136,252702960,252645135,-61681,65535,0,-589767578,-864550810,-588854024,-33554240, +1616928866,-33554208,1819044972,-956432276,-966774688,2113929470,-657666856,1711276144,2087085670,1979711680,404232412,956170296,946652780,1815609598,1824980678,1815609400, +1819068102,1614676206,-859412936,120,2128337790,2080768000,2095511262,1614282944,1623259328,-964952008,-960051514,-33554234,-33489408,404226048,1579134,405799038, +3151884,403439742,792624,504103038,404232216,404232216,2014844952,48,8257560,1979711512,-596246308,-964952064,31942,0,1579008,0, +1572864,404684800,955783192,1826095128,27756,-663748608,63536,0,2088533116,0,0,0,0,0,0,-2122448896, +-1115586139,8290713,0,-2359426,-1588225,126,1811939328,-16843026,1063036,0,2084048896,272137470,0,268435456,-294907848,3674220, +0,2088515600,275578622,56,0,1010571264,24,-65536,-402653185,-1588285,-1,0,1717976088,6204,-65536,-1008205825, +-406611559,-1,236847104,-864537058,7916748,0,1717986876,410916924,24,438173696,404232222,7403640,1040187392,909524534,241628790,3102, +2128287744,1013343804,1629054,0,-51322752,-521077506,128,235012096,2130607678,134718,0,410926104,1014896664,24,1717960704,1717986918, +6710784,0,-606348417,454761339,27,-960070656,-554271648,-960099204,124,0,-16908288,254,1008205824,2115508350,8263740,0, +410926104,404232216,24,404226048,404232216,1588350,0,235667456,790271,0,0,1895723056,48,0,-1073741824,16695488, +0,0,1728013860,36,0,943208464,-16876420,0,-16908288,947682428,4152,0,0,0,0,1008205824, +404241468,1579008,905969664,1324598,0,0,1819017216,1819082348,7105790,402653184,-1060733928,-972669832,1579132,0,403465826,13002288, +0,943221816,-858851722,118,202116096,24,0,0,808458252,405811248,12,405798912,202116108,3151884,0,946601984, +7092478,0,0,410916888,24,0,0,202113024,6156,0,16646144,0,0,0,402653184,24, +33554432,806882310,8437856,0,-556874116,-960043274,124,2014838784,404232216,8263704,0,214353532,-966774760,254,-964952064,104596998, +8177158,0,1815878668,202178252,12,-1057095680,117227712,8177158,0,-1061108100,-960051460,124,-956432384,808458252,3158064,0, +-960051588,-960051588,124,-964952064,108971718,8177158,0,202113024,202113024,0,0,3084,403442700,0,1613764620,405823680, +12,0,-33489408,0,0,202911840,806882310,96,-964952064,404229318,1579008,0,-557398404,-1059266850,126,1815609344, +-20527418,13027014,0,1717987068,1717986940,252,1715208192,-1061109568,3958464,0,1717988600,1818650214,248,1727922176,1618763872,16672352, +0,1616930558,1616928892,240,-964952064,-826228538,8177350,0,-960051514,-960051458,198,406585344,404232216,3938328,0,404232252, +-656926696,112,-859439104,-655298344,13027020,0,1616929008,1717723232,254,-960102400,-690553106,13027030,0,-421083450,-825303306,198, +-964952064,-960051514,8177350,0,1717987068,1616928892,240,-964952064,-960051514,108844742,0,1717987068,1718384764,230,-964952064,205021376, +8177158,0,404249214,404232216,60,-960102400,-960051514,8177350,0,-960051514,946652870,16,-960102400,-19474730,13027054,0, +946652870,-965986248,198,1717960704,406611558,3938328,0,411879166,-960339920,254,1618739200,1616928864,8151136,0,1623228416,101455920, +2,209453056,202116108,8129548,268435456,13003832,0,0,0,0,0,402718464,792600,0,0,0, +2081191936,7789772,0,2086691040,1717986918,252,0,-1060733952,8177344,0,2081164316,-858993460,126,0,-20546560,8177344, +0,808465948,808464636,120,0,-959547904,-972652858,124,1818255584,1717986934,230,404226048,404240384,3938328,0,469765132, +202116108,7916748,1625292800,2020370016,15099500,0,404232248,404232216,60,0,-687969280,13027030,0,-603979776,1717986918,102, +0,-960070656,8177350,0,-603979776,2087085670,15753312,0,-859015680,202144972,30,-603979776,1616928870,240,0,1892056064, +8177180,0,-63950800,909127728,28,0,-858993664,7785676,0,-973078528,946652870,16,0,-691616256,7143126,0, +-973078528,1815623788,198,0,-960051712,-972654898,124,-33554432,1647319180,254,403570688,409999384,923672,0,404232216,404232192, +24,409993216,403576856,7346200,0,56438,0,0,0,1815623696,65132,0,-1061132740,1013368512,3722264,-960102400, +-960051712,7786182,201326592,2080387096,-960430394,124,-864538624,2081191936,7789772,0,2013318348,-590578676,118,405823488,2081191936,7789772, +939524096,2013280364,-590578676,118,0,-1061108100,1813544134,805306424,2080427128,-960430394,124,-859045888,-20546560,8177344,805306368,2080377880, +-960430394,124,1717960704,404240384,3938328,402653184,939550268,404232216,60,405823488,404240384,3938328,-973078528,1815609542,-960037178,198, +3697720,-960074696,13027070,403439616,1627258928,1616936032,254,0,2132532070,7790552,2113929216,-656877352,-656877314,222,-864538624,-960070656, +8177350,0,2080425670,-960051514,124,202911744,-960070656,8177350,805306368,-973026184,-825833786,118,405823488,-960051712,7786182,0, +-973027642,1993262790,8177158,13026816,-960051588,8177350,-973078528,-960102202,-960051514,124,1008211968,1717592166,1579068,0,1616931896,-161062672, +108,1717960704,410916924,1579068,-67108864,-859767610,-858993442,198,404426240,410916888,-669509608,201326704,2013278232,-590578676,118,806882304, +404240384,3938328,201326592,2080387096,-960051514,124,1613764608,-858993664,7789772,0,-1140794250,1717986918,230,14448128,-152647994,13029086, +1006632960,4090988,126,0,1819031552,8126520,0,0,805318704,-960077776,124,0,1618870272,24672,0,0, +101058174,0,1717723136,1613764716,403453660,1610612798,409757282,920546870,394878,404226048,1008211968,1588284,0,1815478272,3566808,0, +0,1815506136,216,1141964800,1141982225,1141982225,1141982225,-1437226411,-1437226411,-1437226411,2011015765,2011002845,2011002845,2011002845,404232216,404232216, +404232216,404232216,404232216,404289560,404232216,404232216,-132581352,404232216,909514776,909522486,909571638,909522486,0,-33554432,909522486,13878, +-134217728,404289560,404232216,909522486,-167315914,909522486,909522486,909522486,909522486,909522486,0,-167313920,909522486,909522486,-164219338,65030, +0,909522486,-30001610,0,404226048,-132638696,63512,0,0,-134217728,404232216,404232216,404232216,7960,0,404232216, +-15198184,0,0,0,404291328,404232216,404232216,521672728,404232216,6168,0,65280,0,404232216,-15198184,404232216, +404232216,521672728,404234008,404232216,909522486,926299702,909522486,909522486,926299702,16176,0,0,925908736,909522486,909522486,-147442122, +65280,0,0,-150929664,909522486,909522486,926299702,909522736,909522486,0,-16711936,0,909508608,-147442122,909571840,909522486, +404232216,-16711912,0,909508608,909522486,65334,0,0,-16711936,404232216,6168,0,909573888,909522486,909522486,1060517430, +0,404226048,521672728,7960,0,0,521674496,404232216,6168,0,909524736,909522486,909522486,-13224394,909522486,404239926, +-15198184,404291352,404232216,404232216,-132638696,0,0,0,404233984,404232216,-1,-1,-1,65535,0,-256, +-1,-252645136,-252645136,-252645136,252702960,252645135,252645135,252645135,-1,16777215,0,0,-596246528,-589768488,118,0, +-52900744,-1059264826,192,1617061630,1616928864,96,0,1819082240,7105644,0,811779838,-966643688,254,0,-858227200,7916748, +0,1717960704,1618765414,32960,0,417101312,1579032,0,-965986050,946652870,254,1815609344,-956381498,3697862,0,-960074696, +1819045062,238,1614675968,-966378448,7916742,0,2113929216,8313819,0,201719808,-420028804,12607612,0,1616916508,811622524,28, +-964952064,-960051514,13027014,0,-33554432,-33489408,0,0,410916888,8257560,0,101455920,3151884,126,403439616,405823536, +8257548,0,438176768,404232216,404232216,404232216,404232216,813193240,0,1579008,404226174,0,0,14448128,56438,0, +2026687608,0,0,0,404226048,0,0,0,6144,0,520093696,404232216,406354136,-671088640,1819044972,0, +0,819490816,63584,0,0,2122186752,2122219134,0,0,0,0,1900544,603979776,610729830,0,19712, +-1579069,-1010574373,195,-16777132,404232345,1008211992,1442840576,-1010630656,-1010580541,1588326,5701632,-1010580736,-606348349,26367,22528,1724105667, +-1010604484,195,-1023410087,1013367747,1008211992,1828716544,0,-604019200,12835803,7733248,0,1724105667,6204,30464,-620756992,-2368549, +102,0,0,0,0,0,-2119859842,-2120630911,32385,0,-687931780,-960823554,31998,0,-17929216,2097086206, +4152,0,2084048896,272137470,0,0,943198208,1827564560,14352,0,2088515600,1828650750,14352,0,402653184,406600764, +0,-65536,-402653185,-406600765,-1,65535,1008205824,1013343846,24,-65536,-1008205825,-1013343847,-25,65535,907939358,-858993544, +30924,0,1717986876,410916924,6168,0,404625950,2014844952,28920,0,910046782,1727428150,794126,0,1014946584,2117887590, +6363,0,-253722624,-251855108,32992,0,1041105408,1048510078,526,0,410926104,2115508248,6204,0,1717986918,6710886, +26214,0,-606348417,454786011,6939,0,1623639676,2094986876,2093401612,0,0,-16908288,65278,0,410926104,1014896664, +32280,0,410926104,404232216,6168,0,404232216,2115508248,6204,0,201326592,202309390,0,0,805306368,812711536, +0,0,0,-20922176,0,0,603979776,610729830,0,0,943198208,-25396168,254,0,2097085952,943225980, +16,0,0,0,0,0,1010580504,1579068,6168,905969664,339097142,0,0,0,-26448788,1828613228, +27756,0,-964945896,104626368,404257990,0,1644167168,806882406,50790,0,809004088,-859013514,30412,201326592,1575948,0, +0,0,808458252,808464432,3096,0,202119216,202116108,12312,0,1811939328,1815674424,0,0,402653184,404258328, +0,0,0,201326592,1575948,0,0,65024,0,0,0,0,6168,0,100794368,1613764620, +32960,0,-960051588,-960047402,31942,0,404256792,404232216,32280,0,113690236,1613764620,65222,0,101107324,101058108, +31942,0,1815878668,218025164,7692,0,-1061109506,101058300,31942,0,-1061108100,-960051460,31942,0,201770750,808464408, +12336,0,-960051588,-960051588,31942,0,-960051588,101088966,31942,0,201326592,201326604,12,0,201326592,201326604, +1575948,0,806882304,811647072,3096,0,0,16646398,0,0,405823488,403441164,24624,0,214353532,1579032, +6168,0,-960051588,-589373730,32448,0,-960074696,-960037178,50886,0,1717987068,1717986940,64614,0,-1061001668,-1027555136, +15462,0,1717988600,1717986918,63596,0,1616930558,1616928892,65126,0,1616930558,1616928892,61536,0,-1060714884,-959528768, +31942,0,-960051514,-960051458,50886,0,404232252,404232216,15384,0,404232252,-669509608,28888,0,-657668410,-858197776, +50886,0,1616929008,1650483296,65126,0,-286341434,-690563330,50886,0,-421083450,-825303306,50886,0,-960051588,-960051514, +31942,0,1717987068,1616936038,61536,0,-960051588,-691616058,425174,0,1717987068,1718384764,58982,0,-1061108100,101063792, +31942,0,404249214,404232216,15384,0,-960051514,-960051514,31942,0,-960051514,1824966342,4152,0,-691616058,-285288746, +50886,0,1824966342,-965986248,50886,0,1717986918,404241510,15384,0,210159358,-1033883624,65222,0,1616928892,1616928864, +31840,0,-1065353216,202911840,518,0,202116220,202116108,31756,268435456,13003832,0,0,0,0,0, +0,402718719,792600,0,0,0,2013265920,-859014132,30428,0,2086691040,1717986918,64614,0,2080374784,-1061109562, +31942,0,2081164316,-858993460,32460,0,2080374784,-1057044794,31942,0,808465948,808464636,30768,0,1979711488,-825833778, +2093352566,0,2086691040,1717986918,58982,0,939530264,404232216,15384,0,469765132,202116108,2026687500,0,1717592288,1819831398, +58982,0,404232248,404232216,15384,0,1811939328,-958998786,50886,0,-603979776,1717986918,26214,0,2080374784,-960051514, +31942,0,-603979776,1717986918,-262119300,0,1979711488,-858993460,504106108,0,-603979776,1616928870,61536,0,2080374784,108839110, +31942,0,-63950800,808464432,7222,0,-872415232,-858993460,30412,0,-973078528,1824966342,4152,0,-973078528,-690563386, +27902,0,-973078528,1815637190,50886,0,-973078528,-825833786,2093352566,0,-33554432,806882438,65122,0,404232206,404232304, +3608,0,404232216,404232192,6168,0,404232304,404232206,28696,0,56438,0,0,0,268435456,1819031608, +254,0,-1061132740,1013368512,952896536,0,-973027642,-960051514,30414,201326592,2080387096,-1057044794,31942,805306368,2013318264,-859014132, +30428,0,2013318348,-859014132,30428,1610612736,2013272112,-859014132,30428,939524096,2013280364,-859014132,30428,0,-964952064,2093400256, +946605080,805306368,2080427128,-1057044794,31942,0,2080427212,-1057044794,31942,805306368,2080377880,-1057044794,31942,0,939550310,404232216, +15384,402653184,939550268,404232216,15384,1610612736,939530288,404232216,15384,-973078528,1815609542,-956381498,50886,1815609344,1815609400,-956381498, +50886,403439616,1627258928,1616936032,65120,0,-614072320,-656900325,30431,0,-656877442,-656867624,57048,805306368,2080427128,-960051514, +31942,0,2080425670,-960051514,31942,805306368,2080377880,-960051514,31942,805306368,-973026184,-960051514,30414,1610612736,-973072336,-960051514, +30414,-973078528,-960102202,1993262790,2093352454,-973078528,-964951866,-960051514,31942,-973078528,-960102202,-960051514,31942,0,-964945896,2093400256, +6168,939524096,-262119316,1717592160,27894,1711276032,1013343846,1008238104,6168,-67108864,-1057175866,-858988852,50892,234881024,404232219,404232318, +1893210136,201326592,2013278232,-859014132,30428,201326592,939536408,404232216,15384,201326592,2080387096,-960051514,31942,402653184,-872390608,-858993460, +30428,0,-1140794250,1717986918,58982,1979711488,-960102180,-824248602,50886,1006632960,4090988,126,0,939524096,3697772,124, +0,0,805318704,-966774736,31942,0,0,1616936448,96,0,0,101088768,6,1610612736,1818649184,-597676008, +1041763382,1610612736,1818649184,-563202536,101088822,0,402659352,1010580504,6204,0,905969664,913102956,0,0,-671088640,-663996820, +0,1141964800,1141982225,1141982225,1141982225,1437221905,1437226410,1437226410,1437226410,2010994090,2011002845,2011002845,2011002845,404256733,404232216,404232216, +404232216,404232216,404232216,418912280,404232216,404232216,404232216,418912504,404232216,909514776,909522486,922105398,909522486,13878,0,922615808, +909522486,13878,0,418912504,404232216,909514776,909522486,922093302,909522486,909522486,909522486,909522486,909522486,13878,0,922093310, +909522486,909522486,909522486,16647926,0,909508608,909522486,16660022,0,404226048,404232216,16259320,0,0,0,418906112, +404232216,404232216,404232216,2037784,0,404226048,404232216,16717848,0,0,0,419364864,404232216,404232216,404232216,404690968, +404232216,6168,0,16711680,0,404226048,404232216,419371032,404232216,404232216,404232216,404690975,404232216,909514776,909522486,909588022, +909522486,909522486,909522486,4141111,0,0,0,909586495,909522486,909522486,909522486,16711927,0,0,0,922157311, +909522486,909522486,909522486,909586487,909522486,13878,0,16711935,0,909508608,909522486,922157303,909522486,404239926,404232216,16711935, +0,909508608,909522486,16725558,0,0,0,419365119,404232216,6168,0,922681344,909522486,909522486,909522486,4142646, +0,404226048,404232216,2037791,0,0,0,404690975,404232216,6168,0,910098432,909522486,909522486,909522486,922695222, +909522486,404239926,404232216,419371263,404232216,404232216,404232216,16259096,0,0,0,404684800,404232216,-59368,-1,-1, +-1,65535,0,-65536,-1,-252641281,-252645136,-252645136,-252645136,252702960,252645135,252645135,252645135,-61681,-1,65535, +0,0,-596246528,-656877352,30428,0,-864550912,-960037672,-1061102362,0,1617061630,1616928864,24672,0,-33554432,1819044972, +27756,0,811779838,1647319064,65222,0,2113929216,-858993448,28888,0,1717960704,2087085670,8437856,0,1979711488,404232412, +6168,0,1815623934,946652870,65080,0,-965986304,-960037178,14444,0,-960074696,1819068102,61036,0,1012949054,-960051610, +30924,0,2113929216,2128337883,0,0,-830732798,2096559838,49248,0,1613765632,1616936032,7216,0,-960051588,-960051514, +50886,0,16646144,65024,254,0,404226048,1579134,32256,0,101455920,3151884,32256,0,1613764620,792624, +32256,0,504102912,404232218,404232216,404232216,404232216,404232216,3176536,0,404226048,402685440,24,0,0,1979767926, +220,0,2026687608,0,0,0,0,1579008,0,0,0,1572864,0,0,404232223,-656926696, +1587320,0,1819045080,27756,0,0,806934640,63584,0,0,2113929216,2122219134,126,0,0,0, +0,405274624,185073672,587399171,925706039,285349682,117835520,0,348595681,-1544495096,33620223,100992003,303108103,370480147,251660311,0, +235929600,405339904,185073672,587399171,925706039,285349682,117835520,0,348595681,-1544495096,33620223,100992003,303108103,370480147,251660311,0, +235929600,407961344,17825800,587399171,794578802,285477472,117835520,0,684140001,-1544495096,33620223,100992003,303108103,370480147,251660311,0, +235929600,407961344,17825800,587399171,794578802,285477472,117835520,0,684140001,-1544495096,33620223,100992003,303108103,370480147,251660311,0, +235929600,405339904,188743688,587333635,925706039,285349425,256,0,348595681,-1561272320,353566975,100925975,303108103,370480147,50331927,0, +254803968,405339904,188743688,587333635,925706039,285349425,256,0,348595681,-1561272320,68354303,100925975,303108103,370480147,50331927,0, +254803968,407961344,20971528,587595777,760827763,285346400,256,0,684139744,-1024467200,387383551,387389207,387389207,387389207,16777495,0, +218103808,407961344,-2146435058,-1501364221,928010075,527063889,202050816,0,677194334,-1559601651,117899519,117901063,1061107719,1061109567,251661887,8, +168820736,407961344,-2129657840,-1501364221,659574631,530188380,235736832,0,680474000,-1550216960,117899519,117901063,1061107719,1061109567,251661887,0, +168820736,411369216,1092616206,-1501364221,1032094622,527047818,202050816,0,1113400414,-1559601651,117899519,117901063,1061107719,1061109567,251661887,0, +168820736,411369216,1092616206,-1484587005,1032094622,527047818,202050816,0,1113400414,-1559601650,33620223,335873027,976828423,1044200507,251660351,0, +235929600,407961344,17825806,-1492713468,928206683,527194961,202050816,0,677194590,-1559601649,255,0,0,0,251660288,0, +67108864,407961344,-2146435058,-1501102076,928206683,527063890,202050816,0,677194334,-1559601651,255,0,0,0,251661824,8, +67108864,405339904,186646536,587595791,925706039,285414961,0,0,348595681,-470753280,33620223,100992003,303108103,370480147,251658519,0, +83886080,407961359,20971528,587595791,760827762,285477215,0,0,684139744,-470819072,33620223,100992003,303108103,370480147,251658519,0, +83886080,407961359,25165838,-1509556209,928010075,526916946,0,0,677192798,-485990641,459007,4144896,458752,4128768,83888896,0, +83886080,407961349,25165838,-1492778993,928010075,529276242,0,0,677192798,-485990641,33620223,335873027,976828423,1044200507,251658559,0, +83886080,407961359,25165838,-1509556209,928010075,526916946,0,0,677192798,-485990641,459007,4144896,458752,4128768,83888896,0, +83886080,407961349,25165838,-1492778993,928010075,529276242,0,0,677192798,-485990641,33620223,335873027,976828423,1044200507,251658559,0, +83886080,405339919,185073678,-1492975613,757540651,527134248,202050816,0,341649758,-1559536113,33620223,335873027,976828423,1044200507,251660351,0, +235929600,405339904,185073678,-1492975613,757540651,527134248,202050816,0,341649758,-1559536113,33620223,335873027,976828423,1044200507,251660351,0, +235929600,407961344,17825806,-1492975613,928010075,527194961,202050816,0,677194590,-1559601649,33620223,335873027,976828423,1044200507,251660351,0, +235929600,407961344,17825806,-1492975613,928010075,527194961,202050816,0,677194590,-1559601649,33620223,335873027,976828423,1044200507,251660351,0, +235929600,730136320,1094713352,-1501364221,1032094622,527047818,117835520,0,1113531489,-1559600633,117899519,117901063,1061107719,1061109567,251661887,0, +168820736,730136320,1094713352,-1484587005,1032094622,527047818,117835520,0,1113531489,-1559600632,33620223,335873027,976828423,1044200507,251660351,0, +235929600,405339904,185073672,-1560084349,791095086,282001964,117835520,0,348664008,-1492137720,33620223,335873027,976828423,1044200507,251661375,0, +235929600,405339904,185073678,-1560084477,791095086,527434284,202050816,0,341651038,-1552916977,33620223,335873027,976828423,1044200507,251660351,0, +235929600,407961344,17825800,-1560084349,575688545,282001749,117835520,0,684208328,-1492137720,33620223,335873027,976828423,1044200507,251661375,0, +235929600,407961344,17825806,-1560084477,575688545,527369045,202050816,0,677195358,-1552982513,33620223,335873027,976828423,1044200507,251660351,0, +235929600,405339904,188743688,-1560149885,791095086,282001707,256,0,348598472,-1508914936,353566975,67239959,353566726,67239959,50331910,0, +254803968,405339904,188743688,-1560149885,791095086,282001707,256,0,348598472,-1508914936,353566975,67239959,353566726,67239959,50331910,0, +254803968,407961344,20971528,-1559887743,558911329,282026321,256,0,684142792,-972044024,1061093631,1061109567,1061107775,1061109567,16777535,0, +218103808,407961344,1048590,-1509752829,1062227808,527458641,202050816,0,677195358,-1552916979,134742271,134744072,404230152,404232216,251661848,8, +168820736,407961344,17825806,-1509752829,726683500,530540373,202050816,0,680472464,-1558867712,134742271,134744072,404230152,404232216,251661848,0, +168820736,405339904,186646536,-1559887729,791160622,282001451,0,0,348598472,-418395896,33620223,335873027,976828423,1044200507,251658559,0, +83886080,407961359,20971528,-1559887729,558911329,282026321,0,0,684142792,-418395896,33620223,335873027,976828423,1044200507,251658559,0, +83886080,407961359,25165838,-1576665073,1062227809,527458384,0,0,677195358,-479175155,524543,1579008,524288,1572864,83888896,0, +83886080,407961359,25165838,-1559887857,1062227809,527458898,0,0,677195358,-479175155,33620223,335873027,976828423,1044200507,251658559,0, +83886080,411369231,1092616206,-1568473085,545555366,527435917,202050816,0,1113665890,-1553047027,134742271,134744072,404230152,404232216,251661848,0, +168820736,411369216,1092616206,-1551695869,545555366,527435917,202050816,0,1113665890,-1553047026,33620223,335873027,976828423,1044200507,251660351,0, +235929600,730136320,1094713352,-1568473085,545555366,527435917,117835520,0,1113665890,-1553047033,134742271,134744072,404230152,404232216,251661848,0, +168820736,730136320,1094713352,-1551695869,545555366,527435917,117835520,0,1113665890,-1553047032,33620223,335873027,976828423,1044200507,251660351,0, +235929600,405339904,185073678,588447747,925706039,536483634,202050816,0,341649310,-1559585265,302579967,338502683,386860855,909059871,251660351,0, +235929600,407961344,17825806,588447747,794578803,536480352,202050816,0,677193374,-1559585265,302579967,338502683,386860855,909059871,251660351,0, +235929600,407961344,1048590,638779395,794578802,536480351,202050816,0,677193630,-1553293811,926351615,926365495,1061107767,1061109567,251661887,8, +168820736,407961344,17825808,638779395,895242112,535827818,235736832,0,680403113,-1550282737,926351615,926365495,1061107767,1061109567,251661887,0, +168820736,407961344,25165838,571867151,793792371,536480095,0,0,677193630,-485843185,459007,4144896,458752,4128768,83888896,0, +83886080,407961349,25165838,588644367,793792371,536480095,0,0,677193630,-485843185,302579967,338502683,386860855,909059871,251658559,0, +83886080,411369231,1092616200,579010563,797934531,285348000,117835520,0,1120347617,-1544691193,117899519,117901063,1061107719,1061109567,251661887,0, +168820736,411369216,1092616200,595787779,797934531,285348000,117835520,0,1120347617,-1544691192,33620223,100992003,303108103,370480147,251660311,0, +235929600,-292880640,75839114,-620093690,-1169019020,45614020,-1973752049,-154981691,1388874726,-489556430,-1031019823,-718544175,-204960943,737815461,-186492430,387162, +-337802557,-154760456,852003811,-773664266,-774206494,-1966634270,737250272,-204764203,1325018027,1355020149,-420077904,-163860400,196104421,56222198,-1056745023,-235510607, +2083716224,-1967063550,-1964471568,1405311176,-927278453,1122957827,15452042,-1964113685,-352261179,-1047859712,15401195,-1017381906,-944047533,1111682563,15401195,-336033044, +-335484160,15460490,-1964244757,-67663160,-974601381,1975519909,-396666868,447741973,-1595322285,1963015352,4319239,1343926360,-1598516503,1153369226,87698988,-4520846, +-466435073,-133963567,73239342,91544330,74841866,-1006926141,604246176,1949318192,29619718,-154931339,-378273341,742703043,839748142,80184256,1948072750,788235794, +192159035,-33372285,2126592704,-1560301333,197330058,-385649445,844562751,4241856,-1151358221,-1313835768,-1464364312,-1157401343,-1993968360,1301030429,-1524701182,71941719, +-2097144135,-1963195193,92808708,-136165562,75800671,-2010726146,-2053037499,1166616068,1323849507,-2010750977,-2010765987,512370301,-75496375,840531731,786682367,1960871818, +641786930,774325641,1960937354,692422694,-1979415135,-33258474,-1293748542,13122816,28448126,2114018877,1023586830,125698448,-532872270,637566465,841635208,1166550720, +1166550571,-2027517396,616860164,-771444479,48529632,-536156976,-1961823104,-2147196138,-1293154622,539290816,-17952756,136637634,-523181872,17613834,759531558,-2010774608, +102641989,516161714,-1047788376,-1073677951,-987348620,-645135241,57995531,638634624,-1945339963,1961954265,147488771,142066982,-250881652,-897580172,61886980,-402406214, +-1973771250,-789786400,50537964,57991226,117557888,1434986015,464541746,-1226446512,135202831,135202831,16974083,134283521,16843009,16843009,135201039,33752079, +16843279,33489167,123135,50331648,70582788,2031616,1040639,117440512,251594754,4128768,-335295302,443810216,-1174402885,1239942068,1958742693,-402540762, +-92232787,-2044955436,129745915,64272896,178597864,-1223920448,-1550587902,1958017664,-1006926334,1946673539,1958742540,1959329301,1959329291,-1070442486,-1236670128,-376422421, +-1040776895,-311164921,-150986568,1946157505,4588803,180727,973407092,79820544,84112384,1085997827,-137219328,16417779,-1824521868,-1336715176,149508124,-2080666698, +-1040768825,1618214913,1065952849,-1558189993,1166550764,1435051521,113410112,-322915604,54888486,653053618,-1308473976,-2010714932,-894301883,1166550764,-322653692,-2096789466, +79234503,-402541568,-397999667,11838177,-402646599,-890764863,-1261522431,637184,1593947368,1497810819,180727,-1993979788,1464926847,-1599953944,807666704,71941802, +-218095943,75808420,-1527576655,78167802,-1527577423,-1325394754,-1096486140,78708852,2092868851,-217796352,17612452,-1527577423,-947691525,-1040754374,57999364,654243561, +-1174110327,619447239,92808705,-927284090,-469046269,-922877324,21334054,-335296838,38111270,-1190934653,843186944,-1023480128,-319110402,-1867890908,-67575152,1344057432, +-139132183,1946157505,1066083940,1464989579,-1174026365,12059588,28372737,-402651975,-1303969493,1149904578,-994906615,-285015880,-301692378,1079282470,-285208136,-1070458447, +637602536,-301906806,637977216,-301710198,840217068,16771300,54823462,839496174,-389107008,-1977220889,1609433668,46266201,643396608,100827019,-1645717679,92939937, +68167296,268830927,1237206788,2013444,-1107250968,129041540,-1107253016,78709928,-402611992,348037492,-402345728,1958609045,-402345728,2092826765,-402345728,213778565, +-402345727,-2090925955,123288263,311799,-1960426892,-1977219977,-961412540,-1564546834,50379094,-964441934,-88067581,650313454,1190003850,1593369232,-1163746328,883950528, +-282818010,21269030,170166822,-301894428,-301741894,-1963006487,-331157820,1254424234,-389810718,-1061314309,1358083,-2014518222,-289109270,-22352830,-1326560572,-360190432, +650374370,76023178,-136165817,629810883,-1057077265,-1295779870,-289109312,1191545382,-487668482,83936244,185080849,403580948,606089773,83902264,286133000,538712084, +841820196,201801528,404362512,471012630,859320101,656747054,590096937,623054873,724314663,757672234,960182066,858928183,825570612,808396588,875836210,892482355, +1010645560,943208762,926562617,84095284,185272583,218630410,387519761,286331669,252973842,269485835,320082706,336728851,421140502,387323672,353900311,353702164, +387389206,404100887,454760985,421075226,404363545,50468375,101123332,117769478,219024394,168364812,151718666,151585798,185273098,201984779,252644877,218959118, +202247437,202115595,218959116,218893581,252645134,235802127,235802126,3085,0,0,704643072,10752,2763306,704653824,704648490,353708586, +1058346261,353713941,356466495,1058357013,1058357055,16191,84215040,185075720,235801355,286331150,403969044,471603224,538976284,673457188,757934120,842150445, +1060649016,16191,1056968767,792657951,4144896,788545343,1058996287,4132864,1064704,1056972607,1061093423,4140800,268451615,1056964671,272564224,2047744, +1056976703,1060044863,4136704,522141456,1059006271,926883631,524238623,924794687,1060052799,524232479,522665759,1059008319,1061101367,524236575,656359215,1059004223, +658448159,523190047,1059010367,1060577087,524234527,757940007,1059926335,977218870,759119661,976043839,1060515135,759116077,758202157,1059927615,1061104954,759118381, +825048886,1059925311,826223917,758529837,1059928639,1060777279,759117357,16177,469763868,354156558,1842176,352328732,470679580,1836800,465920,469765660, +471597077,1840384,117447694,469762076,119275520,924672,469767452,471138332,1838592,235805703,470683932,404491797,236723214,403577884,471141916,236720398, +236002318,470684956,471600664,236722190,286137365,470683164,287051278,236264462,470685724,471338524,236721422,336862225,471078428,438047768,337386516,437525532, +471340060,337384980,336993300,471078940,471602202,337386004,370416664,471077916,370938900,337124372,471079452,471471132,337385492,7190,268436496,202375176, +1052672,201330704,268959760,1049600,266240,268437520,269484044,1051648,67112968,268435472,68157440,528384,268438544,269221904,1050624,134746116, +268962320,235931660,135270408,235409424,269223952,135268872,134877192,268962832,269486094,135269896,168300556,268961808,168822792,135008264,268963344,269355024, +135269384,185274378,269159440,252709645,185602059,252383248,269290256,185601035,185339915,269159696,269486863,185601803,202051597,269159184,202377995,185405451, +269160208,269421328,185601291,1061097484,1061109567,1061109567,1061109567,1061109567,4144959,407896064,25165840,1661599759,-2108666017,532644181,16384,0, +1351585436,-474376673,33620223,100992003,168364039,235736075,251658511,16384,83886080,491847439,27262992,-485883889,-2108666017,1040941397,16384,0, +685739242,-486217984,33620223,100992003,168364039,235736075,251674895,32768,83886080,694484751,32505870,797573135,-1654299782,523801193,0,0, +841780781,-416010225,33620223,100992003,168364039,235736075,251674895,32768,83886080,694484751,32505870,797310991,-1654299782,523801193,0,0, +841780781,-416010225,33620223,335873027,976828423,1044200507,251658559,0,83886080,694484751,32505870,-276168689,-1654299782,523801193,0,0, +841780781,-416010225,33620223,100992003,168364039,235736075,251674895,32768,83886080,694484751,32505870,-276430833,-1654299782,523801193,0,0, +841780781,-416010225,33620223,335873027,976828423,1044200507,251658559,0,83886080,796983055,25165840,-281411569,-1941946550,-13500348,24576,0, +536907526,-483588849,33620223,100992003,168364039,235736075,251674895,32768,83886080,796983055,25165840,-284819441,-1941946550,-13500348,24576,0, +536907526,-483588849,33620223,100992003,168364039,235736075,251658511,4096,83886080,796983055,25165840,-281411569,-1941946550,-13500348,24576,0, +536907526,-483588849,33620223,100992003,168364039,235736075,251674895,32768,83886080,796983055,25165840,792330255,-1941946550,-13500348,24576,0, +536907526,-483588849,33620223,100992003,168364039,235736075,251674895,32768,83886080,796983055,25165840,788922383,-1941946550,-13500348,24576,0, +536907526,-483588849,33620223,100992003,168364039,235736075,251658511,4096,83886080,1965839,0,1728013860,36,788529152,16777216,403441155, +-2134876112,0,2113929264,-607927357,-1010580517,126,19712,-1588285,-1009001473,50115,5505024,412745472,404232216,3938328,1442840576,-1010630656, +-1010580541,406611651,0,-1023410089,-607927357,-2368549,102,22528,1724105667,-1016710084,50115,5832704,-1010580736,406611651,3938328,1543503872, +-2147483648,405823680,16975372,0,109,-10092544,-1009001509,195,30208,-1023410176,1724105667,6204,7798784,0,-606354493,6750171, +0,-256,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1] +} \ No newline at end of file diff --git a/devices/pc/video/ibm/ega/README.md b/devices/pc/video/ibm/ega/README.md index 81affd93b..cd6fef871 100644 --- a/devices/pc/video/ibm/ega/README.md +++ b/devices/pc/video/ibm/ega/README.md @@ -9,7 +9,7 @@ IBM EGA ROM To (re)build the JSON-encoded IBM EGA ROM with symbols, run the following command: - filedump --file=static/ibm-ega.rom --format=bytes --decimal + filedump --file=archive/ibm-ega.rom --format=bytes --decimal The symbol information in the MAP file will be automatically converted and appended to the dump of the ROM file. diff --git a/disks/README.md b/disks/README.md index adb26e5d8..28d00a608 100644 --- a/disks/README.md +++ b/disks/README.md @@ -21,5 +21,5 @@ with the *format* parameter set to `img` instead of `json`. For example: In fact, when browsing the disk archives, the PCjs web server automatically provides "onclick" handlers for links to JSON-encoded disk images, which will invoke the API for you. -See **Creating PCjs-Compatible Disk Images** in the [PCjs Documentation](/docs/pcjs/) for more information -about supported disks and formats. +See **Creating PCjs-Compatible Disk Images** in the [PCjs Documentation](/docs/pcjs/#creating-pcjs-compatible-disk-images) +for more information about supported disks and formats. diff --git a/disks/pc/apps/lotus/123/1.0a/manifest.xml b/disks/pc/apps/lotus/123/1.0a/manifest.xml index 3c1082dd8..776f1bb98 100644 --- a/disks/pc/apps/lotus/123/1.0a/manifest.xml +++ b/disks/pc/apps/lotus/123/1.0a/manifest.xml @@ -1,5 +1,5 @@ - + 1-2-3 1.0a @@ -7,16 +7,16 @@ Productivity Lotus - + Lotus 1-2-3 (System) - + Lotus 1-2-3 (Utility) - + Lotus 1-2-3 (Graph) - + Lotus 1-2-3 (Tutorial) diff --git a/disks/pc/apps/microsoft/chart/2.02/manifest.xml b/disks/pc/apps/microsoft/chart/2.02/manifest.xml index e37e3ab97..1427402b1 100644 --- a/disks/pc/apps/microsoft/chart/2.02/manifest.xml +++ b/disks/pc/apps/microsoft/chart/2.02/manifest.xml @@ -1,5 +1,5 @@ - + Microsoft Chart 2.02 @@ -25,7 +25,7 @@ I would much rather post copies of original distribution disks here, but this is all we've currently got. - + MS Chart 2.02 (Unofficial) diff --git a/disks/pc/apps/microsoft/winword/2.0c/manifest.xml b/disks/pc/apps/microsoft/winword/2.0c/manifest.xml index 0e68a54e5..e086c18e1 100644 --- a/disks/pc/apps/microsoft/winword/2.0c/manifest.xml +++ b/disks/pc/apps/microsoft/winword/2.0c/manifest.xml @@ -1,5 +1,5 @@ - + Word for Windows 2.0c @@ -7,22 +7,22 @@ Word Processor Microsoft - + Word for Windows 2.0c (Disk 1) - + Word for Windows 2.0c (Disk 2) - + Word for Windows 2.0c (Disk 3) - + Word for Windows 2.0c (Disk 4) - + Word for Windows 2.0c (Disk 5) - + Word for Windows 2.0c (Disk 6) diff --git a/disks/pc/apps/microsoft/word/3.0/manifest.xml b/disks/pc/apps/microsoft/word/3.0/manifest.xml index 3fccb8253..f6b3bb67a 100644 --- a/disks/pc/apps/microsoft/word/3.0/manifest.xml +++ b/disks/pc/apps/microsoft/word/3.0/manifest.xml @@ -1,5 +1,5 @@ - + MS Word 3.0 @@ -7,22 +7,22 @@ Word Processor Microsoft - + MS Word 3.0 (Disk 1) - + MS Word 3.0 (Disk 2) - + MS Word 3.0 (Disk 3) - + MS Word 3.0 (Disk 4) - + MS Word 3.0 (Disk 5) - + MS Word 3.0 (Disk 6) diff --git a/disks/pc/apps/microsoft/word/3.1/manifest.xml b/disks/pc/apps/microsoft/word/3.1/manifest.xml index 0abf773e0..67d9dc1c7 100644 --- a/disks/pc/apps/microsoft/word/3.1/manifest.xml +++ b/disks/pc/apps/microsoft/word/3.1/manifest.xml @@ -1,5 +1,5 @@ - + MS Word 3.1 @@ -7,28 +7,28 @@ Word Processor Microsoft - + MS Word 3.1 (Disk 1) - + MS Word 3.1 (Disk 2) - + MS Word 3.1 (Disk 3) - + MS Word 3.1 (Disk 4) - + MS Word 3.1 (Disk 5) - + MS Word 3.1 (Disk 6) - + MS Word 3.1 (Disk 7) - + MS Word 3.1 (Disk 8) diff --git a/disks/pc/apps/microsoft/word/5.0/manifest.xml b/disks/pc/apps/microsoft/word/5.0/manifest.xml index 130ea8af8..3cac2b26a 100644 --- a/disks/pc/apps/microsoft/word/5.0/manifest.xml +++ b/disks/pc/apps/microsoft/word/5.0/manifest.xml @@ -1,5 +1,5 @@ - + MS Word 5.0 @@ -7,43 +7,43 @@ Word Processor Microsoft - + MS Word 5.0 (Program 1) - + MS Word 5.0 (Program 2) - + MS Word 5.0 (Spell) - + MS Word 5.0 (Thesaurus) - + MS Word 5.0 (Utilities 1) - + MS Word 5.0 (Utilities 2) - + MS Word 5.0 (Utilities 3) - + MS Word 5.0 (Utilities/Print) - + MS Word 5.0 (Printers 1) - + MS Word 5.0 (Printers 2) - + MS Word 5.0 (Learning Kbd) - + MS Word 5.0 (Learning Mouse) - + MS Word 5.0 (Learning Adv) diff --git a/disks/pc/compiled/library.xml b/disks/pc/compiled/library.xml index dbdb37c9e..16734e655 100644 --- a/disks/pc/compiled/library.xml +++ b/disks/pc/compiled/library.xml @@ -5,7 +5,7 @@ None CP/M-86 (Disk 1) CP/M-86 (Disk 2) - IBM Advanced Diagnostics 2.20 + IBM Diagnostics 2.20 PC-DOS 1.00 PC-DOS 1.10 PC-DOS 2.00 (Disk 1) @@ -109,7 +109,7 @@ COMPAQ MS-DOS 3.31 (Disk 3) COMPAQ MS-DOS 3.31 (Disk 4) COMPAQ MS-DOS 3.31 (Disk 5) - COMPAQ MS-DOS 3.31 (Diagnostics) + COMPAQ MS-DOS 3.31 (Diags) IBM OS/2 1.0 (1.44M Install) IBM OS/2 1.0 (1.44M Disk 1) IBM OS/2 1.0 (1.44M Disk 2) @@ -119,8 +119,8 @@ IBM OS/2 1.1 (1.44M Disk 2) IBM OS/2 1.1 (1.44M Disk 3) IBM OS/2 1.1 (1.44M Disk 4) - IBM OS/2 1.1 (1.44M Devices Disk) - IBM OS/2 1.1 (1.44M Printers Disk) + IBM OS/2 1.1 (1.44M Devices) + IBM OS/2 1.1 (1.44M Printers) IBM OS/2 1.3 (1.44M Disk 1) IBM OS/2 1.3 (1.44M Disk 2) IBM OS/2 1.3 (1.44M Disk 3) @@ -428,7 +428,8 @@ Moria 5.5 VGA Tests (Black Book) - Load + Load + Save diff --git a/disks/pc/compiled/samples.xml b/disks/pc/compiled/samples.xml index 12511ea8b..b15bd74da 100644 --- a/disks/pc/compiled/samples.xml +++ b/disks/pc/compiled/samples.xml @@ -10,7 +10,8 @@ Microsoft Adventure VisiCalc - Load + Load + Save diff --git a/disks/pc/cpm/1.1b/machine.xml b/disks/pc/cpm/1.1b/machine.xml index c157ea7be..d1d76fe3a 100644 --- a/disks/pc/cpm/1.1b/machine.xml +++ b/disks/pc/cpm/1.1b/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150) running CP/M-86 diff --git a/disks/pc/cpm/1.1b/manifest.xml b/disks/pc/cpm/1.1b/manifest.xml index 1eac4d43e..e51edf88a 100644 --- a/disks/pc/cpm/1.1b/manifest.xml +++ b/disks/pc/cpm/1.1b/manifest.xml @@ -1,5 +1,5 @@ - + CP/M-86 1.1B @@ -9,10 +9,10 @@ Eagle Computer May 20, 1983 - + CP/M-86 (Disk 1) - + CP/M-86 (Disk 2) diff --git a/disks/pc/diags/ibm/2.20/machine.xml b/disks/pc/diags/ibm/2.20/machine.xml index bd8c2b868..b5abdbb37 100644 --- a/disks/pc/diags/ibm/2.20/machine.xml +++ b/disks/pc/diags/ibm/2.20/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150) running IBM Advanced Diagnostics 2.20 diff --git a/disks/pc/diags/ibm/2.20/manifest.xml b/disks/pc/diags/ibm/2.20/manifest.xml index 8352841b0..75947dab7 100644 --- a/disks/pc/diags/ibm/2.20/manifest.xml +++ b/disks/pc/diags/ibm/2.20/manifest.xml @@ -1,14 +1,14 @@ - + - IBM Advanced Diagnostics + IBM Diagnostics 2.20 Diagnostics Hardware Tests IBM - + diff --git a/disks/pc/dos/compaq/1.11/manifest.xml b/disks/pc/dos/compaq/1.11/manifest.xml index ac0f2f471..a0e490f1b 100644 --- a/disks/pc/dos/compaq/1.11/manifest.xml +++ b/disks/pc/dos/compaq/1.11/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 1.11 @@ -7,7 +7,7 @@ Operating System Microsoft/COMPAQ - + COMPAQ MS-DOS 1.11 diff --git a/disks/pc/dos/compaq/1.12/manifest.xml b/disks/pc/dos/compaq/1.12/manifest.xml index e0ec6118e..4c0b7993f 100644 --- a/disks/pc/dos/compaq/1.12/manifest.xml +++ b/disks/pc/dos/compaq/1.12/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 1.12 @@ -7,7 +7,7 @@ Operating System Microsoft/COMPAQ - + COMPAQ MS-DOS 1.12 diff --git a/disks/pc/dos/compaq/2.12/manifest.xml b/disks/pc/dos/compaq/2.12/manifest.xml index 32311cb89..35773e8f7 100644 --- a/disks/pc/dos/compaq/2.12/manifest.xml +++ b/disks/pc/dos/compaq/2.12/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 2.12 @@ -7,7 +7,7 @@ Operating System Microsoft/COMPAQ - + COMPAQ MS-DOS 2.12 diff --git a/disks/pc/dos/compaq/3.10/manifest.xml b/disks/pc/dos/compaq/3.10/manifest.xml index d484c4d21..ebb215f34 100644 --- a/disks/pc/dos/compaq/3.10/manifest.xml +++ b/disks/pc/dos/compaq/3.10/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 3.10 @@ -8,19 +8,19 @@ Microsoft/COMPAQ - + COMPAQ MS-DOS 3.10 (Disk 1) - + COMPAQ MS-DOS 3.10 (Disk 2) - + COMPAQ MS-DOS 3.10 (Personal) - + COMPAQ PC-DOS 3.20 Support - + COMPAQ DESKPRO 386 (1986) diff --git a/disks/pc/dos/compaq/3.31/manifest.xml b/disks/pc/dos/compaq/3.31/manifest.xml index 41463e911..c440607ad 100644 --- a/disks/pc/dos/compaq/3.31/manifest.xml +++ b/disks/pc/dos/compaq/3.31/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 3.31 @@ -8,22 +8,22 @@ Microsoft/COMPAQ - + COMPAQ MS-DOS 3.31 (Disk 1) - + COMPAQ MS-DOS 3.31 (Disk 2) - + COMPAQ MS-DOS 3.31 (Disk 3) - + COMPAQ MS-DOS 3.31 (Disk 4) - + COMPAQ MS-DOS 3.31 (Disk 5) - - COMPAQ MS-DOS 3.31 (Diagnostics) + + COMPAQ MS-DOS 3.31 (Diags) diff --git a/disks/pc/dos/ibm/1.00/manifest.xml b/disks/pc/dos/ibm/1.00/manifest.xml index 8c208104c..dbf33c69d 100644 --- a/disks/pc/dos/ibm/1.00/manifest.xml +++ b/disks/pc/dos/ibm/1.00/manifest.xml @@ -1,5 +1,5 @@ - + PC-DOS 1.00 @@ -7,5 +7,5 @@ Operating System IBM/Microsoft - + diff --git a/disks/pc/dos/ibm/1.10/manifest.xml b/disks/pc/dos/ibm/1.10/manifest.xml index f61360f9e..befbb7d25 100644 --- a/disks/pc/dos/ibm/1.10/manifest.xml +++ b/disks/pc/dos/ibm/1.10/manifest.xml @@ -1,5 +1,5 @@ - + PC-DOS 1.10 @@ -7,5 +7,5 @@ Operating System IBM/Microsoft - + diff --git a/disks/pc/dos/ibm/2.00/manifest.xml b/disks/pc/dos/ibm/2.00/manifest.xml index 516ae6178..50b97047d 100644 --- a/disks/pc/dos/ibm/2.00/manifest.xml +++ b/disks/pc/dos/ibm/2.00/manifest.xml @@ -1,5 +1,5 @@ - + PC-DOS 2.00 @@ -7,10 +7,10 @@ Operating System IBM/Microsoft - + PC-DOS 2.00 (Disk 1) - + PC-DOS 2.00 (Disk 2) diff --git a/disks/pc/dos/ibm/2.10/manifest.xml b/disks/pc/dos/ibm/2.10/manifest.xml index d1a12fc0f..834cf2223 100644 --- a/disks/pc/dos/ibm/2.10/manifest.xml +++ b/disks/pc/dos/ibm/2.10/manifest.xml @@ -1,5 +1,5 @@ - + PC-DOS 2.10 @@ -7,10 +7,10 @@ Operating System IBM/Microsoft - + PC-DOS 2.10 (Disk 1) - + PC-DOS 2.10 (Disk 2) diff --git a/disks/pc/dos/ibm/3.00/manifest.xml b/disks/pc/dos/ibm/3.00/manifest.xml index 4cd659ca3..1e5038544 100644 --- a/disks/pc/dos/ibm/3.00/manifest.xml +++ b/disks/pc/dos/ibm/3.00/manifest.xml @@ -1,5 +1,5 @@ - + PC-DOS 3.00 @@ -7,10 +7,10 @@ Operating System IBM/Microsoft - + PC-DOS 3.00 (Disk 1) - + PC-DOS 3.00 (Disk 2) diff --git a/disks/pc/dos/ibm/3.10/manifest.xml b/disks/pc/dos/ibm/3.10/manifest.xml index 22ff667ea..bb1955442 100644 --- a/disks/pc/dos/ibm/3.10/manifest.xml +++ b/disks/pc/dos/ibm/3.10/manifest.xml @@ -1,5 +1,5 @@ - + PC-DOS 3.10 @@ -7,10 +7,10 @@ Operating System IBM/Microsoft - + PC-DOS 3.10 (Disk 1) - + PC-DOS 3.10 (Disk 2) diff --git a/disks/pc/dos/ibm/3.20/manifest.xml b/disks/pc/dos/ibm/3.20/manifest.xml index f1d6e7367..53293600d 100644 --- a/disks/pc/dos/ibm/3.20/manifest.xml +++ b/disks/pc/dos/ibm/3.20/manifest.xml @@ -1,5 +1,5 @@ - + PC-DOS 3.20 @@ -7,10 +7,10 @@ Operating System IBM/Microsoft - + PC-DOS 3.20 (Disk 1) - + PC-DOS 3.20 (Disk 2) diff --git a/disks/pc/dos/ibm/3.30/manifest.xml b/disks/pc/dos/ibm/3.30/manifest.xml index 988db1e5a..62527ab68 100644 --- a/disks/pc/dos/ibm/3.30/manifest.xml +++ b/disks/pc/dos/ibm/3.30/manifest.xml @@ -1,5 +1,5 @@ - + PC-DOS 3.30 @@ -7,13 +7,13 @@ Operating System IBM/Microsoft - + PC-DOS 3.30 (Disk 1) - + PC-DOS 3.30 (Disk 2) - + PC-DOS 3.30 (720K Disk) diff --git a/disks/pc/dos/ibm/4.00/manifest.xml b/disks/pc/dos/ibm/4.00/manifest.xml index 57730d536..fe4dc9f4a 100644 --- a/disks/pc/dos/ibm/4.00/manifest.xml +++ b/disks/pc/dos/ibm/4.00/manifest.xml @@ -1,5 +1,5 @@ - + PC-DOS 4.00 @@ -7,19 +7,19 @@ Operating System IBM/Microsoft - + PC-DOS 4.00 (Disk 1) - + PC-DOS 4.00 (Disk 2) - + PC-DOS 4.00 (Disk 3) - + PC-DOS 4.00 (Disk 4) - + PC-DOS 4.00 (Disk 5) diff --git a/disks/pc/dos/ibm/5.00/manifest.xml b/disks/pc/dos/ibm/5.00/manifest.xml index 6f084cbf7..e22f18fb2 100644 --- a/disks/pc/dos/ibm/5.00/manifest.xml +++ b/disks/pc/dos/ibm/5.00/manifest.xml @@ -1,5 +1,5 @@ - + PC-DOS 5.00 @@ -7,13 +7,13 @@ Operating System IBM/Microsoft - + PC-DOS 5.00 (Disk 1) - + PC-DOS 5.00 (Disk 2) - + PC-DOS 5.00 (Disk 3) diff --git a/disks/pc/dos/ibm/6.10/manifest.xml b/disks/pc/dos/ibm/6.10/manifest.xml index 625bf6109..32fe599f9 100644 --- a/disks/pc/dos/ibm/6.10/manifest.xml +++ b/disks/pc/dos/ibm/6.10/manifest.xml @@ -1,5 +1,5 @@ - + PC-DOS 6.10 @@ -7,19 +7,19 @@ Operating System IBM/Microsoft - + PC-DOS 6.10 (Disk 1) - + PC-DOS 6.10 (Disk 2) - + PC-DOS 6.10 (Disk 3) - + PC-DOS 6.10 (Disk 4) - + PC-DOS 6.10 (Disk 5) diff --git a/disks/pc/dos/ibm/7.00/manifest.xml b/disks/pc/dos/ibm/7.00/manifest.xml index 1386675da..92592faa1 100644 --- a/disks/pc/dos/ibm/7.00/manifest.xml +++ b/disks/pc/dos/ibm/7.00/manifest.xml @@ -1,30 +1,30 @@ - + PC-DOS 7.00 DOS Operating System IBM - + PC-DOS 7.00 (SETUP Disk 1) - + PC-DOS 7.00 (SETUP Disk 2) - + PC-DOS 7.00 (SETUP Disk 3) - + PC-DOS 7.00 (SETUP Disk 4) - + PC-DOS 7.00 (SETUP Disk 5) - + PC-DOS 7.00 (1.2M Disk) - + PC-DOS 7.00 (1.44M Disk) diff --git a/disks/pc/dos/microsoft/3.20/manifest.xml b/disks/pc/dos/microsoft/3.20/manifest.xml index da5febac3..969498bea 100644 --- a/disks/pc/dos/microsoft/3.20/manifest.xml +++ b/disks/pc/dos/microsoft/3.20/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 3.20 @@ -7,16 +7,16 @@ Operating System Microsoft July 7, 1986 - + MS-DOS 3.20 (Disk 1) - + MS-DOS 3.20 (Disk 2) - + MS-DOS 3.20 (ProgRef 1) - + MS-DOS 3.20 (ProgRef 2) diff --git a/disks/pc/dos/microsoft/3.21/manifest.xml b/disks/pc/dos/microsoft/3.21/manifest.xml index 9a128fa41..7b8bebac6 100644 --- a/disks/pc/dos/microsoft/3.21/manifest.xml +++ b/disks/pc/dos/microsoft/3.21/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 3.21 @@ -7,10 +7,10 @@ Operating System Microsoft May 1, 1987 - + MS-DOS 3.21 (Disk 1) - + MS-DOS 3.21 (Disk 2) diff --git a/disks/pc/dos/microsoft/3.30/manifest.xml b/disks/pc/dos/microsoft/3.30/manifest.xml index 42fa268c0..be4c2e360 100644 --- a/disks/pc/dos/microsoft/3.30/manifest.xml +++ b/disks/pc/dos/microsoft/3.30/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 3.30 @@ -7,11 +7,11 @@ Operating System Microsoft - + MS-DOS 3.30 (Disk 1) - + MS-DOS 3.30 (Disk 2) diff --git a/disks/pc/dos/microsoft/3.31/manifest.xml b/disks/pc/dos/microsoft/3.31/manifest.xml index a28dae72d..7170e7b5c 100644 --- a/disks/pc/dos/microsoft/3.31/manifest.xml +++ b/disks/pc/dos/microsoft/3.31/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 3.31 @@ -7,7 +7,7 @@ Operating System Microsoft - + MS-DOS 3.31 (1440K Disk) diff --git a/disks/pc/dos/microsoft/4.00/manifest.xml b/disks/pc/dos/microsoft/4.00/manifest.xml index 015917f9e..5fad3a6c9 100644 --- a/disks/pc/dos/microsoft/4.00/manifest.xml +++ b/disks/pc/dos/microsoft/4.00/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 4.00 @@ -7,22 +7,22 @@ Operating System Microsoft October 1988 - + MS-DOS 4.00 (Disk 1) - + MS-DOS 4.00 (Disk 2) - + MS-DOS 4.00 (Disk 3) - + MS-DOS 4.00 (Disk 4) - + MS-DOS 4.00 (Disk 5) - + MS-DOS 4.00 (Disk 6) diff --git a/disks/pc/dos/microsoft/4.01/720K/manifest.xml b/disks/pc/dos/microsoft/4.01/720K/manifest.xml index 8f34563fa..7eb0c2e85 100644 --- a/disks/pc/dos/microsoft/4.01/720K/manifest.xml +++ b/disks/pc/dos/microsoft/4.01/720K/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 4.01 @@ -7,13 +7,13 @@ Operating System Microsoft April 1989 - + MS-DOS 4.01 (Disk 1) - + MS-DOS 4.01 (Disk 2) - + MS-DOS 4.01 (Disk 3) diff --git a/disks/pc/dos/microsoft/4.01/manifest.xml b/disks/pc/dos/microsoft/4.01/manifest.xml index 39b8866d4..005fec215 100644 --- a/disks/pc/dos/microsoft/4.01/manifest.xml +++ b/disks/pc/dos/microsoft/4.01/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 4.01 @@ -8,22 +8,22 @@ Microsoft April 1989 - + MS-DOS 4.01 (Disk 1) - + MS-DOS 4.01 (Disk 2) - + MS-DOS 4.01 (Disk 3) - + MS-DOS 4.01 (Disk 4) - + MS-DOS 4.01 (Disk 5) - + MS-DOS 4.01 (Disk 6) diff --git a/disks/pc/dos/microsoft/4.0M/manifest.xml b/disks/pc/dos/microsoft/4.0M/manifest.xml index 02967c53b..e4cfccb52 100644 --- a/disks/pc/dos/microsoft/4.0M/manifest.xml +++ b/disks/pc/dos/microsoft/4.0M/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 4.0M diff --git a/disks/pc/dos/microsoft/5.00/manifest.xml b/disks/pc/dos/microsoft/5.00/manifest.xml index 813a9e123..7f85efa7d 100644 --- a/disks/pc/dos/microsoft/5.00/manifest.xml +++ b/disks/pc/dos/microsoft/5.00/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 5.00 @@ -7,28 +7,28 @@ Operating System Microsoft - + MS-DOS 5.00 (360K Disk 1) - + MS-DOS 5.00 (360K Disk 2) - + MS-DOS 5.00 (360K Disk 3) - + MS-DOS 5.00 (360K Disk 4) - + MS-DOS 5.00 (360K Disk 5) - + MS-DOS 5.00 (720K Disk 1) - + MS-DOS 5.00 (720K Disk 2) - + MS-DOS 5.00 (720K Disk 3) diff --git a/disks/pc/dos/microsoft/6.00/manifest.xml b/disks/pc/dos/microsoft/6.00/manifest.xml index 9d3e1534d..2520b7a3a 100644 --- a/disks/pc/dos/microsoft/6.00/manifest.xml +++ b/disks/pc/dos/microsoft/6.00/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 6.00 @@ -7,25 +7,25 @@ Operating System Microsoft - + MS-DOS 6.00 (1200K Disk 1) - + MS-DOS 6.00 (1200K Disk 2) - + MS-DOS 6.00 (1200K Disk 3) - + MS-DOS 6.00 (1200K Disk 4) - + MS-DOS 6.00 (1440K Disk 1) - + MS-DOS 6.00 (1440K Disk 1) - + MS-DOS 6.00 (1440K Disk 1) diff --git a/disks/pc/dos/microsoft/6.20/manifest.xml b/disks/pc/dos/microsoft/6.20/manifest.xml index bd0232eeb..84ca593b3 100644 --- a/disks/pc/dos/microsoft/6.20/manifest.xml +++ b/disks/pc/dos/microsoft/6.20/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 6.20 @@ -7,31 +7,31 @@ Operating System Microsoft - + MS-DOS 6.20 (1200K Disk 1) - + MS-DOS 6.20 (1200K Disk 2) - + MS-DOS 6.20 (1200K Disk 3) - + MS-DOS 6.20 (1200K Disk 4) - + MS-DOS 6.20 (1200K Supp Disk) - + MS-DOS 6.20 (1440K Disk 1) - + MS-DOS 6.20 (1440K Disk 2) - + MS-DOS 6.20 (1440K Disk 3) - + MS-DOS 6.20 (1440K Supp Disk) diff --git a/disks/pc/dos/microsoft/6.22/manifest.xml b/disks/pc/dos/microsoft/6.22/manifest.xml index 1fe31f05f..4cd03d98a 100644 --- a/disks/pc/dos/microsoft/6.22/manifest.xml +++ b/disks/pc/dos/microsoft/6.22/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 6.22 @@ -7,28 +7,28 @@ Operating System Microsoft - + MS-DOS 6.22 (1200K Disk 1) - + MS-DOS 6.22 (1200K Disk 2) - + MS-DOS 6.22 (1200K Disk 3) - + MS-DOS 6.22 (1200K Disk 4) - + MS-DOS 6.22 (1440K Disk 1) - + MS-DOS 6.22 (1440K Disk 2) - + MS-DOS 6.22 (1440K Disk 3) - + MS-DOS 6.22 (1440K Supp Disk) diff --git a/disks/pc/games/infocom/hhiker/manifest.xml b/disks/pc/games/infocom/hhiker/manifest.xml index e1cc254e4..f0e032f72 100644 --- a/disks/pc/games/infocom/hhiker/manifest.xml +++ b/disks/pc/games/infocom/hhiker/manifest.xml @@ -1,5 +1,5 @@ - + The Hitchhiker's Guide to the Galaxy diff --git a/disks/pc/games/infocom/machine-debug.xml b/disks/pc/games/infocom/machine-debug.xml index 5669d1d8c..cf6da1500 100644 --- a/disks/pc/games/infocom/machine-debug.xml +++ b/disks/pc/games/infocom/machine-debug.xml @@ -1,12 +1,12 @@ - + IBM PC Model 5150 (CGA, 64K) - - + +