Skip to content

Commit

Permalink
Merge branch 'master' into gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeffpar
jeffpar committed Nov 18, 2023
2 parents c2f45fd + 7f4decc commit fd6adfa
Show file tree
Hide file tree
Showing 12 changed files with 186 additions and 51 deletions.
62 changes: 61 additions & 1 deletion .vscode/launch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1471,11 +1471,23 @@
"order": 30
}
},
{
"name": "Microsoft Windows 3.00",
"type": "chrome",
"request": "launch",
"url": "http://localhost:4000/software/pcx86/sys/windows/3.00/",
"webRoot": "${workspaceFolder}",
"presentation": {
"hidden": false,
"group": "software",
"order": 30
}
},
{
"name": "Microsoft Windows 3.10 [Debugger*]",
"type": "chrome",
"request": "launch",
"url": "http://localhost:4000/software/pcx86/sys/windows/3.10/?debugger=true&resume=1",
"url": "http://localhost:4000/software/pcx86/sys/windows/3.10/?debugger=true",
"webRoot": "${workspaceFolder}",
"presentation": {
"hidden": false,
Expand Down Expand Up @@ -1519,6 +1531,54 @@
"order": 30
}
},
{
"name": "Microsoft Windows SDK 3.00 (Standard Mode)",
"type": "chrome",
"request": "launch",
"url": "http://localhost:4000/software/pcx86/sdk/windows/3.00/",
"webRoot": "${workspaceFolder}",
"presentation": {
"hidden": false,
"group": "software",
"order": 30
}
},
{
"name": "Microsoft Windows SDK 3.00 (Standard Mode) [Debugger*]",
"type": "chrome",
"request": "launch",
"url": "http://localhost:4000/software/pcx86/sdk/windows/3.00/?debugger=true",
"webRoot": "${workspaceFolder}",
"presentation": {
"hidden": false,
"group": "software",
"order": 30
}
},
{
"name": "Microsoft Windows SDK 3.00 (Enhanced Mode)",
"type": "chrome",
"request": "launch",
"url": "http://localhost:4000/software/pcx86/sdk/windows/3.00/enhanced/",
"webRoot": "${workspaceFolder}",
"presentation": {
"hidden": false,
"group": "software",
"order": 30
}
},
{
"name": "Microsoft Windows SDK 3.00 (Enhanced Mode) [Debugger*]",
"type": "chrome",
"request": "launch",
"url": "http://localhost:4000/software/pcx86/sdk/windows/3.00/enhanced/?debugger=true",
"webRoot": "${workspaceFolder}",
"presentation": {
"hidden": false,
"group": "software",
"order": 30
}
},
{
"name": "MINIX 1.1",
"type": "chrome",
Expand Down
1 change: 1 addition & 0 deletions .vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2918,6 +2918,7 @@
"WATCHALL",
"WATCHHW",
"Wayback",
"WBUTILS",
"WCHK",
"WCSR",
"WDATA",
Expand Down
92 changes: 69 additions & 23 deletions machines/pcx86/diskettes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1052,55 +1052,55 @@
"@photo": "jpg"
},
{
"@title": "Windows SDK 3.00 (720K Disk 1)",
"@title": "Windows SDK 3.00 (720K Disk 01)",
"@diskette": "WIN30SDK-720K-DISK01.json",
"@format": "PC720K",
"@photo": "jpg"
},
{
"@title": "Windows SDK 3.00 (720K Disk 2)",
"@title": "Windows SDK 3.00 (720K Disk 02)",
"@diskette": "WIN30SDK-720K-DISK02.json",
"@format": "PC720K",
"@photo": "jpg"
},
{
"@title": "Windows SDK 3.00 (720K Disk 3)",
"@title": "Windows SDK 3.00 (720K Disk 03)",
"@diskette": "WIN30SDK-720K-DISK03.json",
"@format": "PC720K",
"@photo": "jpg"
},
{
"@title": "Windows SDK 3.00 (720K Disk 4)",
"@title": "Windows SDK 3.00 (720K Disk 04)",
"@diskette": "WIN30SDK-720K-DISK04.json",
"@format": "PC720K",
"@photo": "jpg"
},
{
"@title": "Windows SDK 3.00 (720K Disk 5)",
"@title": "Windows SDK 3.00 (720K Disk 05)",
"@diskette": "WIN30SDK-720K-DISK05.json",
"@format": "PC720K",
"@photo": "jpg"
},
{
"@title": "Windows SDK 3.00 (720K Disk 6)",
"@title": "Windows SDK 3.00 (720K Disk 06)",
"@diskette": "WIN30SDK-720K-DISK06.json",
"@format": "PC720K",
"@photo": "jpg"
},
{
"@title": "Windows SDK 3.00 (720K Disk 7)",
"@title": "Windows SDK 3.00 (720K Disk 07)",
"@diskette": "WIN30SDK-720K-DISK07.json",
"@format": "PC720K",
"@photo": "jpg"
},
{
"@title": "Windows SDK 3.00 (720K Disk 8)",
"@title": "Windows SDK 3.00 (720K Disk 08)",
"@diskette": "WIN30SDK-720K-DISK08.json",
"@format": "PC720K",
"@photo": "jpg"
},
{
"@title": "Windows SDK 3.00 (720K Disk 9)",
"@title": "Windows SDK 3.00 (720K Disk 09)",
"@diskette": "WIN30SDK-720K-DISK09.json",
"@format": "PC720K",
"@photo": "jpg"
Expand All @@ -1117,55 +1117,55 @@
"@title": "Windows SDK 3.10",
"@media": [
{
"@title": "Windows SDK 3.10 (Disk 1)",
"@title": "Windows SDK 3.10 (Disk 01)",
"@diskette": "WIN31SDK-DISK01.json",
"@format": "PC1440K",
"@photo": "jpg"
},
{
"@title": "Windows SDK 3.10 (Disk 2)",
"@title": "Windows SDK 3.10 (Disk 02)",
"@diskette": "WIN31SDK-DISK02.json",
"@format": "PC1440K",
"@photo": "jpg"
},
{
"@title": "Windows SDK 3.10 (Disk 3)",
"@title": "Windows SDK 3.10 (Disk 03)",
"@diskette": "WIN31SDK-DISK03.json",
"@format": "PC1440K",
"@photo": "jpg"
},
{
"@title": "Windows SDK 3.10 (Disk 4)",
"@title": "Windows SDK 3.10 (Disk 04)",
"@diskette": "WIN31SDK-DISK04.json",
"@format": "PC1440K",
"@photo": "jpg"
},
{
"@title": "Windows SDK 3.10 (Disk 5)",
"@title": "Windows SDK 3.10 (Disk 05)",
"@diskette": "WIN31SDK-DISK05.json",
"@format": "PC1440K",
"@photo": "jpg"
},
{
"@title": "Windows SDK 3.10 (Disk 6)",
"@title": "Windows SDK 3.10 (Disk 06)",
"@diskette": "WIN31SDK-DISK06.json",
"@format": "PC1440K",
"@photo": "jpg"
},
{
"@title": "Windows SDK 3.10 (Disk 7)",
"@title": "Windows SDK 3.10 (Disk 07)",
"@diskette": "WIN31SDK-DISK07.json",
"@format": "PC1440K",
"@photo": "jpg"
},
{
"@title": "Windows SDK 3.10 (Disk 8)",
"@title": "Windows SDK 3.10 (Disk 08)",
"@diskette": "WIN31SDK-DISK08.json",
"@format": "PC1440K",
"@photo": "jpg"
},
{
"@title": "Windows SDK 3.10 (Disk 9)",
"@title": "Windows SDK 3.10 (Disk 09)",
"@diskette": "WIN31SDK-DISK09.json",
"@format": "PC1440K",
"@photo": "jpg"
Expand Down Expand Up @@ -7965,33 +7965,38 @@
"@title": "Macro Assembler 5.10 (Feb 1988)",
"@media": [
{
"@title": "MS MASM 5.10 (Feb 1988 Disk 1)",
"@title": "MS Macro Assembler 5.10 (Feb 1988 #1)",
"@diskette": "MASM51X-01510-DISK1.json",
"@format": "PC360K",
"@localonly": true,
"@source": "PCjs"
},
{
"@title": "MS MASM 5.10 (Feb 1988 Disk 2)",
"@title": "MS Macro Assembler 5.10 (Feb 1988 #2)",
"@diskette": "MASM51X-01511-DISK2.json",
"@format": "PC360K",
"@localonly": true,
"@source": "PCjs"
},
{
"@title": "MS MASM 5.10 (Feb 1988 Disk 3)",
"@title": "MS Macro Assembler 5.10 (Feb 1988 #3)",
"@diskette": "MASM51X-01512-DISK3.json",
"@format": "PC360K",
"@localonly": true,
"@source": "PCjs"
},
{
"@title": "MS MASM 5.10 (Feb 1988 Disk 4)",
"@title": "MS Macro Assembler 5.10 (Feb 1988 #4)",
"@diskette": "MASM51X-01514-DISK4.json",
"@format": "PC360K",
"@localonly": true,
"@source": "PCjs"
},
{
"@title": "MS MASM 5.10 (Feb 1988 Disk 5)",
"@title": "MS Macro Assembler 5.10 (Feb 1988 #5)",
"@diskette": "MASM51X-03159-DISK5.json",
"@format": "PC1200K",
"@localonly": true,
"@source": "PCjs"
},
{
Expand Down Expand Up @@ -8636,6 +8641,47 @@
}
]
},
"6.00a": {
"@title": "Microsoft C Compiler 6.00a",
"@media": [
{
"@title": "MS C 6.00a (DISK 1: COMPILER1)",
"@diskette": "MSC600A-DISK1-COMPILER1.json",
"@format": "PC1200K"
},
{
"@title": "MS C 6.00a (DISK 2: COMPILER2)",
"@diskette": "MSC600A-DISK2-COMPILER2.json",
"@format": "PC1200K"
},
{
"@title": "MS C 6.00a (DISK 3: LIBRARIES)",
"@diskette": "MSC600A-DISK3-LIBRARIES.json",
"@format": "PC1200K"
},
{
"@title": "MS C 6.00a (DISK 4: WBUTILS)",
"@diskette": "MSC600A-DISK4-WBUTILS.json",
"@format": "PC1200K"
},
{
"@title": "MS C 6.00a (DISK 5: WBUTILS-OS2)",
"@diskette": "MSC600A-DISK5-WBUTILS-OS2.json",
"@format": "PC1200K"
},
{
"@title": "MS C 6.00a (DISK 6: REFERENCE)",
"@diskette": "MSC600A-DISK6-REFERENCE.json",
"@format": "PC1200K"
},
{
"@title": "MS C 6.00a (DISK 7: LIBS-OS2)",
"@diskette": "MSC600A-DISK7-LIBS-OS2.json",
"@format": "PC1200K"
}
],
"@source": "https://winworldpc.com/product/microsoft-c-c/6x"
},
"qcwin": {
"@title": "Microsoft QuickC for Windows 1.00",
"@hardware": {
Expand Down
2 changes: 1 addition & 1 deletion machines/pcx86/ibm/5170/vga/2048kb/debugger/machine.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="/machines/pcx86/xsl/machine.xsl"?>
<machine id="ibm5170" type="pcx86" border="1" pos="center" background="default">
<name pos="center">IBM PC AT (8Mhz), 2Mb RAM, 20Mb Hard Disk (Formatted), IBM VGA</name>
<name pos="center">IBM PC AT (8Mhz), 2Mb RAM, IBM VGA</name>
<computer id="at-vga-2048k" name="IBM PC AT" buswidth="24"/>
<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
<ram id="ramExt" addr="0x100000" size="0x160000" comment=""/>
Expand Down
2 changes: 1 addition & 1 deletion machines/pcx86/ibm/5170/vga/2048kb/machine.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="/machines/pcx86/xsl/machine.xsl"?>
<machine id="ibm5170" type="pcx86" border="1" pos="center" background="default" debugger="available">
<name pos="center">IBM PC AT (8Mhz), 2Mb RAM, 20Mb Hard Disk (Formatted), IBM VGA</name>
<name pos="center">IBM PC AT (8Mhz), 2Mb RAM, IBM VGA</name>
<computer id="at-vga-2048k" name="IBM PC AT" buswidth="24"/>
<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
<ram id="ramExt" addr="0x100000" size="0x160000" comment=""/>
Expand Down
22 changes: 13 additions & 9 deletions machines/pcx86/modules/v2/video.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4667,15 +4667,19 @@ export default class VideoX86 extends Component {
*/
getFontDiff(iFont, iFontPrev)
{
let i;
if (iFont == iFontPrev) return [];
if (iFont < iFontPrev) {
i = iFont;
iFont = iFontPrev;
iFontPrev = i;
}
i = ((iFont * (iFont - 1)) >> 1) + iFontPrev;
return this.aFontDiff[i];
let a = [];
if (iFont != iFontPrev) {
let i;
if (iFont < iFontPrev) {
i = iFont;
iFont = iFontPrev;
iFontPrev = i;
}
i = ((iFont * (iFont - 1)) >> 1) + iFontPrev;
a = this.aFontDiff[i];
this.assert(a);
}
return a;
}

/**
Expand Down
22 changes: 13 additions & 9 deletions machines/pcx86/releases/2.22/pcx86-uncompiled.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55266,15 +55266,19 @@ class VideoX86 extends Component {
*/
getFontDiff(iFont, iFontPrev)
{
let i;
if (iFont == iFontPrev) return [];
if (iFont < iFontPrev) {
i = iFont;
iFont = iFontPrev;
iFontPrev = i;
}
i = ((iFont * (iFont - 1)) >> 1) + iFontPrev;
return this.aFontDiff[i];
let a = [];
if (iFont != iFontPrev) {
let i;
if (iFont < iFontPrev) {
i = iFont;
iFont = iFontPrev;
iFontPrev = i;
}
i = ((iFont * (iFont - 1)) >> 1) + iFontPrev;
a = this.aFontDiff[i];

}
return a;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion machines/pcx86/releases/2.22/pcx86.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion machines/pcx86/releases/2.22/pcx86.js.map
View file

Large diffs are not rendered by default.

Loading

0 comments on commit fd6adfa

Please sign in to comment.