diff --git a/Gruntfile.js b/Gruntfile.js index 60593204e..883debe0d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -6,28 +6,27 @@ * * Copyright © 2012-2016 Jeff Parsons * - * This file is part of the JavaScript Machines Project (aka JSMachines) at - * and . + * This file is part of PCjs, a computer emulation software project at . * - * JSMachines is free software: you can redistribute it and/or modify it under the terms of the + * PCjs is free software: you can redistribute it and/or modify it under the terms of the * GNU General Public License as published by the Free Software Foundation, either version 3 * of the License, or (at your option) any later version. * - * JSMachines is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without + * PCjs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with JSMachines. - * If not, see . + * You should have received a copy of the GNU General Public License along with PCjs. If not, + * see . * * You are required to include the above copyright notice in every source code file of every * copy or modified version of this work, and to display that copyright notice on every screen - * that loads or runs any version of this software (see Computer.sCopyright). + * that loads or runs any version of this software (see COPYRIGHT in /modules/shared/lib/defines.js). * - * Some JSMachines files also attempt to load external resource files, such as character-image files, - * ROM files, and disk image files. Those external resource files are not considered part of the - * JSMachines Project for purposes of the GNU General Public License, and the author does not claim - * any copyright as to their contents. + * Some PCjs files also attempt to load external resource files, such as character-image files, + * ROM files, and disk image files. Those external resource files are not considered part of PCjs + * for purposes of the GNU General Public License, and the author does not claim any copyright + * as to their contents. */ "use strict"; diff --git a/modules/build/lib/build.js b/modules/build/lib/build.js index 6d451dd87..1fd2026e9 100644 --- a/modules/build/lib/build.js +++ b/modules/build/lib/build.js @@ -6,28 +6,27 @@ * * Copyright © 2012-2016 Jeff Parsons * - * This file is part of the JavaScript Machines Project (aka JSMachines) at - * and . + * This file is part of PCjs, a computer emulation software project at . * - * JSMachines is free software: you can redistribute it and/or modify it under the terms of the + * PCjs is free software: you can redistribute it and/or modify it under the terms of the * GNU General Public License as published by the Free Software Foundation, either version 3 * of the License, or (at your option) any later version. * - * JSMachines is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without + * PCjs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with JSMachines. - * If not, see . + * You should have received a copy of the GNU General Public License along with PCjs. If not, + * see . * * You are required to include the above copyright notice in every source code file of every * copy or modified version of this work, and to display that copyright notice on every screen - * that loads or runs any version of this software (see Computer.COPYRIGHT). + * that loads or runs any version of this software (see COPYRIGHT in /modules/shared/lib/defines.js). * - * Some JSMachines files also attempt to load external resource files, such as character-image files, - * ROM files, and disk image files. Those external resource files are not considered part of the - * JSMachines Project for purposes of the GNU General Public License, and the author does not claim - * any copyright as to their contents. + * Some PCjs files also attempt to load external resource files, such as character-image files, + * ROM files, and disk image files. Those external resource files are not considered part of PCjs + * for purposes of the GNU General Public License, and the author does not claim any copyright + * as to their contents. */ "use strict"; diff --git a/modules/pcx86/bin/README.md b/modules/pcx86/bin/README.md index ceea62489..403c9d40d 100644 --- a/modules/pcx86/bin/README.md +++ b/modules/pcx86/bin/README.md @@ -23,15 +23,18 @@ The following output should appear: ibm5150.fdcNEC object created ibm5150.debugger object created warning: Component type 'Panel' not found - ibm5150.pc-mda-64k object created - PCx86> ramLow: 64Kb allocated PCx86 v1.x.x Copyright © 2012-2016 Jeff Parsons License: GPL version 3 or later - Type ? for list of debugger commands + ibm5150.pc-mda-64k object created + PCx86> bus: 8Kb ROM at 000FE000 + bus: 32Kb ROM at 000F6000 + bus: 576Kb RAM at 00000000 + bus: 4Kb VIDEO at 000B0000 + Type ? for help with PCx86 Debugger commands AX=0000 BX=0000 CX=0000 DX=0000 SP=0000 BP=0000 SI=0000 DI=0000 SS=0000 DS=0000 ES=0000 PS=F002 V0 D0 I0 T0 S0 Z0 A0 P0 C0 - FFFF:0000 EA5BE000F0 JMP F000:E05B + &FFFF:0000 EA5BE000F0 JMP &F000:E05B (romBIOS+0x0000005B) Start the machine with a `g` command: @@ -42,14 +45,14 @@ Start the machine with a `g` command: and after about 10 seconds, dump the machine's video buffer with `d b000:0`: PCx86> d b000:0 - B000:0000 43 07 75 07 72 07 72 07-65 07 6E 07 74 07 20 07 C.u.r.r.e.n.t. . - B000:0010 64 07 61 07 74 07 65 07-20 07 69 07 73 07 20 07 d.a.t.e. .i.s. . - B000:0020 54 07 75 07 65 07 20 07-20 07 31 07 2D 07 30 07 T.u.e. . .1.-.0. - B000:0030 31 07 2D 07 31 07 39 07-38 07 30 07 20 07 20 07 1.-.1.9.8.0. . . - B000:0040 20 07 20 07 20 07 20 07-20 07 20 07 20 07 20 07 . . . . . . . . - B000:0050 20 07 20 07 20 07 20 07-20 07 20 07 20 07 20 07 . . . . . . . . - B000:0060 20 07 20 07 20 07 20 07-20 07 20 07 20 07 20 07 . . . . . . . . - B000:0070 20 07 20 07 20 07 20 07-20 07 20 07 20 07 20 07 . . . . . . . . + &B000:0000 43 07 75 07 72 07 72 07-65 07 6E 07 74 07 20 07 C.u.r.r.e.n.t. . + &B000:0010 64 07 61 07 74 07 65 07-20 07 69 07 73 07 20 07 d.a.t.e. .i.s. . + &B000:0020 54 07 75 07 65 07 20 07-20 07 31 07 2D 07 30 07 T.u.e. . .1.-.0. + &B000:0030 31 07 2D 07 31 07 39 07-38 07 30 07 20 07 20 07 1.-.1.9.8.0. . . + &B000:0040 20 07 20 07 20 07 20 07-20 07 20 07 20 07 20 07 . . . . . . . . + &B000:0050 20 07 20 07 20 07 20 07-20 07 20 07 20 07 20 07 . . . . . . . . + &B000:0060 20 07 20 07 20 07 20 07-20 07 20 07 20 07 20 07 . . . . . . . . + &B000:0070 20 07 20 07 20 07 20 07-20 07 20 07 20 07 20 07 . . . . . . . . false To destroy the machine, type `quit` or press CTRL-C twice. diff --git a/modules/pcx86/bin/pcx86 b/modules/pcx86/bin/pcx86 index bee2a8ae3..f51a78e1e 100644 --- a/modules/pcx86/bin/pcx86 +++ b/modules/pcx86/bin/pcx86 @@ -1,6 +1,6 @@ #!/usr/bin/env node /** - * @fileoverview Implements the PCjs command-line interface + * @fileoverview Implements the PCx86 command-line interface * @author Jeff Parsons * @version 1.0 * @suppress {missingProperties} @@ -8,8 +8,7 @@ * * Copyright © 2012-2015 Jeff Parsons * - * This file is part of PCjs, which is part of the JavaScript Machines Project (aka JSMachines) - * at and . + * This file is part of PCjs, a computer emulation software project at . * * PCjs is free software: you can redistribute it and/or modify it under the terms of the * GNU General Public License as published by the Free Software Foundation, either version 3 @@ -24,12 +23,12 @@ * * You are required to include the above copyright notice in every source code file of every * copy or modified version of this work, and to display that copyright notice on every screen - * that loads or runs any version of this software (see Computer.COPYRIGHT). + * that loads or runs any version of this software (see COPYRIGHT in /modules/shared/lib/defines.js). * * Some PCjs files also attempt to load external resource files, such as character-image files, - * ROM files, and disk image files. Those external resource files are not considered part of the - * PCjs program for purposes of the GNU General Public License, and the author does not claim - * any copyright as to their contents. + * ROM files, and disk image files. Those external resource files are not considered part of PCjs + * for purposes of the GNU General Public License, and the author does not claim any copyright + * as to their contents. */ "use strict"; @@ -214,7 +213,7 @@ function loadMachine(sFile) if (machine) { /* * Since we have a machine object, we now mimic the initialization sequence that occurs - * in the browser, by walking the list of PCjs components we loaded above and looking for + * in the browser, by walking the list of PCx86 components we loaded above and looking for * matches. */ var idMachine = ""; @@ -370,7 +369,7 @@ var onCommand = function (cmd, context, filename, callback) }; if (pkg) { - loadComponents(pkg.pcJSFiles); + loadComponents(pkg.pcX86Files); } /* @@ -386,7 +385,7 @@ if (argv['cmd'] !== undefined) { } repl.start({ - prompt: "PCjs> ", + prompt: "PCx86> ", input: process.stdin, output: process.stdout, eval: onCommand diff --git a/server.js b/server.js index 0743fce79..dc5afda0c 100644 --- a/server.js +++ b/server.js @@ -6,28 +6,27 @@ * * Copyright © 2012-2016 Jeff Parsons * - * This file is part of the JavaScript Machines Project (aka JSMachines) at - * and . + * This file is part of PCjs, a computer emulation software project at . * - * JSMachines is free software: you can redistribute it and/or modify it under the terms of the + * PCjs is free software: you can redistribute it and/or modify it under the terms of the * GNU General Public License as published by the Free Software Foundation, either version 3 * of the License, or (at your option) any later version. * - * JSMachines is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without + * PCjs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with JSMachines. - * If not, see . + * You should have received a copy of the GNU General Public License along with PCjs. If not, + * see . * * You are required to include the above copyright notice in every source code file of every * copy or modified version of this work, and to display that copyright notice on every screen - * that loads or runs any version of this software (see Computer.sCopyright). + * that loads or runs any version of this software (see COPYRIGHT in /modules/shared/lib/defines.js). * - * Some JSMachines files also attempt to load external resource files, such as character-image files, - * ROM files, and disk image files. Those external resource files are not considered part of the - * JSMachines Project for purposes of the GNU General Public License, and the author does not claim - * any copyright as to their contents. + * Some PCjs files also attempt to load external resource files, such as character-image files, + * ROM files, and disk image files. Those external resource files are not considered part of PCjs + * for purposes of the GNU General Public License, and the author does not claim any copyright + * as to their contents. */ /*