From 1a67c7acbdb4337592a9c96c765149508717ad05 Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Tue, 1 Sep 2015 16:19:20 -0700 Subject: [PATCH] v1.19.3: More Windows 95-related updates --- blog/2015/06/01/README.md | 4 +- .../compaq/deskpro386/vga/4096kb/machine.xml | 10 +- .../compaq/deskpro386/vga/4096kb/state.json | 2 +- docs/pcjs/demos/pc-dbg.js | 1942 ++++++++--------- docs/pcjs/demos/pc.js | 1013 ++++----- modules/pcjs/lib/debugger.js | 466 ++-- modules/pcjs/lib/interrupts.js | 9 +- modules/pcjs/lib/video.js | 244 ++- modules/pcjs/lib/x86cpu.js | 36 +- modules/pcjs/lib/x86func.js | 15 +- modules/pcjs/lib/x86seg.js | 29 +- versions/c1pjs/1.19.3/c1p-dbg.js | 165 ++ versions/c1pjs/1.19.3/c1p.js | 125 ++ versions/c1pjs/1.19.3/common.css | 262 +++ versions/c1pjs/1.19.3/common.xsl | 46 + versions/c1pjs/1.19.3/components.css | 106 + versions/c1pjs/1.19.3/components.xsl | 572 +++++ versions/c1pjs/1.19.3/document.css | 162 ++ versions/c1pjs/1.19.3/document.xsl | 450 ++++ versions/c1pjs/1.19.3/machine.xsl | 49 + versions/c1pjs/1.19.3/manifest.xsl | 247 +++ versions/c1pjs/1.19.3/outline.xsl | 47 + versions/pcjs/1.19.3/common.css | 262 +++ versions/pcjs/1.19.3/common.xsl | 46 + versions/pcjs/1.19.3/components.css | 146 ++ versions/pcjs/1.19.3/components.xsl | 1002 +++++++++ versions/pcjs/1.19.3/document.css | 162 ++ versions/pcjs/1.19.3/document.xsl | 450 ++++ versions/pcjs/1.19.3/machine.xsl | 49 + versions/pcjs/1.19.3/manifest.xsl | 247 +++ versions/pcjs/1.19.3/outline.xsl | 47 + versions/pcjs/1.19.3/pc-dbg.js | 1192 ++++++++++ versions/pcjs/1.19.3/pc.js | 1048 +++++++++ 33 files changed, 8909 insertions(+), 1743 deletions(-) create mode 100644 versions/c1pjs/1.19.3/c1p-dbg.js create mode 100644 versions/c1pjs/1.19.3/c1p.js create mode 100644 versions/c1pjs/1.19.3/common.css create mode 100644 versions/c1pjs/1.19.3/common.xsl create mode 100644 versions/c1pjs/1.19.3/components.css create mode 100644 versions/c1pjs/1.19.3/components.xsl create mode 100644 versions/c1pjs/1.19.3/document.css create mode 100644 versions/c1pjs/1.19.3/document.xsl create mode 100644 versions/c1pjs/1.19.3/machine.xsl create mode 100644 versions/c1pjs/1.19.3/manifest.xsl create mode 100644 versions/c1pjs/1.19.3/outline.xsl create mode 100644 versions/pcjs/1.19.3/common.css create mode 100644 versions/pcjs/1.19.3/common.xsl create mode 100644 versions/pcjs/1.19.3/components.css create mode 100644 versions/pcjs/1.19.3/components.xsl create mode 100644 versions/pcjs/1.19.3/document.css create mode 100644 versions/pcjs/1.19.3/document.xsl create mode 100644 versions/pcjs/1.19.3/machine.xsl create mode 100644 versions/pcjs/1.19.3/manifest.xsl create mode 100644 versions/pcjs/1.19.3/outline.xsl create mode 100644 versions/pcjs/1.19.3/pc-dbg.js create mode 100644 versions/pcjs/1.19.3/pc.js diff --git a/blog/2015/06/01/README.md b/blog/2015/06/01/README.md index 13d60ec6b..7664c3553 100644 --- a/blog/2015/06/01/README.md +++ b/blog/2015/06/01/README.md @@ -89,10 +89,10 @@ modes commonly used on the IBM VGA. Here's that table: CRTC[0x11]: VRETRACE_END 0x8E 0x8E 0x8E 0x8E 0x8E 0x8E 0x8E 0x8E 0x8E 0x85 0x8C 0x8E CRTC[0x12]: VDISP_END 0x8F 0x8F 0x8F 0x8F 0x8F 0x8F 0x8F 0x8F 0x8F 0x5D 0xDF 0x8F CRTC[0x13]: OFFSET 0x14 0x14 0x28 0x28 0x14 0x14 0x28 0x14 0x28 0x28 0x28 0x28 - CRTC[0x14]: UNDERLINE 0x1F 0x1F 0x1F 0x1F 0x00 0x00 0x00 0x00 0x00 0x0F 0x00 0x40 (bit 6 selects double-word mode) + CRTC[0x14]: UNDERLINE 0x1F 0x1F 0x1F 0x1F 0x00 0x00 0x00 0x00 0x00 0x0F 0x00 0x40 CRTC[0x15]: VBLANK_START 0x96 0x96 0x96 0x96 0x96 0x96 0x96 0x96 0x96 0x63 0xE7 0x96 CRTC[0x16]: VBLANK_END 0xB9 0xB9 0xB9 0xB9 0xB9 0xB9 0xB9 0xB9 0xB9 0xBA 0x04 0xB9 - CRTC[0x17]: MODE_CTRL 0xA3 0xA3 0xA3 0xA3 0xA2 0xA2 0xC2 0xE3 0xE3 0xE3 0xE3 0xA3 (bit 6 selects byte mode) + CRTC[0x17]: MODE_CTRL 0xA3 0xA3 0xA3 0xA3 0xA2 0xA2 0xC2 0xE3 0xE3 0xE3 0xE3 0xA3 CRTC[0x18]: LINE_COMPARE 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF GRC[0x00]: SRESET 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 GRC[0x01]: ESRESET 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 diff --git a/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml b/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml index 68c809eb1..d30fe6ff6 100644 --- a/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml +++ b/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml @@ -1,7 +1,7 @@ - + - + @@ -10,10 +10,10 @@