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

Some machines were unnamed, and some doc links were broken

Browse source
This commit is contained in:
Jeff Parsons 2016-01-21 19:16:40 -08:00
commit 2c1b6485e9
6 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.5/machine.xsl"?>
<machine id="deskpro386" class="pc" border="1" pos="center" background="#FAEBD7">
<name pos="center">Compaq DeskPro 386 (16Mhz), 128Kb EGA, 2048Kb RAM</name>
<computer id="deskpro386-ega-2048k" name="Compaq DeskPro 386" buswidth="32"/>
<cpu id="cpu386" model="80386" autostart="false"/>
<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
@ -13,7 +14,7 @@
<debugger id="debugger" messages="fault" commands=""/>
<panel ref="/devices/pc/panel/wide386.xml"/>
<fdc ref="/disks/pc/library.xml" automount='{A: {name: "PC-DOS 3.20 (Disk 1)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK1.json"}, B: {name: "PC-DOS 3.20 (Disk 2)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK2.json"}}'/>
<hdcFoo id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2}]'/>
<hdcNone id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2}]'/>
<chipset id="chipset" model="deskpro386" floppies="[1200,1200]"/>
<serial id="com1" adapter="1"/>
<serial id="com2" adapter="2" binding="print"/>

3
devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.5/machine.xsl"?>
<machine id="deskpro386" class="pc" border="1" pos="center" background="#FAEBD7">
<name pos="center">Compaq DeskPro 386 (16Mhz), Compaq VGA, 2048Kb RAM</name>
<computer id="deskpro386-vga-2048k" name="Compaq DeskPro 386" buswidth="32"/>
<cpu id="cpu386" model="80386" autostart="false"/>
<ram id="ramLow" addr="0x00000" test="true" size="0xa0000" comment="ROM BIOS memory test has NOT been disabled"/>
@ -13,7 +14,7 @@
<debugger id="debugger" messages="fault|port" commands=""/>
<panel ref="/devices/pc/panel/btpanel.xml"/>
<fdc ref="/disks/pc/library.xml" automount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
<hdcFoo id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2}]'/>
<hdcNone id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2}]'/>
<chipset id="chipset" model="deskpro386" floppies="[1200,1200]"/>
<serial id="com1" adapter="1"/>
<serial id="com2" adapter="2" binding="print"/>

1
devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.5/machine.xsl"?>
<machine id="deskpro386" class="pc" border="1" pos="center" background="#FAEBD7">
<name pos="center">Compaq DeskPro 386 (16Mhz), IBM VGA, 2048Kb RAM, 20Mb Hard Disk</name>
<computer id="deskpro386-vga-2048k" name="Compaq DeskPro 386" buswidth="32"/>
<cpu id="cpu386" model="80386" autostart="false"/>
<ram id="ramLow" addr="0x00000" test="true" size="0xa0000" comment="ROM BIOS memory test has NOT been disabled"/>

1
devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.5/machine.xsl"?>
<machine id="deskpro386" class="pc" border="1" pos="center" background="#FAEBD7">
<name pos="center">Compaq DeskPro 386 (16Mhz), IBM VGA, 2048Kb RAM, 20Mb Hard Disk</name>
<computer id="deskpro386-vga-4096k" name="Compaq DeskPro 386" buswidth="32" state="/devices/pc/machine/compaq/deskpro386/vga/4096kb/state.json"/>
<cpu id="cpu386" model="80386" autostart="true"/>
<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>

20
docs/README.md
View file

@ -23,7 +23,7 @@ Assorted documentation is also available for programming the machines:
{% endif %}
Our [Publication Archive](/pubs/) includes these PC-related resources:
Our [Publication Archive](/pubs/) also includes these PC-related resources:
* [Datasheets](/pubs/pc/datasheets/)
* [Magazines](/pubs/pc/magazines/)
@ -31,17 +31,17 @@ Our [Publication Archive](/pubs/) includes these PC-related resources:
* [Reference Manuals](/pubs/pc/reference/)
* [Software User Guides](/pubs/pc/software/)
Publications related to Ohio Scientific's 6502-based Challenger 1P:
And publications related to Ohio Scientific's 6502-based Challenger 1P:
* [Datasheets](/pubs/c1p/datasheets/)
* [Programming Guides/Samples](/pubs/c1p/programming/)
* [Reference Manuals](/pubs/c1p/techref/)
[<img src="http://archive.pcjs.org/pubs/pc/datasheets/thumbs/8088-CPU.jpg" width="200" height="260" alt= "8088 CPU"/>](pc/datasheets/)
[<img src="http://archive.pcjs.org/pubs/pc/magazines/byte/BYTE-1975-11/thumbs/BYTE-1975-11 1.jpeg" width="200" height="260" alt= "Byte Magazine"/>](pc/magazines/byte/)
[<img src="http://archive.pcjs.org/pubs/pc/magazines/msj/MSJ-1986-10/thumbs/MSJ-1986-10 1.jpeg" width="200" height="260" alt= "Microsoft Systems Journal"/>](pc/magazines/msj/)
[<img src="http://archive.pcjs.org/pubs/pc/magazines/pctj/PCTJ-1983-07/thumbs/PCTJ-1983-07 1.jpeg" width="200" height="260" alt= "PC Tech Journal"/>](pc/magazines/pctj/)
[<img src="http://archive.pcjs.org/pubs/pc/programming/Graphics_for_the_IBM_PC/thumbs/Graphics_for_the_IBM_PC 1.jpeg" width="200" height="260" alt= "Graphics for the IBM PC"/>](pc/programming/Graphics_for_the_IBM_PC/)
[<img src="http://archive.pcjs.org/pubs/pc/reference/ibm/5150/techref/1981-08/thumbs/IBM-5150-TECHREF 1.jpeg" width="200" height="260" alt= "IBM 5150 Technical Reference (August 1981)"/>](pc/reference/ibm/)
[<img src="http://archive.pcjs.org/pubs/pc/reference/intel/80286/progref/thumbs/80286_and_80287_Programmers_Reference_Manual_1987 1.jpeg" width="200" height="260" alt= "80286 and 80287 Programmer's Reference"/>](pc/reference/intel/)
[<img src="http://archive.pcjs.org/pubs/pc/software/dos/PCDOS100/thumbs/PCDOS100.jpg" width="200" height="260" alt= "IBM PC Disk Operating System v1.00"/>](pc/software/)
[<img src="http://archive.pcjs.org/pubs/pc/datasheets/thumbs/8088-CPU.jpg" width="200" height="260" alt= "8088 CPU"/>](/pubs/pc/datasheets/)
[<img src="http://archive.pcjs.org/pubs/pc/magazines/byte/BYTE-1975-11/thumbs/BYTE-1975-11 1.jpeg" width="200" height="260" alt= "Byte Magazine"/>](/pubs/pc/magazines/byte/)
[<img src="http://archive.pcjs.org/pubs/pc/magazines/msj/MSJ-1986-10/thumbs/MSJ-1986-10 1.jpeg" width="200" height="260" alt= "Microsoft Systems Journal"/>](/pubs/pc/magazines/msj/)
[<img src="http://archive.pcjs.org/pubs/pc/magazines/pctj/PCTJ-1983-07/thumbs/PCTJ-1983-07 1.jpeg" width="200" height="260" alt= "PC Tech Journal"/>](/pubs/pc/magazines/pctj/)
[<img src="http://archive.pcjs.org/pubs/pc/programming/Graphics_for_the_IBM_PC/thumbs/Graphics_for_the_IBM_PC 1.jpeg" width="200" height="260" alt= "Graphics for the IBM PC"/>](/pubs/pc/programming/Graphics_for_the_IBM_PC/)
[<img src="http://archive.pcjs.org/pubs/pc/reference/ibm/5150/techref/1981-08/thumbs/IBM-5150-TECHREF 1.jpeg" width="200" height="260" alt= "IBM 5150 Technical Reference (August 1981)"/>](/pubs/pc/reference/ibm/)
[<img src="http://archive.pcjs.org/pubs/pc/reference/intel/80286/progref/thumbs/80286_and_80287_Programmers_Reference_Manual_1987 1.jpeg" width="200" height="260" alt= "80286 and 80287 Programmer's Reference"/>](/pubs/pc/reference/intel/)
[<img src="http://archive.pcjs.org/pubs/pc/software/dos/PCDOS100/thumbs/PCDOS100.jpg" width="200" height="260" alt= "IBM PC Disk Operating System v1.00"/>](/pubs/pc/software/)

7
modules/pcjs/lib/x86seg.js
View file

@ -859,6 +859,7 @@ X86Seg.prototype.loadDesc8 = function(addrDesc, sel, fProbe)
cpu.assert(this.cpl == cplNew);
if (this.cpl < cplOld) {
if (fCall !== true) {
cpu.assert(false);
return X86.ADDR_INVALID;
@ -955,7 +956,7 @@ X86Seg.prototype.loadDesc8 = function(addrDesc, sel, fProbe)
* In both cases, the segment type is not valid for the target segment register *and* the PRESENT bit
* is clear. OS/2 doesn't seem to care whether I report an NP_FAULT or GP_FAULT, but Windows 95 definitely
* cares: it will resolve the fault only if a GP_FAULT is reported. And Intel's 80386 Programmers Reference
* implies that, yes, NP_FAULT checks are supposed to be performed *after* GP_FAULT checks.
* implies that, yes, GP_FAULT checks are supposed to be performed *before* NP_FAULT checks.
*/
if (type < X86.DESC.ACC.TYPE.SEG || (type & (X86.DESC.ACC.TYPE.CODE | X86.DESC.ACC.TYPE.READABLE)) == X86.DESC.ACC.TYPE.CODE) {
if (this.id < X86Seg.ID.VER) X86.fnFault.call(cpu, X86.EXCEPTION.GP_FAULT, sel & X86.ERRCODE.SELMASK);
@ -1484,12 +1485,12 @@ X86Seg.prototype.updateMode = function(fLoad, fProt, fV86)
* loaded); unlike the ACCESSED and DIRTY bits in PTEs, a descriptor ACCESSED bit is only
* updated on loads, not on every memory access.
*
* We compute address of the descriptor byte containing the ACCESSED bit (offset 0x5);
* We compute the address of the descriptor byte containing the ACCESSED bit (offset 0x5);
* note that it's perfectly normal for addrDesc to occasionally be invalid (eg, when the CPU
* is creating protected-mode-only segment registers like LDT and TSS, or when the CPU has
* transitioned from real-mode to protected-mode and new selector(s) have not been loaded yet).
*
* TODO: Note I do NOT update the ACCESSED bit for null GDT selectors, because I assume the
* NOTE: I do NOT update the ACCESSED bit for null GDT selectors, because I'm assuming the
* hardware does not update it either. In fact, I've seen code that uses the null GDT descriptor
* for other purposes, on the assumption that that descriptor is completely unused.
*/