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

More Video DEBUG support, and more disk images

Browse source
This commit is contained in:
Jeff Parsons 2015-07-27 07:48:01 -07:00
commit a1e3c366eb
24 changed files with 153 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,8 @@
<fdc ref="/disks/pc/library.xml" automount='{B: {name: "Win95 Build 499 (Disk 1)", path: "/disks/pc/windows/win95/build499/WIN95-DISK01.json"}}'/>
<debugger id="debugger" messages="fault|tss|int" commands=""/>
<panel ref="/devices/pc/panel/wide386.xml"/>
<hdc id="hdcAT" type="at" drives='[{name:"68Mb Hard Disk",type:4,path:"http://static.pcjs.org/devices/pc/machine/compaq/deskpro386/vga/4096kb/68mb.json"}]'/>
<hdc id="hdcAT" type="at" drives='[{name:"68Mb Hard Disk",type:4,path:"/devices/pc/machine/compaq/deskpro386/vga/4096kb/WIN300-68Mb.json"}]'/>
<hdcOrig id="hdcAT" type="at" drives='[{name:"68Mb Hard Disk",type:4,path:"http://static.pcjs.org/devices/pc/machine/compaq/deskpro386/vga/4096kb/68mb.json"}]'/>
<chipset id="chipset" model="deskpro386" floppies="[1200,1200]" monitor="vga"/>
<serial id="com1" adapter="1"/>
<serial id="com2" adapter="2" binding="print"/>

2
disks/pc/library.xml
View file

@ -53,8 +53,10 @@
<manifest ref="/disks/pc/tools/microsoft/masm/4.00/manifest.xml" disk="*"/>
<manifest ref="/disks/pc/tools/microsoft/mouse/5.00/manifest.xml" disk="*"/>
<manifest ref="/disks/pc/tools/microsoft/windows/sdk/1.01/manifest.xml" disk="*"/>
<manifest ref="/disks/pc/tools/microsoft/windows/sdk/1.03/manifest.xml" disk="*"/>
<manifest ref="/disks/pc/tools/microsoft/windows/sdk/1.04/manifest.xml" disk="*"/>
<manifest ref="/disks/pc/tools/microsoft/windows/sdk/2.03/manifest.xml" disk="*"/>
<manifest ref="/disks/pc/tools/microsoft/windows/sdk/3.00/manifest.xml" disk="*"/>
<manifest ref="/apps/pc/1981/visicalc/manifest.xml" disk="disk01"/>
<manifest ref="/apps/pc/1982/esuite/manifest.xml" disk="disk01"/>
<manifest ref="/apps/pc/1985/rogue/manifest.xml" disk="disk01"/>

1
disks/pc/tools/microsoft/windows/sdk/1.03/WINSDK103-DISK1-UTILS1.json Normal file
View file

File diff suppressed because one or more lines are too long

1
disks/pc/tools/microsoft/windows/sdk/1.03/WINSDK103-DISK2-UTILS2.json Normal file
View file

File diff suppressed because one or more lines are too long

1
disks/pc/tools/microsoft/windows/sdk/1.03/WINSDK103-DISK3-LIBC.json Normal file
View file

File diff suppressed because one or more lines are too long

1
disks/pc/tools/microsoft/windows/sdk/1.03/WINSDK103-DISK4-LIBPASCAL.json Normal file
View file

File diff suppressed because one or more lines are too long

1
disks/pc/tools/microsoft/windows/sdk/1.03/WINSDK103-DISK5-SYMBOLS.json Normal file
View file

File diff suppressed because one or more lines are too long

1
disks/pc/tools/microsoft/windows/sdk/1.03/WINSDK103-DISK6-SAMPLES1.json Normal file
View file

File diff suppressed because one or more lines are too long

1
disks/pc/tools/microsoft/windows/sdk/1.03/WINSDK103-DISK7-SAMPLES2.json Normal file
View file

File diff suppressed because one or more lines are too long

26
disks/pc/tools/microsoft/windows/sdk/1.03/manifest.xml Normal file
View file

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.18.5/manifest.xsl"?>
<manifest type="software">
<title>Windows 1.03 SDK</title>
<disk id="disk01" size="368640" chs="40:2:9" img="static/WINSDK103-DISK1-UTILS1.img" href="/disks/pc/tools/microsoft/windows/sdk/1.03/WINSDK103-DISK1-UTILS1.json" md5="2056640bad0ce932b5ca1e4ea18e079e" md5json="ddb0f1b6e36f938b9b6fae36ca07dcea">
<name>Win103 SDK (UTIL1)</name>
</disk>
<disk id="disk02" size="368640" chs="40:2:9" img="static/WINSDK103-DISK2-UTILS2.img" href="/disks/pc/tools/microsoft/windows/sdk/1.03/WINSDK103-DISK2-UTILS2.json" md5="c93ed197b186941d5ae51fb1883ce2b3" md5json="97583988ab1f2381ea5efd838ef814d6">
<name>Win103 SDK (UTIL2)</name>
</disk>
<disk id="disk03" size="368640" chs="40:2:9" img="static/WINSDK103-DISK3-LIBC.img" href="/disks/pc/tools/microsoft/windows/sdk/1.03/WINSDK103-DISK3-LIBC.json" md5="2913e596d3065800d3a9e942c48e95a9" md5json="572f2702d9eafba901d8b56be8d2cfa9">
<name>Win103 SDK (LIB C)</name>
</disk>
<disk id="disk04" size="368640" chs="40:2:9" img="static/WINSDK103-DISK4-LIBPASCAL.img" href="/disks/pc/tools/microsoft/windows/sdk/1.03/WINSDK103-DISK4-LIBPASCAL.json" md5="4e5aeb6c8fbc2aa0c5b8578b06e0cbee" md5json="d2758a6de024fddd6a2b059d5bf467b8">
<name>Win103 SDK (LIB PASCAL)</name>
</disk>
<disk id="disk05" size="368640" chs="40:2:9" img="static/WINSDK103-DISK5-SYMBOLS.img" href="/disks/pc/tools/microsoft/windows/sdk/1.03/WINSDK103-DISK5-SYMBOLS.json" md5="11997c5c7f21ce00c9b0c47163f0ee5d" md5json="19f319d3a0738c79d0982cf7d873c0fa">
<name>Win103 SDK (SYMBOLS)</name>
</disk>
<disk id="disk06" size="368640" chs="40:2:9" img="static/WINSDK103-DISK6-SAMPLES1.img" href="/disks/pc/tools/microsoft/windows/sdk/1.03/WINSDK103-DISK6-SAMPLES1.json" md5="393cfba2505429611b5e3f516f266dba" md5json="ec5da30da9f83561728b65d7be794142">
<name>Win103 SDK (SAMPLE1)</name>
</disk>
<disk id="disk07" size="368640" chs="40:2:9" img="static/WINSDK103-DISK7-SAMPLES2.img" href="/disks/pc/tools/microsoft/windows/sdk/1.03/WINSDK103-DISK7-SAMPLES2.json" md5="b9dee536f77b390ad95307f7ca397a6e" md5json="00cd3a489e2e8eefdb9133b97bb228ff">
<name>Win103 SDK (SAMPLE2)</name>
</disk>
</manifest>

6
disks/pc/tools/microsoft/windows/sdk/2.03/manifest.xml
View file

@ -4,12 +4,12 @@
<title>Windows 2.03 SDK</title>
<source href="http://os2museum.com">os2museum.com</source>
<disk id="disk01" size="1228800" chs="80:2:15" img="static/WINSDK203-DISK1-DEV.img" href="/disks/pc/tools/microsoft/windows/sdk/2.03/WINSDK203-DISK1-DEV.json" md5="2b12ea1df1c9fe241a2416a8b0a0ac94" md5json="2c3ca8667ca2ac4c5ded3f3c6b36b701">
<name>Win203 SDK (Disk 1)</name>
<name>Win203 SDK (1200K Disk 1)</name>
</disk>
<disk id="disk02" size="1228800" chs="80:2:15" img="static/WINSDK203-DISK2-UTILS.img" href="/disks/pc/tools/microsoft/windows/sdk/2.03/WINSDK203-DISK2-UTILS.json" md5="08b54542ecbaaef811c59cdfea209d29" md5json="57dae4a40161dfe4133856f603291be1">
<name>Win203 SDK (Disk 2)</name>
<name>Win203 SDK (1200K Disk 2)</name>
</disk>
<disk id="disk03" size="1228800" chs="80:2:15" img="static/WINSDK203-DISK3-SAMPLES.img" href="/disks/pc/tools/microsoft/windows/sdk/2.03/WINSDK203-DISK3-SAMPLES.json" md5="5f321a19ede652a4433cc3a1a38dd7a6" md5json="29066646b6b591ae57dad9dcfcf4c17d">
<name>Win203 SDK (Disk 3)</name>
<name>Win203 SDK (1200K Disk 3)</name>
</disk>
</manifest>

1
disks/pc/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK01.json Normal file
View file

File diff suppressed because one or more lines are too long

1
disks/pc/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK02.json Normal file
View file

File diff suppressed because one or more lines are too long

1
disks/pc/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK03.json Normal file
View file

File diff suppressed because one or more lines are too long

1
disks/pc/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK04.json Normal file
View file

File diff suppressed because one or more lines are too long

1
disks/pc/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK05.json Normal file
View file

File diff suppressed because one or more lines are too long

1
disks/pc/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK06.json Normal file
View file

File diff suppressed because one or more lines are too long

1
disks/pc/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK07.json Normal file
View file

File diff suppressed because one or more lines are too long

1
disks/pc/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK08.json Normal file
View file

File diff suppressed because one or more lines are too long

1
disks/pc/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK09.json Normal file
View file

File diff suppressed because one or more lines are too long

1
disks/pc/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK10.json Normal file
View file

File diff suppressed because one or more lines are too long

45
disks/pc/tools/microsoft/windows/sdk/3.00/manifest.xml Normal file
View file

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.18.5/manifest.xsl"?>
<manifest type="software">
<title>Windows 3.0 SDK</title>
<disk id="disk01" size="737280" chs="80:2:9" img="static/WIN30SDK_DISK01.img" href="/disks/pc/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK01.json" md5="3eb1f6df549dd454b65fb869a606e010" md5json="6a85939ac71c91d76b9fe39407464de2">
<name>Win300 SDK (720K Disk 1)</name>
<desc>Development Tools 1 (For DOS Systems) Version 3.0</desc>
</disk>
<disk id="disk02" size="737280" chs="80:2:9" img="static/WIN30SDK_DISK02.img" href="/disks/pc/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK02.json" md5="022e5517696403d7b3186bc7820178ad" md5json="f7ae92fbc95bfe2ac2e636b5bb0ce560">
<name>Win300 SDK (720K Disk 2)</name>
<desc>Development Tools 2/Debug Tools 1</desc>
</disk>
<disk id="disk03" size="737280" chs="80:2:9" img="static/WIN30SDK_DISK03.img" href="/disks/pc/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK03.json" md5="3eb2998642caf9130ec3892bdc3d4352" md5json="86b2cd50f0d3c667b98121280685a846">
<name>Win300 SDK (720K Disk 3)</name>
<desc>Debug Tools 2/Debug Files 1</desc>
</disk>
<disk id="disk04" size="737280" chs="80:2:9" img="static/WIN30SDK_DISK04.img" href="/disks/pc/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK04.json" md5="c78b913d3efb2a5c5772b4fba9887b4b" md5json="9a4387825e90e44a91a06cf78eb8363a">
<name>Win300 SDK (720K Disk 4)</name>
<desc>Debug Files 2</desc>
</disk>
<disk id="disk05" size="737280" chs="80:2:9" img="static/WIN30SDK_DISK05.img" href="/disks/pc/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK05.json" md5="d517a1a44a430c8810ed2288df4ba632" md5json="a2fdbe2095c9d5ba231d20e390a1430c">
<name>Win300 SDK (720K Disk 5)</name>
<desc>Link Libraries 1</desc>
</disk>
<disk id="disk06" size="737280" chs="80:2:9" img="static/WIN30SDK_DISK06.img" href="/disks/pc/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK06.json" md5="8b87da4b4a7fe1a622c76674f31c040a" md5json="effb20a06c0ab1430e75d2dd4926a34f">
<name>Win300 SDK (720K Disk 6)</name>
<desc>Link Libraries 2</desc>
</disk>
<disk id="disk07" size="737280" chs="80:2:9" img="static/WIN30SDK_DISK07.img" href="/disks/pc/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK07.json" md5="74f81df9020939a4b3e37608515112e0" md5json="79bcb8864e7dfc7abb4f216534a782fc">
<name>Win300 SDK (720K Disk 7)</name>
<desc>Include Files/Sample Source Code 1</desc>
</disk>
<disk id="disk08" size="737280" chs="80:2:9" img="static/WIN30SDK_DISK08.img" href="/disks/pc/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK08.json" md5="77d391c5e2462e446ad6780cf86a7b82" md5json="c89d7af1e40471dbfe6b795869696bd2">
<name>Win300 SDK (720K Disk 8)</name>
<desc>Sample Source Code 2</desc>
</disk>
<disk id="disk09" size="737280" chs="80:2:9" img="static/WIN30SDK_DISK09.img" href="/disks/pc/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK09.json" md5="945af52c2a962ea4b6c7b3a5487975be" md5json="89012754bdbb154d73050ff320828803">
<name>Win300 SDK (720K Disk 9)</name>
<desc>Online Reference (Advisor Format)</desc>
</disk>
<disk id="disk10" size="737280" chs="80:2:9" img="static/WIN30SDK_DISK10.img" href="/disks/pc/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK10.json" md5="3782fc9ba62e8c438bc51177403ec5f4" md5json="5e77eed658cc6032d0d01377d280921c">
<name>Win300 SDK (720K Disk 10)</name>
<desc>Online Reference (Windows Help Format)</desc>
</disk>
</manifest>

16
modules/pcjs/lib/debugger.js
View file

@ -5491,6 +5491,17 @@ if (DEBUGGER) {
}
};
/**
* doPrint(sCmd)
*
* @this {Debugger}
* @param {string} sCmd
*/
Debugger.prototype.doPrint = function(sCmd)
{
this.parseExpression(sCmd, true);
};
/**
* doProcStep(sCmd)
*
@ -5890,6 +5901,9 @@ if (DEBUGGER) {
this.println(sPrompt + sCmd);
}
var ch = sCmd.charAt(0);
if (ch == '"' || ch == "'") return true;
sCmd = sCmd.toLowerCase();
/*
@ -6003,7 +6017,7 @@ if (DEBUGGER) {
break;
case "?":
if (asArgs[1]) {
this.parseExpression(asArgs[1], true);
this.doPrint(asArgs[1]);
break;
}
this.doHelp();

44
modules/pcjs/lib/video.js
View file

@ -1773,6 +1773,9 @@ Card.ACCESS.writeByteMode0 = function writeByteMode0(off, b, addr)
this.adw[idw] = dw;
this.fDirty = true;
}
if (DEBUG && this.controller.video.messageEnabled(Messages.MEM | Messages.VIDEO)) {
this.controller.video.printMessage("writeByteMode0(" + str.toHexLong(addr) + "): " + str.toHexByte(b) + " -> " + str.toHexLong(dw));
}
};
/**
@ -1823,6 +1826,9 @@ Card.ACCESS.writeByteMode0Chain4 = function writeByteMode0Chain4(off, b, addr)
this.adw[idw] = dw;
this.fDirty = true;
}
if (DEBUG && this.controller.video.messageEnabled(Messages.MEM | Messages.VIDEO)) {
this.controller.video.printMessage("writeByteMode0Chain4(" + str.toHexLong(addr) + "): " + str.toHexByte(b) + " -> " + str.toHexLong(dw));
}
};
/**
@ -1849,6 +1855,9 @@ Card.ACCESS.writeByteMode0EvenOdd = function writeByteMode0EvenOdd(off, b, addr)
this.adw[idw] = dw;
this.fDirty = true;
}
if (DEBUG && this.controller.video.messageEnabled(Messages.MEM | Messages.VIDEO)) {
this.controller.video.printMessage("writeByteMode0EvenOdd(" + str.toHexLong(addr) + "): " + str.toHexByte(b) + " -> " + str.toHexLong(dw));
}
};
/**
@ -1871,6 +1880,9 @@ Card.ACCESS.writeByteMode0Rot = function writeByteMode0Rot(off, b, addr)
this.adw[idw] = dw;
this.fDirty = true;
}
if (DEBUG && this.controller.video.messageEnabled(Messages.MEM | Messages.VIDEO)) {
this.controller.video.printMessage("writeByteMode0Rot(" + str.toHexLong(addr) + "): " + str.toHexByte(b) + " -> " + str.toHexLong(dw));
}
};
/**
@ -1894,6 +1906,9 @@ Card.ACCESS.writeByteMode0And = function writeByteMode0And(off, b, addr)
this.adw[idw] = dw;
this.fDirty = true;
}
if (DEBUG && this.controller.video.messageEnabled(Messages.MEM | Messages.VIDEO)) {
this.controller.video.printMessage("writeByteMode0And(" + str.toHexLong(addr) + "): " + str.toHexByte(b) + " -> " + str.toHexLong(dw));
}
};
/**
@ -1917,6 +1932,9 @@ Card.ACCESS.writeByteMode0Or = function writeByteMode0Or(off, b, addr)
this.adw[idw] = dw;
this.fDirty = true;
}
if (DEBUG && this.controller.video.messageEnabled(Messages.MEM | Messages.VIDEO)) {
this.controller.video.printMessage("writeByteMode0Or(" + str.toHexLong(addr) + "): " + str.toHexByte(b) + " -> " + str.toHexLong(dw));
}
};
/**
@ -1940,6 +1958,9 @@ Card.ACCESS.writeByteMode0Xor = function writeByteMode0Xor(off, b, addr)
this.adw[idw] = dw;
this.fDirty = true;
}
if (DEBUG && this.controller.video.messageEnabled(Messages.MEM | Messages.VIDEO)) {
this.controller.video.printMessage("writeByteMode0Xor(" + str.toHexLong(addr) + "): " + str.toHexByte(b) + " -> " + str.toHexLong(dw));
}
};
/**
@ -1958,6 +1979,9 @@ Card.ACCESS.writeByteMode1 = function writeByteMode1(off, b, addr)
this.adw[idw] = dw;
this.fDirty = true;
}
if (DEBUG && this.controller.video.messageEnabled(Messages.MEM | Messages.VIDEO)) {
this.controller.video.printMessage("writeByteMode1(" + str.toHexLong(addr) + "): " + str.toHexLong(dw));
}
};
/**
@ -1986,6 +2010,9 @@ Card.ACCESS.writeByteMode1EvenOdd = function writeByteMode1EvenOdd(off, b, addr)
this.adw[idw] = dw;
this.fDirty = true;
}
if (DEBUG && this.controller.video.messageEnabled(Messages.MEM | Messages.VIDEO)) {
this.controller.video.printMessage("writeByteMode1EvenOdd(" + str.toHexLong(addr) + "): " + str.toHexByte(dw));
}
};
/**
@ -2006,6 +2033,9 @@ Card.ACCESS.writeByteMode2 = function writeByteMode2(off, b, addr)
this.adw[idw] = dw;
this.fDirty = true;
}
if (DEBUG && this.controller.video.messageEnabled(Messages.MEM | Messages.VIDEO)) {
this.controller.video.printMessage("writeByteMode2(" + str.toHexLong(addr) + "): " + str.toHexByte(b) + " -> " + str.toHexLong(dw));
}
};
/**
@ -2027,6 +2057,9 @@ Card.ACCESS.writeByteMode2And = function writeByteMode2And(off, b, addr)
this.adw[idw] = dw;
this.fDirty = true;
}
if (DEBUG && this.controller.video.messageEnabled(Messages.MEM | Messages.VIDEO)) {
this.controller.video.printMessage("writeByteMode2And(" + str.toHexLong(addr) + "): " + str.toHexByte(b) + " -> " + str.toHexLong(dw));
}
};
/**
@ -2048,6 +2081,9 @@ Card.ACCESS.writeByteMode2Or = function writeByteMode2Or(off, b, addr)
this.adw[idw] = dw;
this.fDirty = true;
}
if (DEBUG && this.controller.video.messageEnabled(Messages.MEM | Messages.VIDEO)) {
this.controller.video.printMessage("writeByteMode2Or(" + str.toHexLong(addr) + "): " + str.toHexByte(b) + " -> " + str.toHexLong(dw));
}
};
/**
@ -2069,6 +2105,9 @@ Card.ACCESS.writeByteMode2Xor = function writeByteMode2Xor(off, b, addr)
this.adw[idw] = dw;
this.fDirty = true;
}
if (DEBUG && this.controller.video.messageEnabled(Messages.MEM | Messages.VIDEO)) {
this.controller.video.printMessage("writeByteMode2Xor(" + str.toHexLong(addr) + "): " + str.toHexByte(b) + " -> " + str.toHexLong(dw));
}
};
/**
@ -2097,6 +2136,9 @@ Card.ACCESS.writeByteMode3 = function writeByteMode3(off, b, addr)
this.adw[idw] = dw;
this.fDirty = true;
}
if (DEBUG && this.controller.video.messageEnabled(Messages.MEM | Messages.VIDEO)) {
this.controller.video.printMessage("writeByteMode3(" + str.toHexLong(addr) + "): " + str.toHexByte(b) + " -> " + str.toHexLong(dw));
}
};
/*
@ -4255,7 +4297,7 @@ Video.prototype.setAccess = function(nAccess)
var card = this.cardActive;
if (card && nAccess != null && nAccess != card.nAccess) {
if (DEBUG && this.messageEnabled()) {
if (MAXDEBUG && this.messageEnabled()) {
this.printMessage("setAccess(" + str.toHexWord(nAccess) + ")");
}